diff options
Diffstat (limited to 'pkgs')
217 files changed, 1676 insertions, 1818 deletions
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 9917ffdf9c01..74d38b59fc23 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.10"; + version = "1.8.11"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1n36pz4y3xa4d46mynym98bra79qx5n9lb29chyxfpvi5fmprdg1"; + sha256 = "1b4za0hszb95jnj97g4xkrgcl0bydllznm0wj6rpi6cwmdr0h8na"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index dcd2d6f5f5ae..220ec80834ab 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.20.0"; + version = "3.21.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1fva5ysik3af3x74l6059ngwsxrk9g6ml47wr5ck536k66i025ar"; + sha256 = "10d97rkqk5qbrninrahn0gr90yd47ivw2zafb24sp7a2g0mm07md"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 55b9435baaa5..1d3fffb549d7 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -4,7 +4,6 @@ pythonPackages.buildPythonApplication rec { pname = "pithos"; version = "1.1.2"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 0c85d72cc901..65a3bbfdc011 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.8"; + version = "1.5.8.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0gwsr5srzy28hwqhfzrc8pswysmyra8kbww3bxfx8bq4mdjifdj6"; + sha256 = "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc"; }; buildInputs = [ diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index ef7aa96beb06..311686d0c77b 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "deja-dup-${version}"; - version = "36.3"; + version = "38.0"; src = fetchurl { - url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc"; + url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz"; + sha256 = "1l3sa24v0v6xf312h36jikfi8zyx6z3nmc7pjzgdp7l89gkdm65v"; }; patches = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5e37ba47fa5f..ea5dce4fa1a6 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.2.0.16"; # "Android Studio 3.2 Canary 17" - build = "181.4823740"; - sha256Hash = "04282zd28kn2a4rjsi0ikx4bc9ab668xm7cc87ga60pzyg5gmmgk"; + version = "3.2.0.17"; # "Android Studio 3.2 Canary 18" + build = "181.4830125"; + sha256Hash = "14yarl1vqhy21ljrn5k2dy8z0y407g9nqw4lqzjbxb7zmascnlx4"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 49ea544289f1..9a32ea7f19f2 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { emacsVersion = "26.1"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.0"; + macportVersion = "7.1"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "02dbasiv1szvlzi0avb7bi9xwpw2lssj3kzbn8pi5vmziqhvgfhz"; + sha256 = "0d2ny54f68v3hjc2g3pkj83xv3yzv0hrwvn2cmpyb0jxjbsb2frc"; }; hiresSrc = fetchurl { diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 89a728f1a997..9f9e965c6a91 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "2.26.4"; + version = "3.0.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0qbir023zyd53ly6y8zcm3kbhbhjjpclcgp9d0mqb5lc9zajxv12"; + sha256 = "1lm0zzqhnk5gm68l8fkmlkh3gl71f1xw0amy23460a7hm9wcwjr7"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 4bc0e93a3b46..7667b674fcec 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,7 +1,6 @@ { stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "dosage"; version = "2018.04.08"; PBR_VERSION = version; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index fc8b8043b94c..d5576ccbeb7c 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -7,7 +7,6 @@ with python.pkgs; buildPythonApplication rec { pname = "jrnl"; version = "1.9.8"; - name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 9dd466c442aa..60f6deefb010 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,7 +3,6 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "khal"; version = "0.9.9"; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 7eb0f2d41b55..3a723907c925 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -4,7 +4,6 @@ let inherit (python.pkgs) buildPythonApplication fetchPypi requests; in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "tzupdate"; version = "1.2.0"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 5dcaeb1226e5..05530af12547 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1j75466hfs18w05k64yb60pw865ah226vjib46qr1wb1mcd82i5s"; + sha256 = "0ix4vqhcm4x9j5p6pwdfwkm2ml6wmwsyn3ppzvxllhp4dj8blzwf"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a2d8a24ec5e6..7803a530a92a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -149,6 +149,7 @@ let ./patches/nix_plugin_paths_52.patch ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch + (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 2113b9cdbed7..a1aba0da2d68 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 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; - sha256bin64 = "06gmn0clhll91pmph07db043006gf2x6nfgxlir4qwqsj2qgdch0"; - version = "67.0.3396.62"; + sha256 = "1jfhdisp4j6rrb8zxj2am7vlkjfbwvq1si7cacjwfy624hlhxpxz"; + sha256bin64 = "0j3aw4zyg0alizgh73dp3fz8f6y71srdkycnzjm037p3p8m364j1"; + version = "68.0.3440.17"; }; dev = { - sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc"; - sha256bin64 = "0liqgz8sip5fz5mxb54zagz3p8s24j96p26i5dql935bic7p3lhw"; - version = "68.0.3440.7"; + sha256 = "0acgpi7slwvq5lxaagmn57a6jpz508hwa690ypny8zlhsiaqlxaz"; + sha256bin64 = "1vjmi9lm8xrkhmzv9sqnln867sm4b80y2z3djz7mj05hkzsb0zr9"; + version = "69.0.3452.0"; }; stable = { - sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; - sha256bin64 = "16fljvrq2gcpjpyhf1w8s3rv805mknmy2i88n43v2cg7hl35241c"; - version = "67.0.3396.62"; + sha256 = "07fvfarlzl4dcr0vbklzbg08iwvzfkczsqsg0d1p695q1hpsf9sx"; + sha256bin64 = "1c2xn84vs1v7gph7l4s408ml6l6c7lnlg4z2vcx20phxmlsgs1xg"; + version = "67.0.3396.87"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f2cb0864efdd..4e7d35f105c3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -24,10 +24,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "60.0.1"; + version = "60.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn"; + sha512 = "2my4v8al3swwbiqcp3a5y89imly6apc2p9q0cbkhbiz0sqylc0l02jh0qp95migmik56m4prwqdi81kgqs7cw5r2np3mm6sc1b45mkg"; }; patches = nixpkgsPatches ++ [ @@ -47,10 +47,10 @@ rec { firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.8.0esr"; + version = "52.8.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1"; + sha512 = "a4883550fdf62e66b10f1de7416d3614a2cb0ce3a004d9a79ecc37a726794d7bbdb0a6767faab4ea97278d2192462597551fc13b7e9a9c38d043c2879d51095a"; }; patches = nixpkgsPatches; @@ -66,10 +66,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.0.1esr"; + version = "60.0.2esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b"; + sha512 = "0vbilh4iwqfzkj598zbgkmwbkxh4bia8gn7p9x6xd7yvhb6708p4dfkkbg61hdh3bddyaxx1zd0wi8qxfxbrx19mc6k9dpc6xz52iy1"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 65fd22cdf47a..59b3ab7e8b4c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1la9cdf5a67kg72xn4bn5mib1caiv5vxsjmnxqsmx0m7vhbv5i4n"; + sha256 = "0q1llnqy83fkx3vhcfjyl3frd41h7g1cvl38lfhsz1z1v9av3bpd"; }; # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index 304df0947acf..66bf20c2b843 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "terraform-provider-ibm-${version}"; - version = "0.9.1"; + version = "0.10.0"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; subPackages = [ "./" ]; @@ -20,7 +20,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "IBM-Cloud"; repo = "terraform-provider-ibm"; - sha256 = "1j8v7r5lsvrg1afdbwxi8vq665qr47a9pddqgmpkirh99pzixgr6"; + sha256 = "03drvhhh6pkk8yzzp8iiq478kcky9swxvxadxzxh0v4jzdprg9lr"; rev = "v${version}"; }; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 91bcfc73f2c7..9123477bb3ed 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.6"; + stableVersion = "2.1.7"; # 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 = "0wrh0x5ig2x2pxyyf99z4bfiyxn19akyjic5kgf0pv2snifw2481"; - serverSrcHash = "0jy5700bshz54mdsh5qpcb2qrczg9isxhr4y0bmglrl23pywvisc"; + guiSrcHash = "10zf429zjzf7v4y9r7mmkp42kh5ppmqinhvwqzb7jmsrpv2cnxj6"; + serverSrcHash = "056swz6ygqdi37asah51v1yy0ky8q0p32vf7dxs697hd7nv78aqj"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 32808f720bf1..2cd30ab9604b 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-04-19"; + name = "dino-unstable-2018-06-03"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "e80da806022d8aaa32f77f3c7f0333cc1c80829b"; - sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gibm"; + rev = "52e116ee44be1667660c08858a28fe8fda125f79"; + sha256 = "1yybmjd50r41366clrsw21qybbpjfkvim2n5b3dkcagjnifak0zl"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix new file mode 100644 index 000000000000..b65995ff86a4 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchurl, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, +fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, +libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, +nspr, alsaLib, cups, expat, udev }: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + stdenv.cc.cc + udev + xorg.libxcb + ]; + +in + stdenv.mkDerivation rec { + name = "mattermost-desktop-${version}"; + version = "4.1.1"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; + sha256 = "0kq89xylfv2rfmd4wj08d02gjzywlq1p8xmk313i58334xm7srja"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; + sha256 = "1jiknxpb44bhxrl0xa57kf3wxlzifbpnn3vblp8l4pr2wx146pzx"; + } + else + throw "Mattermost-Desktop is not currently supported on ${stdenv.system}"; + + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir -p $out + cp -R . $out + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out $out/mattermost-desktop + + patchShebangs $out/create_desktop_file.sh + $out/create_desktop_file.sh + + mkdir -p $out/{bin,share/applications} + cp Mattermost.desktop $out/share/applications/Mattermost.desktop + ln -s $out/mattermost-desktop $out/bin/mattermost-desktop + ''; + + meta = { + description = "Mattermost Desktop client"; + homepage = https://about.mattermost.com/; + license = lib.licenses.asl20; + platforms = [ + "x86_64-linux" "i686-linux" + ]; + }; + } diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 594004fd2949..49cd81ac923c 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.5.13"; + version = "0.5.17"; src = fetchFromGitHub { owner = "saenzramiro"; repo = "rambox"; rev = version; - sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326"; + sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4"; + sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; }; - patches = [ ./hide-check-for-updates.patch ./isDev.patch ] + patches = [ ./isDev.patch ] ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; configurePhase = '' diff --git a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch b/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch deleted file mode 100644 index 8363baef2dfc..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/saenzramiro/rambox/issues/1283 - -diff -urNZ a/electron/menu.js b/electron/menu.js ---- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000 -+++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000 -@@ -220,14 +220,6 @@ - } - }, - { -- label: locale['menu.help[5]'], -- click(item, win) { -- const webContents = win.webContents; -- const send = webContents.send.bind(win.webContents); -- send('autoUpdater:check-update'); -- } -- }, -- { - label: locale['menu.help[6]'], - click() { - sendAction('showAbout') -@@ -290,14 +282,6 @@ - type: 'separator' - }); - helpSubmenu.push({ -- label: `&`+locale['menu.help[5]'], -- click(item, win) { -- const webContents = win.webContents; -- const send = webContents.send.bind(win.webContents); -- send('autoUpdater:check-update'); -- } -- }); -- helpSubmenu.push({ - label: `&`+locale['menu.help[6]'], - click() { - sendAction('showAbout') diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 5f68e6d86295..46157178fc1a 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.2"; + version = "6.5.3"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; - sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr"; + sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9"; }; x86_64-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; - sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7"; + sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz"; }; }; in diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 071f82a8cbec..3e0e60594f82 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.3.0"; - sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i"; + version = "1.3.7"; + sha256Hash = "1rwnqgla061icvyvw8gxqd7qki1jnq0f46hvyffp74ng5r1b6wjg"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "310557"; archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; @@ -14,7 +14,5 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.3.4"; - sha256Hash = "17xdzyl7jb5g69a2h6fyk67z7s6h2dqjg8j478px6n0br1n420wk"; }); } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0d9320c12e27..dec933489af9 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -117,7 +117,7 @@ in if configure == null then weechat else ln -s $plugin $out/plugins done ''; - in (writeScriptBin weechat.name '' + in (writeScriptBin "weechat" '' #!${stdenv.shell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 13add2690db3..401eb755896f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.2"; + version = "0.27"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; + sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index c6e5d0f3cb31..7ca1e595c35d 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: + pythonPackages.buildPythonPackage rec { name = "deluge-${version}"; version = "1.3.15"; @@ -8,6 +9,14 @@ pythonPackages.buildPythonPackage rec { sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; }; + patches = [ + # Fix preferences when built against libtorrent >=0.16 + (fetchpatch { + url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e"; + sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d"; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 4db546651dd9..be574acc8c75 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: buildPythonApplication rec { - version = "0.9.3.1"; + version = "0.9.4"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb"; + sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9"; }; nativeBuildInputs = [ @@ -29,7 +29,10 @@ buildPythonApplication rec { ]; patches = [ - ./disable-syncthing-binary-configuration.patch + (fetchpatch { + url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch; + sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7"; + }) (substituteAll { src = ./paths.patch; killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; @@ -37,6 +40,8 @@ buildPythonApplication rec { }) ]; + setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ]; + postPatch = '' substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" @@ -48,9 +53,9 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK3 & python based GUI for Syncthing"; - maintainers = with maintainers; [ ]; - platforms = syncthing.meta.platforms; homepage = https://github.com/syncthing/syncthing-gtk; license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = syncthing.meta.platforms; }; } diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch deleted file mode 100644 index 14c2b62e6e38..000000000000 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/glade/find-daemon.glade -+++ b/glade/find-daemon.glade -@@ -112,6 +112,7 @@ - <object class="GtkEntry" id="vsyncthing_binary"> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="margin_right">20</property> - <signal name="changed" handler="cb_check_value" swapped="no"/> - </object> -@@ -126,6 +127,7 @@ - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <property name="yalign">0.51999998092651367</property> ---- a/glade/ui-settings.glade -+++ b/glade/ui-settings.glade -@@ -943,6 +943,7 @@ - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <property name="yalign">0.51999998092651367</property> -@@ -974,6 +975,7 @@ - <object class="GtkEntry" id="vsyncthing_binary"> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="hexpand">True</property> - <signal name="changed" handler="cb_check_value" swapped="no"/> - </object> ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -168,6 +168,8 @@ - yield k - - def get(self, key): -+ if key == "syncthing_binary": -+ return self.REQUIRED_KEYS[key][1] - return self.values[key] - - def set(self, key, value): ---- a/syncthing_gtk/finddaemondialog.py -+++ b/syncthing_gtk/finddaemondialog.py -@@ -163,7 +163,7 @@ - self["lblDownloadProgress"].set_markup(_("Download failed.")) - self["btDownload"].set_visible(True) - self["pbDownload"].set_visible(False) -- self["vsyncthing_binary"].set_sensitive(True) -+ self["vsyncthing_binary"].set_sensitive(False) - self["btBrowse"].set_sensitive(True) - self["btSave"].set_sensitive(True) - -@@ -179,7 +179,7 @@ - - def cb_extract_finished(self, downloader, *a): - """ Called after extraction is finished """ -- self["vsyncthing_binary"].set_sensitive(True) -+ self["vsyncthing_binary"].set_sensitive(False) - self["btBrowse"].set_sensitive(True) - self["vsyncthing_binary"].set_text(downloader.get_target()) - self["lblDownloadProgress"].set_markup("<b>" + _("Download finished.") + "</b>") ---- a/syncthing_gtk/wizard.py -+++ b/syncthing_gtk/wizard.py -@@ -60,7 +60,6 @@ - self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) - # Pages - self.add_page(IntroPage(self)) -- self.add_page(FindDaemonPage()) - self.add_page(GenerateKeysPage()) - self.add_page(HttpSettingsPage()) - self.add_page(SaveSettingsPage()) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 9c8f39d52f1d..29ea9ff2910f 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -6,7 +6,6 @@ in buildPythonApplication rec { pname = "fava"; version = "1.7"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -26,4 +25,3 @@ buildPythonApplication rec { maintainers = with stdenv.lib.maintainers; [ ]; }; } - diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 7209ee3edf60..eca3ddd32e8b 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -12,13 +12,13 @@ assert ngspiceSupport -> libngspice != null; with lib; stdenv.mkDerivation rec { name = "kicad-unstable-${version}"; - version = "2018-03-10"; + version = "2018-06-12"; src = fetchFromGitHub { owner = "KICad"; repo = "kicad-source-mirror"; - rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862"; - sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0"; + rev = "bc7bd107d980da147ad515aeae0469ddd55c2368"; + sha256 = "11nsx52pd3jr2wbzr11glmcs1a9r7z1mqkqx6yvlm0awbgd8qlv8"; }; postPatch = '' @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]; - nativeBuildInputs = [ cmake doxygen pkgconfig ]; + # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html + nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen pkgconfig ]; buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 73e770b63e2d..af2ee49daee9 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}: +{stdenv, fetchurl, bison, flex +, readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }: stdenv.mkDerivation { name = "ngspice-28"; @@ -9,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ flex bison ]; - buildInputs = [ readline libX11 libICE libXaw libXext fftw ]; + buildInputs = [ readline libX11 libICE libXaw libXmu libXext libXt fftw ]; configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix new file mode 100644 index 000000000000..ba2a170e6255 --- /dev/null +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, autoreconfHook, automake, pkgconfig +, cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: + +let + version = "3.9.73"; + name = "xcircuit-${version}"; + inherit (stdenv.lib) getBin; + +in stdenv.mkDerivation { + inherit name version; + + src = fetchurl { + url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz"; + sha256 = "1kj9hayipplzm4960kx48vxddqj154qnxkccaqj9cnkp62b7q3jg"; + }; + + nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; + hardeningDisable = [ "format" ]; + + configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --with-ngspice=${getBin ngspice}/bin/ngspice"; + + buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; + + meta = with stdenv.lib; { + description = "Generic drawing program tailored to circuit diagrams"; + homepage = http://opencircuitdesign.com/xcircuit; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.spacefrogg ]; + }; +} diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch deleted file mode 100644 index 411922cfd8e7..000000000000 --- a/pkgs/applications/version-management/sit/aarch64-isel.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 0000000..15e7649 ---- /dev/null -+++ b/.cargo/config -@@ -0,0 +1,3 @@ -+# https://github.com/rust-lang/rust/issues/50516 -+[target.'cfg(all(debug_assertions, target_arch = "aarch64"))'] -+rustflags = ["-C", "llvm-args=-fast-isel"] diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index e189241531d6..75368bd88463 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, + # Darwin + libiconv, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { - owner = "sit-it"; + owner = "sit-fyi"; repo = "sit"; rev = "v${version}"; - sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57"; + sha256 = "10ycs6vc7mfzxnxrki09xn974pcwh196h1pfnsds98x6r87hxkpn"; }; - buildInputs = [ cmake libzip ]; + buildInputs = [ cmake libzip gnupg ] ++ + (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []); - cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; + preCheck = '' + export HOME=$(mktemp -d) + ''; - patches = [ ./aarch64-isel.patch ]; + cargoSha256 = "023anmnprxbsvqww1b1bdyfhbhjh1ah2kc67cdihvdvi4lqdmbia"; meta = with stdenv.lib; { description = "Serverless Information Tracker"; - homepage = https://sit.sh/; + homepage = https://sit.fyi/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 544e4917f453..1179398693d5 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "13n2jvwws87bws483dncvhf9vqsjy3l0lxh7x741g71075299w73"; + sha256 = "0r6v7n4wq1ivjcfs4br5ywz2f0jbwxrharfcjmycnbjsckz1l7ps"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index a8d69987e337..4a46d4ef7ba8 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,4 +1,9 @@ -{ stdenv, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, pkgconfig }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg, alsaUtils }: + +let + runtimeDeps = [ xorg.xsetroot ] + ++ lib.optional (alsaUtils != null) alsaUtils; +in rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; @@ -11,15 +16,16 @@ rustPlatform.buildRustPackage rec { sha256 = "0nw0iz78mnrmgpc471yjv7yzsaf7346mwjp6hm5kbsdclvrdq9d7"; }; - buildInputs = [ - dbus - gdk_pixbuf - libnotify - pkgconfig - ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ dbus gdk_pixbuf libnotify ]; cargoSha256 = "0169k91pb7ipvi0m71cmkppp1klgp5ghampa7x0fxkyrvrf0dvqg"; + postInstall = '' + wrapProgram $out/bin/dwm-status \ + --prefix "PATH" : "${stdenv.lib.makeBinPath runtimeDeps}" + ''; + meta = with stdenv.lib; { description = "DWM status service which dynamically updates when needed"; homepage = https://github.com/Gerschtli/dwm-status; diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 34e853226501..025f6aa6e7aa 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -13,7 +13,7 @@ set -u bintoolsWrapper_addLDVars () { # See ../setup-hooks/role.bash local role_post role_pre - getTargetRoleEnvHook + getHostRoleEnvHook if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then export NIX_${role_pre}LDFLAGS+=" -L$1/lib64" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 7a18993d607f..803d8b9fa12e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -42,7 +42,7 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools) + default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 9dacacc1f369..28060de74118 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -68,7 +68,7 @@ set -u ccWrapper_addCVars () { # See ../setup-hooks/role.bash local role_post role_pre - getTargetRoleEnvHook + getHostRoleEnvHook if [[ -d "$1/include" ]]; then export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 73da775f7f56..bce5436353c3 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -72,6 +72,24 @@ rec { ''; }; + # Create a C binary + writeCBin = name: code: + runCommandCC name + { + inherit name code; + executable = true; + passAsFile = ["code"]; + # Pointless to do this on a remote machine. + preferLocalBuild = true; + allowSubstitutes = false; + } + '' + n=$out/bin/$name + mkdir -p "$(dirname "$n")" + mv "$codePath" code.c + $CC -x c code.c -o "$n" + ''; + # Create a forest of symlinks to the files in `paths'. symlinkJoin = args_@{ name diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 3bd3222dc0c2..7db21d9e7483 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha"; + sha256 = "1i0s246bg9xcjxgbajph744pn65bq5gk6r9kkl3f5iwdq3rjc0pm"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index f55be458addf..9613606f777a 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.2.1"; + version = "3.28.3.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s"; + sha256 = "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9"; }; # Tests need an X display diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index fbae8fbcfbd4..beab02465272 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -3,7 +3,7 @@ let pname = "libgweather"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm"; + sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index 457cee3b3f25..279e7f2e95af 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobjectIntrospection, gnome3 }: stdenv.mkDerivation rec { name = "totem-pl-parser-${version}"; - version = "3.26.0"; + version = "3.26.1"; src = fetchurl { url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; + sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka"; }; passthru = { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = [ gmime libxml2 libsoup ]; + buildInputs = [ gmime libxml2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 0dfa10f28a12..516268e0efd5 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 = "20180506"; + version = "20180610"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "10w9vs61fs14k8g3wlng0ifj0knfm0xfc4rsnd2c75464hkdxvr9"; + sha256 = "1qg9a1whmrkrifqrsb9m541cgr3rf1nnkqlv4q7rq30m8bdilvk5"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index d793f0b391af..ac8d76c63ed6 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 0fecb1d29622..c57058a63520 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -15,14 +15,14 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null + enableIntegerSimple ? !(gmp.meta.available or false), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? targetPlatform != hostPlatform , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows @@ -32,8 +32,6 @@ ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" }: -assert !enableIntegerSimple -> gmp != null; - let inherit (bootPkgs) ghc; diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 6e883aeafe83..93257ff7d53d 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -47,6 +47,8 @@ let # Relics of the old GHCJS build system stage1Packages = []; mkStage2 = _: {}; + + haskellCompilerName = "ghcjs-${bootGhcjs.version}"; }; bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 07662d32d258..98eb58e6aae7 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -174,7 +174,7 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; socket-io = pkgs.nodePackages."socket.io"; - haskellCompilerName = "ghcjs"; + haskellCompilerName = "ghcjs-${version}"; # let us assume ghcjs is never actually cross compiled targetPrefix = ""; diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 4e1a0ef6409a..1bd4b88c72d4 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -16,7 +16,7 @@ let compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"; clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa"; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv isl version fetch; }); in { llvm = callPackage ./llvm.nix { @@ -41,9 +41,9 @@ let }; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); in { @@ -54,6 +54,6 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index d2be57b1a5fa..2c79d7b3b1b5 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 6fa1a0cf2e26..28f908ee829f 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -15,12 +15,11 @@ let compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"; clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6"; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv isl version fetch; }); in { llvm = callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { @@ -42,9 +41,9 @@ let }; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); in { @@ -55,6 +54,6 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 6b98a5726cf6..45fb7b5be4f6 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 0f259977f702..2c65234b6a47 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -13,7 +13,6 @@ , version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableSharedLibraries ? true }: @@ -31,8 +30,7 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - buildInputs = [ perl groff cmake libxml2 python libffi ] - ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; + buildInputs = [ perl groff cmake libxml2 python libffi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index c3bf0b48d649..ea3ea36eb6d3 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -15,12 +15,11 @@ let compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"; clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999"; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv isl version fetch; }); in { llvm = callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { @@ -42,9 +41,9 @@ let }; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); in { @@ -55,6 +54,6 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index 1ad2cb102950..dc508757ab6d 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index f80201167505..71b67aa7dc57 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -13,7 +13,6 @@ , version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableSharedLibraries ? (buildPlatform == hostPlatform) , darwin @@ -53,7 +52,7 @@ in stdenv.mkDerivation rec { groff libxml2 libffi - ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index fecf65136bcd..ae674d1fa8e8 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -22,13 +22,12 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { llvm = overrideManOutput (callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }); clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; @@ -53,9 +52,9 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -68,6 +67,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index bc8453f743ad..a371296db326 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -12,7 +12,6 @@ , release_version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true @@ -42,8 +41,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index feeadf1f1306..c3c1d87f2e4e 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -22,7 +22,7 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -53,9 +53,9 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -68,6 +68,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 66985861e386..5070de1f48b1 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -43,7 +43,8 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + # TODO(@Ericson2314): Remove next mass rebuild + ++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 333818f7dbde..88bccca36476 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,4 +1,4 @@ -{ stdenv, version, fetch, cmake, python, llvm }: +{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation rec { name = "compiler-rt-${version}"; @@ -6,12 +6,13 @@ stdenv.mkDerivation rec { src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; nativeBuildInputs = [ cmake python llvm ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; configureFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory @@ -27,5 +28,10 @@ stdenv.mkDerivation rec { --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' ''; + # Hack around weird upsream RPATH bug + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + ln -s "$out/lib"/*/* "$out/lib" + ''; + enableParallelBuilding = true; } diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 17c743c04082..40d602e222ed 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -21,13 +21,21 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + mkExtraBuildCommands = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags + ''; in { - llvm = overrideManOutput (callPackage ./llvm.nix { - inherit (targetLlvmLibraries) libcxxabi; - }); + llvm = overrideManOutput (callPackage ./llvm.nix { }); + clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; }); @@ -40,16 +48,11 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' - echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags - ''; + extraPackages = [ + libstdcxxHook + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { @@ -59,23 +62,15 @@ let targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' - echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags - ''; + extraBuildCommands = mkExtraBuildCommands cc; }; lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -90,6 +85,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 8877ccd11621..9cae65ef1030 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -11,7 +11,6 @@ , version , release_version , zlib -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true @@ -40,8 +39,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index ce4d44774f69..6a0965360f68 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "1g0508r66qjx857cb1cycq98b0gw7s1zn1l7bplyj1psk8mqh7kz"; + sha256 = "0dnj9d35fa0iaka2lsc7cvn9d2qbasknn1c3gbxdyc9drf9vv6kf"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 849917c4a0c4..4c3c5d008f06 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -70,7 +70,7 @@ rec { # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads # the wrong libraries in a bootstrap-build causing failures that - # are very hard to track dow. For details, see + # are very hard to track down. For details, see # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 ''; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 629910fd62e1..1cc385864585 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -166,8 +166,14 @@ let "--configure-option=--host=${hostPlatform.config}" ] ++ crossCabalFlags); + useSeparateSetupDb = setupHaskellDepends != [] || isCross || isGhcjs; + setupCompileFlags = [ - (optionalString (!coreSetup) "-${nativePackageDbFlag}=$packageConfDir") + (optionalString (!coreSetup) "-${nativePackageDbFlag}=${ + if useSeparateSetupDb + then "$setupPackageConfDir" + else "$packageConfDir" + }") (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") # https://github.com/haskell/cabal/issues/2398 (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") @@ -205,9 +211,9 @@ let nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; - buildPkgDb = ghcName: '' + buildPkgDb = ghcName: packageConfDir: '' if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then - cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf $packageConfDir/ + cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ continue fi if [ -d "$p/include" ]; then @@ -264,7 +270,7 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - '' + (optionalString (setupHaskellDepends != []) '' + '' + (optionalString useSeparateSetupDb '' setupPackageConfDir="$TMPDIR/setup-package.conf.d" mkdir -p $setupPackageConfDir '') + '' @@ -278,9 +284,9 @@ stdenv.mkDerivation ({ # dependencies for the build machine. # # pkgs* arrays defined in stdenv/setup.hs - + (optionalString (setupHaskellDepends != []) '' + + (optionalString useSeparateSetupDb '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb nativeGhc.name} + ${buildPkgDb nativeGhc.name "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache '') @@ -288,7 +294,7 @@ stdenv.mkDerivation ({ # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghc.name} + ${buildPkgDb ghc.name "$packageConfDir"} done '' # only use the links hack if we're actually building dylibs. otherwise, the @@ -323,11 +329,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ${optionalString (setupHaskellDepends != []) - '' - echo GHC_PACKAGE_PATH="$setupPackageConfDir:" - GHC_PACKAGE_PATH="$setupPackageConfDir:" '' - }${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i runHook postCompileBuildDriver ''; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index ed1bc9dc817b..8dd4d9ad4fa2 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -58,6 +58,24 @@ let # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch + # Fix python bug #27177 (https://bugs.python.org/issue27177) + # The issue is that `match.group` only recognizes python integers + # instead of everything that has `__index__`. + # This bug was fixed upstream, but not backported to 2.7 + (fetchpatch { + name = "re_match_index.patch"; + url = "https://bugs.python.org/file43084/re_match_index.patch"; + sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; + }) + + # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self". + # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor." + # https://github.com/python/cpython/pull/6118 + (fetchpatch { + name = "type_getattro.patch"; + url = "https://github.com/python/cpython/pull/6118/commits/8c6da2d7e7e719c40fb539b7f7cb7583cccc5527.patch"; + sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd"; + }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 1e5d003654ce..688c9e300ed5 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,24 +1,43 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi -, intltool, dbus-glib, at-spi2-core, libSM }: +{ stdenv +, fetchurl + +, meson +, ninja +, pkgconfig + +, at-spi2-core +, atk +, dbus +, glib +, libxml2 + +, gnome3 # To pass updateScript +}: stdenv.mkDerivation rec { - versionMajor = "2.26"; - versionMinor = "1"; - moduleName = "at-spi2-atk"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; + name = "${pname}-${version}"; + pname = "at-spi2-atk"; + version = "2.26.2"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - dbus-glib at-spi2-core libSM ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; - doCheck = false; # needs dbus daemon + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { + description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; + homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; + license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2 + maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index b7547c293928..ba34e7f5f3fe 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,31 +1,46 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib -, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: +{ stdenv +, fetchurl + +, meson +, ninja +, pkgconfig +, gobjectIntrospection + +, dbus +, glib +, libX11 +, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case +, libXi + +, gnome3 # To pass updateScript +}: stdenv.mkDerivation rec { - versionMajor = "2.26"; - versionMinor = "2"; - moduleName = "at-spi2-core"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; + name = "${pname}-${version}"; + pname = "at-spi2-core"; + version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; - buildInputs = [ - python popt dbus-glib - libX11 xextproto libSM libICE libXtst libXi - ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ dbus glib libX11 libXtst libXi ]; - # ToDo: on non-NixOS we create a symlink from there? - configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; - - doCheck = false; # needs dbus daemon + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { + description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; + homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; + license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2 + maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 5fce7bae8fcd..034e8c961be0 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.60"; + version = "1.4.65"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0zn1pyhn37w8di9byq5p3y886hsgf5569bmxiqb7bvjcrhnlb83l"; + sha256 = "0266d2gar9wi0p4plapcp4bms93nn61rdvpd8ik5h6hgqvdb3fl2"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix new file mode 100644 index 000000000000..2831104410b1 --- /dev/null +++ b/pkgs/development/libraries/boost/1.67.nix @@ -0,0 +1,13 @@ +{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.67_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_66_0.html + sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; + }; + + toolset = if stdenv.cc.isClang then "clang" else null; +}) diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 22f205cdcec0..9759e4904b29 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,8 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }: +{ fetchurl, stdenv, pkgconfig, meson, ninja +, gobjectIntrospection, clutter, gtk3, gnome3 }: + let pname = "clutter-gtk"; version = "1.8.4"; in + stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -12,7 +15,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index f26dad3ce15e..b62d764a2c65 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.11.7"; + version = "0.11.8.3"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1vq4j7v68lp4fsvpas1bcsx1z4snpj0mkbq2mi00kx3jb48z768h"; + sha256 = "1dgkr1kr00111vsrql2ng2sw2b2j9axmay0fl6p540j952v3yimy"; }; patches = [ diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index a548f3882864..0c2b7da79eb3 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,6 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -322,7 +322,7 @@ +@@ -324,7 +324,7 @@ # running installed-tests: assume we know what we're doing : elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +9,7 @@ sed -e 's/^/# /' < bwrap-result echo "1..0 # SKIP Cannot run bwrap" exit 0 -@@ -330,7 +330,7 @@ +@@ -332,7 +332,7 @@ } skip_without_python2 () { @@ -18,7 +18,7 @@ echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi -@@ -350,12 +350,12 @@ +@@ -352,12 +352,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -28,30 +28,51 @@ fi cleanup () { -- /bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} -+ @coreutils@/bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} +- /bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} ++ @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-} gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -21,6 +21,7 @@ - cat ${DIR}/metadata +@@ -26,6 +26,7 @@ + PATH="$PATH:/usr/sbin:/sbin" # Add bash and dependencies +mkdir -p ${DIR}/nix/store mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -30,47 +31,27 @@ +@@ -35,73 +36,27 @@ else cp `which ldconfig` ${DIR}/usr/bin fi --T=`mktemp` --for i in $@; do +-LIBS=`mktemp` +-BINS=`mktemp` +- +-add_bin() { +- local f=$1 +- shift +- +- if grep -qFe "${f}" $BINS; then +- # Already handled +- return 0 +- fi +- +- echo $f >> $BINS +- +- # Add library dependencies +- (ldd "${f}" | sed "s/.* => //" | awk '{ print $1}' | grep ^/ | sort -u -o $LIBS $LIBS -) || true +- +- local shebang=$(sed -n '1s/^#!\([^ ]*\).*/\1/p' "${f}") +- if [ x$shebang != x ]; then +- add_bin "$shebang" +- fi +-} +- + for i in $@; do - I=`which $i` -- cp $I ${DIR}/usr/bin -- ldd $I | sed "s/.* => //" | awk '{ print $1}' | grep ^/ | grep ^/ >> $T +- add_bin $I - if test $i == python2; then - mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload - # This is a hardcoded minimal set of modules we need in the current tests. @@ -78,10 +99,13 @@ - done - fi -done - ln -s bash ${DIR}/usr/bin/sh --for i in `sort -u $T`; do +-for i in `cat $BINS`; do +- echo Adding binary $i 1>&2 +- cp "$i" ${DIR}/usr/bin/ +-done +-for i in `cat $LIBS`; do +- echo Adding library $i 1>&2 - cp "$i" ${DIR}/usr/lib/ -+for i in $@; do + I=$(readlink -f $(which $i)) + requisites=$(nix-store --query --requisites "$I") + for r in $requisites; do @@ -92,6 +116,7 @@ + done + ln -s $I ${DIR}/usr/bin/$i done + ln -s bash ${DIR}/usr/bin/sh -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but -# the real en_US locale is often not available, because its in the @@ -110,7 +135,7 @@ collection_args=--collection-id=${COLLECTION_ID} --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -378,7 +378,7 @@ +@@ -610,7 +610,7 @@ { gint exit_code = 0; char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net", diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index a107c9a478f2..2bc36d1b2b9a 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv +, fetchurl + +, meson +, ninja +, pkgconfig +}: stdenv.mkDerivation rec { - name = "fribidi-${version}"; - version = "0.19.7"; + name = "${pname}-${version}"; + pname = "fribidi"; + version = "1.0.4"; - src = fetchFromGitHub { - owner = "fribidi"; - repo = "fribidi"; - rev = version; - sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d"; + # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. + src = fetchurl { + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - # Configure script checks for glib, but it is only used for tests. + nativeBuildInputs = [ meson ninja pkgconfig ]; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index abc24700fa21..07db27dcc791 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gettext-${version}"; - version = "0.19.8"; + version = "0.19.8.1"; src = fetchurl { url = "mirror://gnu/gettext/${name}.tar.gz"; - sha256 = "13ylc6n3hsk919c7xl0yyibc3pfddzb53avdykn4hmk8g6yzd91x"; + sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; }; patches = [ ./absolute-paths.diff ]; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9ce47ec2f1a2..b6de369a1ec3 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -11,14 +11,14 @@ assert idnSupport -> libidn != null; with stdenv.lib; let - version = "1.0.20"; + version = "1.0.21"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1a6yhs42wcdm8az3983m3lx4d9296bw0amz5v3b4012g1xn0hhq2"; + sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 2635aed3eaca..cb2c3f15da82 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -27,12 +27,13 @@ let self = stdenv.mkDerivation rec { # See <http://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like - optional (!stdenv.isSunOS) "--enable-fat" + optional (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "--enable-fat" ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]) ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" - ++ optional stdenv.isDarwin "ABI=64" + ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ++ optional stdenv.is64bit "--with-pic" + ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" ; # The config.guess in GMP tries to runtime-detect various @@ -75,7 +76,6 @@ let self = stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - broken = with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt; platforms = platforms.all; maintainers = [ maintainers.peti maintainers.vrthra ]; }; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 0a9513b0fc48..21f9adfdc8e3 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,14 +12,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.22.29"; + version = "3.22.30"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz"; - sha256 = "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0"; + sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 9a9c3b1fa64d..7625abf38fb3 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchurl, stdenv, pkgconfig, + fetchurl, fetchpatch, stdenv, pkgconfig, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, # Optional but increases closure only negligibly. @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2017-14166.patch ./CVE-2017-14502.patch + + # LibreSSL patch; this is from upstream, and can be removed when the next release is made. + (fetchpatch { + url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch"; + sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v"; + }) ]; outputs = [ "out" "lib" "dev" ]; @@ -46,6 +52,8 @@ stdenv.mkDerivation rec { -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; + enableParallelBuilding = true; + meta = { description = "Multi-format archive and compression library"; longDescription = '' diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index b74e64aa8490..d1b4e06dbc18 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils, fixDarwinDylibNames +{ stdenv, fetchurl, fetchpatch, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -13,6 +13,18 @@ stdenv.mkDerivation rec { sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n"; }; + #NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release. + patches = [ + (fetchpatch { + url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch"; + sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd"; + }) + (fetchpatch { + url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch"; + sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb"; + }) + ]; + # libevent_openssl is moved into its own output, so that openssl isn't present # in the default closure. outputs = [ "out" "dev" ] @@ -38,6 +50,8 @@ stdenv.mkDerivation rec { sed "/^libdir=/s|$out|$openssl|" -i "$openssl"/lib/libevent_openssl.la ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Event notification library"; longDescription = '' diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index f3a6983acae2..a86cf9b935ce 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "1v461hwdk74whp89s490dj1z18gfqf9bz9140m5f11rsvrpid33p"; + sha256 = "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 6f36199bd1a5..8f070bf4bda8 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8"; + sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 75898852a095..f9ea73089f4c 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -5,14 +5,14 @@ let pname = "libsoup"; - version = "2.62.0"; + version = "2.62.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b"; + sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy"; }; prePatch = '' diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 29d6e9a5670a..31081d69a271 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.36.1"; + version = "3.36.4"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_36_1_RTM/src/${name}.tar.gz"; - sha256 = "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0"; + url = "mirror://mozilla/security/nss/releases/NSS_3_36_4_RTM/src/${name}.tar.gz"; + sha256 = "0si4g5bnhzkxy2f7rnaw86jfdzni5gvc7svxcf7ms8n97nrrdpik"; }; buildInputs = [ perl zlib sqlite ] diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix new file mode 100644 index 000000000000..b60a53e55ca1 --- /dev/null +++ b/pkgs/development/libraries/opae/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake +, libuuid, json_c +, doxygen, perl, python2, python2Packages +}: + +stdenv.mkDerivation rec { + name = "opae-${version}"; + version = "1.0.0"; + + # the tag has a silly name for some reason. drop this in the future if + # possible + tver = "${version}-5"; + + src = fetchFromGitHub { + owner = "opae"; + repo = "opae-sdk"; + rev = "refs/tags/${tver}"; + sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8"; + }; + + doCheck = false; + + nativeBuildInputs = [ cmake doxygen perl python2Packages.sphinx ]; + buildInputs = [ libuuid json_c python2 ]; + + # Set the Epoch to 1980; otherwise the Python wheel/zip code + # gets very angry + preConfigure = '' + find . -type f | while read file; do + touch -d @315532800 $file; + done + ''; + + cmakeFlags = [ "-DBUILD_ASE=1" ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open Programmable Acceleration Engine SDK"; + homepage = https://01.org/opae; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} 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 ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 5ac0bcd1d7d7..bd095a11f088 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -77,13 +77,13 @@ let then blas64_ else hasPrefix "x86_64" stdenv.system; - version = "0.2.20"; + version = "0.3.0"; in stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy"; + sha256 = "18giv3lsh8cva01z4rhsx8jvgliknni0jp7vxkc69qxb14vm8lfg"; name = "openblas-${version}.tar.gz"; }; @@ -118,12 +118,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; - patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") - # https://github.com/xianyi/OpenBLAS/pull/1247 - (fetchpatch { - url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch"; - sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n"; - }); + patches = []; # TODO: Remove on next mass-rebuild doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 59765adf7a87..b9fba467457e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U3"; + version = "2018_U4"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "137hb03ms93v4svjq038z6clfh41y8iq7wcif8n92xz2wzaap006"; + sha256 = "00y7b4x0blkn0cymnrbh6fw7kp4xcdp4bi14rj33sl1lypawa1j6"; }; makeFlags = concatStringsSep " " ( diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 8b25a20d8eb9..d3fffa2dd32f 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -15,20 +15,20 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.2"; + version = "2.20.3"; meta = { description = "Web content rendering engine, GTK+ port"; homepage = https://webkitgtk.org/; license = licenses.bsd2; - platforms = with platforms; linux ++ darwin; + platforms = platforms.linux; hydraPlatforms = []; maintainers = with maintainers; [ ]; }; src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1qi6nnj4qidzija1am9xscwjxwfqwhiy7x39ndriqgzh86i97znz"; + sha256 = "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index e17ac6d15075..32ce856eddd3 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, nss, makeWrapper }: let - version = "1.2.26"; + version = "1.2.25"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; + sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 1323466ea865..9541d62e1601 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -110,7 +110,8 @@ rec { mkdir -p $out cp -r ${includePath} $out/include chmod +w $out/include - ${lib.optionalString (lib.versionOlder buildAndroidndk.version "10e") "ln -s $out/include/${targetInfo.triple}/asm $out/include/asm"} + ${lib.optionalString (lib.versionOlder "10e" buildAndroidndk.version) + "ln -s $out/include/${hostInfo.triple}/asm $out/include/asm"} ln -s ${libPath} $out/lib ''; } diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 88709949aee4..189468a2daa9 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.28.2"; + version = "0.28.3"; src = fetchPypi { inherit pname version; - sha256 = "634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a"; + sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index 5518dc382a8b..049c020c5ab4 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Flask-PyMongo"; name = "${pname}-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d"; + sha256 = "aab5ddab8f443e8a011e024f618bb89e078bdcc2274597079469fdf5ddc032b5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 9eb04782d6f8..8c70a0eb7e9f 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -42,13 +42,13 @@ let in buildPythonPackage rec { name = "${pname}-${version}"; pname = "Theano"; - version = "1.0.1"; + version = "1.0.2"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchPypi { inherit pname version; - sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662"; + sha256 = "6768e003d328a17011e6fca9126fbb8a6ffd3bb13cb21c450f3e724cca29abde"; }; postPatch = '' diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index d8209b233977..7f0831eb7b03 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "XlsxWriter"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "ad947fd9e8edfb64f25e0ccfb161e109f279e5a5520b3dd22ddc03b7f8220887"; + sha256 = "bd4661c04a68621cb2ebc07c38b8b2e98e30bf213a16e1cf3675b61e26ca9bf2"; }; meta = { diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index b865b5654964..49d0bc6c6377 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y"; + sha256 = "5d2c60c0cbf87c663ef3a0b394980ff86f56ebd3c47cc87df6c410e774216c50"; }; # hardcodes a test dependency on an old version of pytest-asyncio diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 91b98d8b6ac0..a7661cd7bb64 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.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2"; + sha256 = "dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index 479792a7ca59..db7015f2f16e 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "backports.csv"; - version = "1.0.5"; + version = "1.0.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc"; + sha256 = "bed884eeb967c8d6f517dfcf672914324180f1e9ceeb0376fde2c4c32fd7008d"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 85653daaa40a..dcbc9e5ccd07 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "0.12.15"; + version = "0.12.16"; src = fetchPypi { inherit pname version; - sha256 = "2891b883b30107dc610a7e963a21222f1fd096844d157c09db115179cfab6513"; + sha256 = "de14151c7ef768f858f46168546c1d492cb04ab3c58bc118329a78ebf35b4688"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 250703cbc53b..240dd5513e85 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,15 +3,15 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.31.0"; + version = "0.31.1"; format = "wheel"; - sha256 = "9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107"; + sha256 = "80044e51ec5bbf6c894ba0bc48d26a8c20a9ba629f4ca19ea26ecfcf87685f5f"; }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "39.0.1"; + version = "39.2.0"; format = "wheel"; - sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8"; + sha256 = "8fca9275c89964f13da985c3656cb00ba029d7f3916b37990927ffdf264e7926"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 95b0f8dddc55..5d36ae4d122e 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.3"; + version = "2.11.4"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "f7fde2cde7b937f67e52a3e94b76f9294b73c1e9bb698430e96778f3f735544c"; + sha256 = "20b22d9c99c99909b6b2dc679e8acd9e1fcf9f58e23f336d8b2c5be70617fbb2"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 51d3d9e6833e..3f6b2ed3ccd0 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.7.6"; + version = "0.7.8"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k"; + sha256 = "57b71855b7659e9c8dc21722a3ed0b33efb2ead2916b22ced3b83339bcdff1a2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index b7fd01472aab..7457002929aa 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.1.3"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6"; + sha256 = "45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 7f3fb46d1e10..e7a7351b4ab8 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp"; + sha256 = "d1f2a3359bdbdfb344edce98b8e891f5fe64f8a11c5a45538ec20ac237c971f5"; }; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index ec5f8bcba3b2..acae5d73b2cf 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.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "b0e63dd89ed5285171a570186751bc9b84493675e99e12789e9a5dc5490ef554"; + sha256 = "54858c7b7dc763ed894ff91059c1d0b017d593fe23850d3d8d75f47d98398197"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 9bbf1da7a65e..d18b2cb1c7c4 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.4"; + version = "0.17.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d"; + sha256 = "ea8ad7735048a6e8a9e389186f840a0a9e5c5eeb55379c8b3c9d4883be863c5c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index cdcc313ed82d..4ebb9a336908 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.97.2"; + version = "0.97.7"; src = fetchPypi { inherit pname version; - sha256 = "b4c5165d29f6ca893797974aa9f228d2ad39aa864c166ce5bcb89c636489c8e6"; + sha256 = "855800d12df87855096eeafc58f34c9092407e8faf197f48073e7bc2b1938de0"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix new file mode 100644 index 000000000000..fbc915c8eb04 --- /dev/null +++ b/pkgs/development/python-modules/deap/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib }: + +buildPythonPackage rec { + pname = "deap"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "95c63e66d755ec206c80fdb2908851c0bef420ee8651ad7be4f0578e9e909bcf"; + }; + + propagatedBuildInputs = [ numpy matplotlib ]; + + checkPhase = '' + ${python.interpreter} setup.py nosetests --verbosity=3 + ''; + + meta = with stdenv.lib; { + description = "DEAP is a novel evolutionary computation framework for rapid prototyping and testing of ideas."; + homepage = https://github.com/DEAP/deap; + license = licenses.lgpl3; + maintainers = with maintainers; [ psyanticy ]; + }; + +} + diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index cf87bc66885d..4b0aba45cd7a 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.5.1"; + version = "5.5.4"; src = fetchPypi { inherit pname version; - sha256 = "2d2762fa55613855b0a04f22e1c6c2c5b53d60301b437205d0e2533e4185671a"; + sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0"; }; # The integration tests require a running elasticsearch cluster. diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 664322362b25..99bbb7704034 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.7.8"; + version = "0.7.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "af373ab7b9611990d39b090eed372a0860d4e12a1c8a6ef49fdee29e4626053f"; + sha256 = "e4ffa43be977997a4c6b62f5ab7996df3acf54c68824875fecd896da5af341a3"; }; patches = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9fd37f86f740..431d137ea2e9 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.13"; + version = "0.8.15"; src = fetchPypi { inherit pname version; - sha256 = "48fed4b4a191e2b42ad20c14115f1c6d36d338b80192075d7573f0f42d7fb321"; + sha256 = "a77a1a2223a8e0d32618878350bbd2171040f32b526ba2cddfab8864704bb370"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index bab965b5a9c1..08f547d835da 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -4,7 +4,6 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; version = "1.4.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index 0289c008e7e8..7283a5022681 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; - version = "0.1.4"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "1340lhg7k522bqpz5iakl51qb47mjw804mfwwzm77i7qcm5cwiz8"; + sha256 = "3b19abd8873880ad59575788279731c07838e803c4f31d62410920fa6b1f95d5"; }; propagatedBuildInputs = [ six mock ]; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index ae036d33f9ed..63c7188f03ac 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "html5-parser"; version = "0.4.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix new file mode 100644 index 000000000000..22f4ba9301f8 --- /dev/null +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, requests_ntlm +}: + +buildPythonPackage rec { + pname = "IBMQuantumExperience"; + version = "1.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "480cce2ca285368432b7d00b9cd702a4f8a1c9d69914ba6f65e08099e151e407"; + }; + + propagatedBuildInputs = [ + requests + requests_ntlm + ]; + + # test requires an API token + doCheck = false; + + meta = { + description = "A Python library for the Quantum Experience API"; + homepage = https://github.com/QISKit/qiskit-api-py; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + pandaman + ]; + }; +} diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index eef9dc493f60..bdd06b8b7cee 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.2"; + version = "1.4.3"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "6a5c516f540f4b13b78c64a85dd42dc38fe29257e2fae6393fc5daff9106389b"; + sha256 = "078acdcd1fc6eddacc46d437c664998b4cf7613b7e79ced66a460965f2648f88"; }; checkInputs = [ pytest six mock ]; diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index 81d1e57e7a04..0740cfa84bb7 100644 --- a/pkgs/servers/web-apps/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -1,6 +1,6 @@ { lib, python, fetchFromGitHub }: -python.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonPackage rec { pname = "klaus"; version = "1.2.2"; diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 2e05ee621e2a..9f0ce1b21534 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "MarkdownSuperscript"; version = "2.0.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 71cc0cddf1b9..fa218d821cfc 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.15.1"; + version = "2.15.3"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b73361eab812af97eaf8e8691333a1096787968450051d132c8b9fb90aa1db5a"; + sha256 = "171f409d48b44786b7df2793cbd7f1a9062f0fe2c14d547da536b5010f671ade"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 36153c102290..4d96798bfae3 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.8.2"; + version = "1.8.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40"; + sha256 = "c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index f47a2acf200c..dd96214ca863 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "parso"; - version = "0.2.0"; + version = "0.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2"; + sha256 = "f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 9b249f0a2b6f..43ea5829d5a6 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 = "4.0.2"; + version = "4.0.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f"; + sha256 = "6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index c13be981f095..3b15e7a30279 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "pelican"; - name = "${pname}-${version}"; version = "3.7.1"; disabled = isPy26; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 4940a8b2e046..b861797c4a8f 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "persistent"; version = "4.2.4.2"; - name = "${pname}-${version}"; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5f1c1b767040..12f4b76746e6 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.5"; + version = "8.9.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x"; + sha256 = "eec334a7908746b675a0ba296b3a11322ed970614b62f2a6e5f086de4f3e2a84"; }; meta = { diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 8037796713ec..09015e7d04ad 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyasn1"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15"; + sha256 = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 1ecf0bf6b339..af975e333f0f 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { version = pycryptodome.version; pname = "pycrypto"; - name = "${pname}-${version}"; # Cannot build wheel otherwise (zip 1980 issue) SOURCE_DATE_EPOCH=315532800; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index 973a2e84ffa7..fdc76493da8c 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { version = "0.10.4"; pname = "pyFFTW"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 282f9b65cb69..ae48eb629942 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.6.1"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "ce829433a9af640e08ee89b20f7c62132714bcc5d77df114044d0fccb8c3b3b8"; + sha256 = "03ce3e66e2a26a085f0e043236dedd78aaabf53a64dab9a216671f74ee272845"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 6e2d923f80c4..6b33f7746f96 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.5.0"; + version = "0.5.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "bb02fe5a02fb4e8baad4d7ccf7ba5e748044ee0a1ad7d2fa4927f68f396863c4"; + sha256 = "e69dc81dc3f10ccb33186ddcce910e116b4e77304e93af4092567130bcd6df5c"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index 6248ed7bf66a..7c8d51f2f43e 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }: +{ stdenv, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }: -assert isPy3k; stdenv.mkDerivation rec { name = "pythonix-${version}"; - version = "0.1.0"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Mic92"; repo = "pythonix"; rev = "v${version}"; - sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; + sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk"; }; - nativeBuildInputs = [ meson pkgconfig ninja ]; + disabled = !isPy3k; - buildInputs = [ nixUnstable ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + + buildInputs = [ nix boost ]; + + checkPhase = '' + ninja test + ''; meta = with stdenv.lib; { description = '' @@ -23,6 +28,5 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.mic92 ]; license = licenses.mit; - platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 374263c2b70e..66dc7dda835e 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytimeparse"; - version = "1.1.7"; + version = "1.1.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "51b641bcd435e0cb6b9701ed79cf7ee97fa6bf2dbb5d41baa16e5486e5d9b17a"; + sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a"; }; propagatedBuildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix new file mode 100644 index 000000000000..174e0871ca2f --- /dev/null +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cairocffi +, cairosvg +, cffi +, qiskit +, svgwrite +, colorama +, python +}: + +buildPythonPackage rec { + pname = "qasm2image"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "nelimeee"; + repo = "qasm2image"; + rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa"; + sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3"; + }; + + propagatedBuildInputs = [ + cairocffi + cairosvg + cffi + qiskit + svgwrite + ]; + + checkInputs = [ + colorama + ]; + checkPhase = '' + ${python.interpreter} tests/launch_tests.py + ''; + + meta = { + description = "A Python module to visualise quantum circuit"; + homepage = https://github.com/nelimeee/qasm2image; + license = lib.licenses.cecill-b; + maintainers = with lib.maintainers; [ + pandaman + ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix new file mode 100644 index 000000000000..090358152e79 --- /dev/null +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, isPy3k +, buildPythonPackage +, fetchPypi +, fetchurl +, python +, numpy +, scipy +, sympy +, matplotlib +, networkx +, ply +, pillow +, cffi +, requests +, requests_ntlm +, IBMQuantumExperience +, cmake +, llvmPackages +}: + +buildPythonPackage rec { + pname = "qiskit"; + version = "0.4.15"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "bd126a35189f8303df41cb7b7f26b0d06e1fabf61f4fd567b8ec356d31170141"; + }; + + buildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp; + + propagatedBuildInputs = [ + numpy + matplotlib + networkx + ply + scipy + sympy + pillow + cffi + requests + requests_ntlm + IBMQuantumExperience + ]; + + # Pypi's tarball doesn't contain tests + doCheck = false; + + patches = [ + ./setup.py.patch + ]; + + meta = { + description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; + homepage = https://github.com/QISKit/qiskit-sdk-py; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ + pandaman + ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch new file mode 100644 index 000000000000..bb7cb71ae098 --- /dev/null +++ b/pkgs/development/python-modules/qiskit/setup.py.patch @@ -0,0 +1,19 @@ +--- a/setup.py ++++ b/setup.py +@@ -28,11 +28,11 @@ from setuptools.dist import Distribution + + requirements = [ + "IBMQuantumExperience>=1.8.29", +- "matplotlib>=2.1,<2.2", +- "networkx>=2.0,<2.1", +- "numpy>=1.13,<1.15", +- "ply==3.10", +- "scipy>=0.19,<1.1", ++ "matplotlib>=2.1", ++ "networkx>=2.0", ++ "numpy>=1.13", ++ "ply>=3.10", ++ "scipy>=0.19", + "sympy>=1.0", + "pillow>=4.2.1" + ] diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 91ab82a7a30e..6d1264dee67e 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "requests_download"; version = "0.1.1"; - name = "${pname}-${version}"; format = "wheel"; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 00bdcae1b9a8..dc63fe7d104d 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -7,7 +7,6 @@ buildPythonPackage rec { pname = "scikit-learn"; version = "0.19.1"; - name = "${pname}-${version}"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index c4992eb9d9bb..006f52f1d38b 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "smart_open"; - name = "${pname}-${version}"; version = "1.5.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 3ccccdbf77d8..1596b276b0af 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -25,7 +25,6 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "Sphinx"; version = "1.7.4"; src = fetchPypi { @@ -70,4 +69,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nand0p ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e58bbde1353f..774de4d278ce 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "2.8.23"; + version = "2.8.25"; src = fetchPypi { inherit pname version; - sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7"; + sha256 = "8f790cb8a704b44ffd5efe5a9cb46204a042b55a9cddeb61434193cfd534275c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 108a7cf5bb0b..7cefccc5db0a 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "uritools"; - version = "2.1.0"; + version = "2.1.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "a7b58a249a851ef5fff1bc513b940653f0d4841a6668e02431c1297f05efeec3"; + sha256 = "64369ece6f5c6ab18cba2cd0b199da40ffb9390493da1ff5c1d94b6ed107b401"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 6db21baf7509..65bc41856f79 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.31.0"; + version = "0.31.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce"; + sha256 = "0a2e54558a0628f2145d2fc822137e322412115173e8a2ddbe1c9024338ae83c"; }; checkInputs = [ pytest pytestcov coverage ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 4035575915f0..aeb267dd1dd7 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.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "72fafe29ba00633483aed39e405442226ef66d2ddc1021a39527ae1522b7067a"; + sha256 = "64c2d07b75b8ea1320cba521818a2f09107f5f46514d50ff5ef1c4d5da90aaf1"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 108f5395ece4..9ce53223f655 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "1.0"; + version = "1.0.1"; name = "${pname}-${version}"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "3af9169fb1d5901cf6693ab356b0dfda20ad2cacc5673fad59b4449ed50d5399"; + sha256 = "5fdfa84f05b25511a4e1190ec98728aa487e2eb6db016a951fdbb79bcc7307e0"; }; # fails.. diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 60697e72d724..58831d2cc4ef 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf +, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick }@args: let @@ -96,6 +96,37 @@ in ''; }; + fog-dnsimple = attrs: { + postInstall = '' + cd $(cat $out/nix-support/gem-meta/install-path) + rm {$out/bin,bin,../../bin}/{setup,console} + ''; + }; + + redis-rack = attrs: { + dontBuild = false; + preBuild = '' + exec 3>&1 + output="$(gem build $gemspec | tee >(cat - >&3))" + exec 3>&- + sed -i 's!"rake".freeze!!' $gemspec + ''; + }; + + ffi-rzmq-core = attrs: { + postInstall = '' + installPath=$(cat $out/nix-support/gem-meta/install-path) + sed -i $installPath/lib/ffi-rzmq-core/libzmq.rb -e 's@inside_gem =.*@inside_gem = "${zeromq}/lib"@' + ''; + }; + + mini_magick = attrs: { + postInstall = '' + installPath=$(cat $out/nix-support/gem-meta/install-path) + echo -e "\nENV['PATH'] += ':${graphicsmagick}/bin'\n" >> $installPath/lib/mini_magick/configuration.rb + ''; + }; + do_sqlite3 = attrs: { buildInputs = [ sqlite ]; }; @@ -105,7 +136,7 @@ in }; ffi = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libffi ]; }; @@ -216,7 +247,7 @@ in }; pango = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; }; @@ -255,7 +286,7 @@ in }; rmagick = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ imagemagick which ]; }; @@ -350,7 +381,7 @@ in xapian-ruby = attrs: { # use the system xapian dontBuild = false; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xapian_1_2_22 zlib ]; postPatch = '' cp ${./xapian-Rakefile} Rakefile diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 6019235c47b9..5a095c8b6a0e 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.83"; + version = "1.84"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "14d4afjz0jshwpqryvwvzrs3rrqnd7cgg3x19awgy116591ibd83"; + sha256 = "1rp8j0akxzcpvr2na5zchz8zxq5ldngiwj7f6sibjq5p3dcyn2w5"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix new file mode 100644 index 000000000000..85307d58704d --- /dev/null +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -0,0 +1,37 @@ +{ lib +, python +}: + +with python; + +pkgs.buildPythonApplication rec { + pname = "aws-sam-cli"; + version = "0.3.0"; + + src = pkgs.fetchPypi { + inherit pname version; + sha256 = "7e7275a34e7e9d926198fd9516404310faa2a9681b7a8b0c8b2f9aa31aeb1bfb"; + }; + + # Tests are not included in the PyPI package + doCheck = false; + + propagatedBuildInputs = with pkgs; [ + aws-sam-translator + boto3 + click + cookiecutter + docker + enum34 + flask + pyyaml + six + ]; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-sam-cli; + description = "CLI tool for local development and testing of Serverless applications"; + license = licenses.asl20; + maintainers = with maintainers; [ andreabedini ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index d5eaa24c1675..e641e69bae6d 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,7 +1,9 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false +# Apple dependencies +, libcxx, CoreFoundation, CoreServices, Foundation }: stdenv.mkDerivation rec { @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = [ maintainers.philandstuff ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; name = "bazel-${version}"; @@ -29,9 +31,30 @@ stdenv.mkDerivation rec { # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. - customBash = writeScriptBin "bash" '' - #!${stdenv.shell} - PATH="$PATH:${lib.makeBinPath [ coreutils ]}" exec ${bash}/bin/bash "$@" + customBash = writeCBin "bash" '' + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + + extern char **environ; + + int main(int argc, char *argv[]) { + printf("environ: %s\n", environ[0]); + char *path = getenv("PATH"); + char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } ''; postPatch = '' @@ -54,7 +77,7 @@ stdenv.mkDerivation rec { makeWrapper which customBash - ]; + ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index ef8a0cdc38ef..e0f1be8351a9 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.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8"; + sha256 = "0f14453e2f2f357f44edd79df2d3b3901b4e03f4746693c209b71e226ed238cd"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 8e3993fadc14..d37e25943b5f 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -22,7 +22,7 @@ cmakeConfigurePhase() { if [ -z "$dontUseCmakeBuildDir" ]; then mkdir -p build cd build - cmakeDir=.. + cmakeDir=${cmakeDir:-..} fi if [ -z "$dontAddPrefix" ]; then diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 849c722e5548..3aab715e4d9e 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,12 +20,12 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.2.3"; + version = "1.4.4"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23"; + sha256 = "1g03f8rw9l198w9ph0gi0q3g84ilp1dxxc9nmj0dgnymcfgpf89n"; }; checkInputs = with newPython.pkgs; [ diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 6022b645172c..f14f6adf5fef 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -4,7 +4,6 @@ in python3Packages.buildPythonApplication rec { version = "0.46.1"; pname = "meson"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index c59d2faaf26c..b1df54f9bd5c 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, asciidoc, re2c }: +{ stdenv, fetchFromGitHub, python, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: stdenv.mkDerivation rec { name = "ninja-${version}"; @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; }; - nativeBuildInputs = [ python asciidoc re2c ]; + nativeBuildInputs = [ python asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ]; buildPhase = '' python configure.py --bootstrap - asciidoc doc/manual.asciidoc + # "./ninja -vn manual" output copied here to support cross compilation. + asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc + xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html ''; installPhase = '' diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 9535ba86dd06..796c3dc79a09 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -7,7 +7,6 @@ in buildPythonApplication rec { pname = "Flootty"; version = "3.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index de66bf5da14e..12d3f97dfc41 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -3,7 +3,6 @@ let deps = import ./requirements.nix { inherit pkgs; }; in python27Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "gdbgui"; version = "0.11.1.2"; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 05229e4be7b2..42824d1a543e 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -3,7 +3,6 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; version = "0.5.1"; - name = "${pname}-${version}"; src = python2.pkgs.fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index b7757b474716..ae624c549eb1 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.0"; + version = "1.2.4"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "05qsyh6d4qsvabr543ggd4b09fipxzr270cawsx0glmkgw82nkzi"; + sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 79cca444a1e9..6632d0626339 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { license = licenses.mit; homepage = https://github.com/dbohdan/remarshal; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index aafff7290c5c..f6c160de65c3 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.35"; + version = "0.1.36"; src = fetchPypi { inherit pname version; - sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c"; + sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 535ab7b45fa3..635c9efa40e8 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.7.0"; + version = "1.8.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "00fxihv9ih40k6f21a7hb6vkx4h4m6ks0fbai5h9ssi0p4m5j3by"; + sha256 = "145z9i935kab5pv3pldgs3b1i9ppplc928c71c2lbz8my1z6j77w"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index 201e85985d82..52231d0a8318 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.5.0"; + version = "2.6.0"; propagatedBuildInputs = [ pyyaml xmltodict jq ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "e9fd2aa32defcd051058e3b6f665873282aa4eed19e11b1db94fe70847535d4c"; + sha256 = "0wyzg6lwxmzqsblljg9hddkadda7qdpw54sp0pmmbv89hhz7cky6"; }; meta = with lib; { diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index ec5a0e779c34..07f8e3b60002 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.3.0"; - sha256 = "0c8zcwi7r7nnmk29lprdmvil693x5svy3nzbaaqywmg6x2yyk46b"; + version = "10.4.1"; + sha256 = "0i40mn8g71z7wildhnjp64j7fnlld32dibyq677bd4pra95migx5"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index ddb4235c5dba..b9294e294e9d 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" ''; + hardeningDisable = [ "format" ]; # no build output otherwise + meta = with lib; { description = "Screen locker for the X Window System"; homepage = http://sillycycle.com/xlockmore.html; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index a67133c32367..b095096caa76 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -3,11 +3,11 @@ systemd, enableWiimote ? false, enableMidi ? false }: stdenv.mkDerivation rec { - name = "bluez-5.49"; + name = "bluez-5.50"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k"; + sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; }; pythonPath = with pythonPackages; [ diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8acc374b2d4b..79bc8e510933 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.48"; + version = "4.14.49"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f92pz92mf0x9jfv3qf4w40i78l053f2qh2n8p2sbrqzc67n1840"; + sha256 = "1xrvklrh0zf3ma61qkbng2495j4bcvif45l8bm5074pk3rrlk7y6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 0a06c4dd434e..2643faac48a0 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.14"; + version = "4.16.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1h6zjnwpdyqk9fp72c35565lhw00kpjl55faakwx7xsxfpyvc25p"; + sha256 = "0v13g5ancr85hr24y7xagjn9w168h2d87m4m4hr4a2i45mrsdwjq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index b360e98f0c09..ca8abcc0ef1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17"; + version = "4.17.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04yd7hnsdyaq4xmrgg7509qjf09k1dy6k1p8qqfrdspajvc1valz"; + sha256 = "0w3hma7k4nwjp1zsfgn2i18dsmmdn1lxccqx3vapwsz6pjy3ygy9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ecef71fd604f..999952dba699 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.136"; + version = "4.4.137"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0svb6qbhc376jk26r67qssh7lradx63s60qlm1q2kd4xjhxyj5a3"; + sha256 = "01hjnwfrx0fr9zbd6qcqfxsp0xm34ai7k49i7ndxwcrhzdipkl9i"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index bcc4aad7fccb..d9b821b8f15f 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.107"; + version = "4.9.108"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lya48grdgjjbzw8x5kvvblanfas23dcmchysnhwv5p0rq7g9rrw"; + sha256 = "0ha0bvjfxz6nx3nrcrpciqlrphy318xi04lv4k7jr5hpialjpzkk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index a039984ff338..3ee5e312d233 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pkgname = "pommed-light"; - version = "1.50lw"; + version = "1.51lw"; name = "${pkgname}-${version}"; src = fetchurl { url = "https://github.com/bytbox/${pkgname}/archive/v${version}.tar.gz"; - sha256 = "1r2f28zqmyvzgymd0ng53hscbrq8vcqhxdnkq5dppjf9yrzn018b"; + sha256 = "11wi17bh2br1hp8gmq40b1hm5drm6h969505f7432zam3cm8mc8q"; }; postPatch = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { and the like. ''; homepage = https://github.com/bytbox/pommed-light; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index acb159a4acc9..42982d49ce87 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -24,11 +24,8 @@ stdenv.mkDerivation rec { buildPhase = "make module"; meta = with stdenv.lib; { - homepage = https://www.wireguard.com/; - downloadPage = https://git.zx2c4.com/WireGuard/refs/; - description = "Kernel module for the WireGuard secure network tunnel"; - maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; - license = licenses.gpl2; - platforms = platforms.linux; + inherit (wireguard-tools.meta) homepage license maintainers; + description = "Kernel module for the WireGuard secure network tunnel"; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b28a5c6416d0..c44d64b8fa81 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -6,6 +6,7 @@ , zlib, libuuid, python, attr, openssl , libtirpc , nfs-utils +, gawk, gnugrep, gnused, systemd # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null @@ -76,12 +77,15 @@ let substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "@bindir@/rm " "${coreutils}/bin/rm " + --replace "/bin/rm " "${coreutils}/bin/rm " for f in ./udev/rules.d/* do substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" done + substituteInPlace ./cmd/vdev_id/vdev_id \ + --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" ./autogen.sh configureFlagsArray+=("--libexecdir=$out/libexec") diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index c1c0d4e425c2..63e4f3baa8f4 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.21"; + name = "nsd-4.1.22"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1gfjdgb5nc0nrbpdm36ngxml302khl2lnwkykl3q45byl0sbjn3q"; + sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi"; }; prePatch = '' diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 20c9eecb0d5f..c34edfb5d6f8 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # cannot find postgresql libs on macos x license = licenses.gpl2; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 disassembler ]; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3b1b34ac9d57..302aa8d55932 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.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1lrbjqa9rxn2prbnha9aghnwyi4z1rpfd7bk0bjsjixjl389d6d8"; + sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q"; }; patches = [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 4017f5946a48..146d9d23198b 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl -, boost, cctools, CoreServices, developer_cmds }: +{ stdenv, fetchurl, cmake, bison +, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl +, cctools, CoreServices, developer_cmds }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -18,7 +19,9 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - buildInputs = [ cmake bison ncurses openssl readline zlib boost ] + nativeBuildInputs = [ cmake bison ]; + + buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; enableParallelBuilding = true; @@ -30,7 +33,11 @@ self = stdenv.mkDerivation rec { "-DWITH_SSL=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITH_UNIT_TESTS=no" - "-DWITH_ZLIB=yes" + "-DWITH_EDITLINE=system" + "-DWITH_LIBEVENT=system" + "-DWITH_LZ4=system" + "-DWITH_PROTOBUF=system" + "-DWITH_ZLIB=system" "-DWITH_ARCHIVE_STORAGE_ENGINE=yes" "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" "-DWITH_FEDERATED_STORAGE_ENGINE=yes" diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 937494916112..a053884bb885 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, cacert, - makeWrapper, less, openssl }: +{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, + makeWrapper, less, openssl, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" @@ -10,6 +10,7 @@ let platformString = if stdenv.isDarwin then "osx" platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" else throw "unsupported platform"; + libraries = [ libunwind libuuid icu curl openssl lttng-ust ] ++ (if stdenv.isLinux then [ pam ] else []); in stdenv.mkDerivation rec { name = "powershell-${version}"; @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ autoPatchelfHook makeWrapper ]; - propagatedBuildInputs = [ libunwind libuuid icu curl cacert less openssl ]; + buildInputs = [ less ] ++ libraries; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in # https://github.com/PowerShell/PowerShell/pull/6144 @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/powershell cp -r * $out/share/powershell rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY - makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath [ libunwind libuuid icu openssl curl ]}" \ + makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ --set PAGER ${less}/bin/less --set TERM xterm ''; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 951c96877f96..7ef74c5ea7df 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -159,26 +159,27 @@ in rec { dyld = bootstrapTools; }; - libcxx = stdenv.mkDerivation { - name = "bootstrap-stage0-libcxx"; - phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' - mkdir -p $out/lib $out/include - ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib - ln -s ${bootstrapTools}/include/c++ $out/include/c++ - ''; - linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh; - }; + llvmPackages_5 = { + libcxx = stdenv.mkDerivation { + name = "bootstrap-stage0-libcxx"; + phases = [ "installPhase" "fixupPhase" ]; + installPhase = '' + mkdir -p $out/lib $out/include + ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib + ln -s ${bootstrapTools}/include/c++ $out/include/c++ + ''; + linkCxxAbi = false; + setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh; + }; - libcxxabi = stdenv.mkDerivation { - name = "bootstrap-stage0-libcxxabi"; - buildCommand = '' - mkdir -p $out/lib - ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib - ''; + libcxxabi = stdenv.mkDerivation { + name = "bootstrap-stage0-libcxxabi"; + buildCommand = '' + mkdir -p $out/lib + ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib + ''; + }; }; - }; extraNativeBuildInputs = []; @@ -236,8 +237,11 @@ in rec { patchutils m4 scons flex perl bison unifdef unzip openssl python gettext sharutils libarchive pkg-config groff bash subversion openssh sqlite sed serf openldap db cyrus-sasl expat apr-util - findfreetype libssh curl cmake autoconf automake libtool cpio - libcxx libcxxabi; + findfreetype libssh curl cmake autoconf automake libtool cpio; + + llvmPackages_5 = super.llvmPackages_5 // { + inherit (llvmPackages_5) libcxx libcxxabi; + }; darwin = super.darwin // { inherit (darwin) @@ -272,14 +276,18 @@ in rec { persistent = self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash - libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep + ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; - llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; - in super.llvmPackages // { - llvm = llvmOverride; - clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; - }; + llvmPackages_5 = super.llvmPackages_5 // (let + tools = super.llvmPackages_5.tools.extend (_: _: { + llvm = llvmPackages_5.llvm.override { inherit libcxxabi; }; + clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; }; + }); + libraries = super.llvmPackages_5.libraries.extend (_: _: { + inherit (llvmPackages_5) libcxx libcxxabi; + }); + in { inherit tools libraries; } // tools // libraries); darwin = super.darwin // { inherit (darwin) dyld Libsystem libiconv locale; @@ -311,12 +319,17 @@ in rec { persistent = self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash - libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep + ncurses libffi zlib llvm gmp pcre gnugrep coreutils findutils diffutils patchutils; - llvmPackages = super.llvmPackages // { - inherit (llvmPackages) llvm clang-unwrapped; - }; + llvmPackages_5 = super.llvmPackages_5 // (let + tools = super.llvmPackages_5.tools.extend (_: _: { + inherit (llvmPackages_5) llvm clang-unwrapped; + }); + libraries = super.llvmPackages_5.libraries.extend (_: _: { + inherit (llvmPackages_5) libcxx libcxxabi; + }); + in { inherit tools libraries; } // tools // libraries); darwin = super.darwin // { inherit (darwin) dyld ICU Libsystem libiconv; diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 7061adb8e88a..dd41cd157cae 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersBroken = stdenv.isDarwin || stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0; + sanitizersBroken = stdenv.cc.isClang && versionOlder (getVersion stdenv.cc.name) "6.0.0"; in stdenv.mkDerivation { name = "cc-wrapper-test"; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index bd0f051bd845..1a85bf21b224 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,7 +7,6 @@ with python.pkgs; buildPythonApplication rec { pname = "mycli"; version = "1.6.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index eaae8f40bfab..ef43ba2ba517 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,5 +1,5 @@ { - stdenv, python2Packages, openssl, + stdenv, pythonPackages, openssl, # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. @@ -8,7 +8,7 @@ let # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved - tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec { + tornado = pythonPackages.tornado.overridePythonAttrs (oldAttrs: rec { version = "4.5.3"; name = "${oldAttrs.pname}-${version}"; src = oldAttrs.src.override { @@ -17,17 +17,16 @@ let }; }); in -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "salt"; version = "2018.3.0"; - src = python2Packages.fetchPypi { + src = pythonPackages.fetchPypi { inherit pname version; sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950"; }; - propagatedBuildInputs = with python2Packages; [ - futures + propagatedBuildInputs = with pythonPackages; [ jinja2 markupsafe msgpack-python @@ -36,6 +35,8 @@ python2Packages.buildPythonApplication rec { pyzmq requests tornado + ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ + futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 546e9a7aad98..14b128d15c7a 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -3,11 +3,11 @@ , withGog ? false, unar ? null }: stdenv.mkDerivation rec { - name = "innoextract-1.6"; + name = "innoextract-1.7"; src = fetchurl { url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; + sha256 = "197hs9aj1ska6czrsq4caazsw9v0xbaa0lazbh380fmwy8rbgvy1"; }; buildInputs = [ python lzma boost ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 6de4d3d859ed..0d11ba394e6b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,18 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.5"; + version = "1.1.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "4356e6c712871f389e3cb1d6382e341ea635f9e5c65de1cd8fcd103d0fb66d3d"; + sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930"; }; - postPatch = '' - # loosen constraint on msgpack version, only 0.5.0 had problems - sed -i "s/'msgpack-python.*'/'msgpack-python'/g" setup.py - ''; - nativeBuildInputs = with python3Packages; [ # For building documentation: sphinx guzzle_sphinx_theme diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index d55783f7f2ce..d4b6b9a72eba 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,16 +2,16 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.12"; + version = "0.7.17"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz"; - sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi"; + url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; + sha256 = "0jmh3h09680xyf33hzxxxl74bwz66zqhzvjlj7j89r9rz3qwa91p"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ - boto cffi cryptography ecdsa enum idna pygobject3 + boto cffi cryptography ecdsa enum idna pygobject3 fasteners ipaddress lockfile paramiko pyasn1 pycrypto six ]; checkInputs = with python2Packages; [ lockfile mock pexpect ]; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 04c83fa03fcf..7e29ee2b856a 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "131"; + version = "1.8.2"; src = fetchFromGitHub { - sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2"; - rev = "r${version}"; + sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2"; + rev = "v${version}"; repo = "lz4"; - owner = "Cyan4973"; + owner = "lz4"; }; outputs = [ "out" "dev" ]; @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { doCheck = false; # tests take a very long time checkTarget = "test"; - patches = [ ./install-on-freebsd.patch ] ; - postInstall = "rm $out/lib/*.a"; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch deleted file mode 100644 index 12a2bf72f4ed..000000000000 --- a/pkgs/tools/compression/lz4/install-on-freebsd.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Makefile b/Makefile -index d1b0d0c..f8d6a2d 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: - @cd $(LZ4DIR); $(MAKE) -e install -@@ -129,4 +127,3 @@ examples: - prg-travis: - @cd $(PRGDIR); $(MAKE) -e test-travis - --endif -diff --git a/lib/Makefile b/lib/Makefile -index 02ddd3b..26ed18f 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -80,8 +80,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - liblz4.pc: liblz4.pc.in Makefile - @echo creating pkgconfig -@@ -114,4 +112,3 @@ uninstall: - @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h - @echo lz4 libraries successfully uninstalled - --endif -diff --git a/programs/Makefile b/programs/Makefile -index f422902..6943363 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -113,8 +113,6 @@ clean: - - - #------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) - - install: lz4 lz4c - @echo Installing binaries -@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench - test-mem32: lz4c32 datagen - # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system... - --endif diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index cd0cff0f3899..0cea8d4011c7 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i"; + sha256 = "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 5620f5058a5f..8e186399d638 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, pkgconfig }: stdenv.mkDerivation rec { - name = "qrencode-4.0.1"; + name = "qrencode-4.0.2"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "0j7cqhjc0l6i99lzph51gakmcmfs74x483plna93r4ngz328knph"; + sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index f69f654cda3d..ae88b7e99c65 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -10,7 +10,6 @@ with python.pkgs; buildPythonPackage rec { pname = "bepasty"; version = "0.4.0"; - name = "${pname}-${version}"; propagatedBuildInputs = [ flask @@ -39,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 90a2211235d7..d86908559742 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibutils-${version}"; - version = "6.3"; + version = "6.5"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "10r5v5xbhsxdh6vq6g2xp6lgmpjdzba83h4m4clfhrzqis8clwqy"; + sha256 = "0bc5b9nyxbcc1y4vrhghj9y9221i34qq384zslfyb0ihkb6kq521"; }; configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index e87987aa0835..4248dd6bd93c 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "blink1-${version}"; - version = "1.98"; + version = "1.98a"; src = fetchurl { url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz"; - sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; + sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d9da04c1fa1b..ba85c5376db1 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.3"; + version = "0.17.4"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "1wsyykvnss5r0sx344kjbprnb87849462p9rg9xj37cp7qzciwdn"; + sha256 = "10k21v9x82imly36lgra8a7rlvz5a1jd49db16g9xc11wx7cdg8g"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/tools/misc/riemann-tools/Gemfile index 3d56cd85c617..ac6abd42c895 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile +++ b/pkgs/tools/misc/riemann-tools/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "riemann-tools", "0.2.6" +gem "riemann-tools", "0.2.13" diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock index 58c12fd51516..9fc17ccea56a 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile.lock +++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock @@ -1,142 +1,24 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.1) - beefcake (1.1.0) - builder (3.2.2) - excon (0.45.3) - faraday (0.9.1) - multipart-post (>= 1.2, < 3) - fission (0.5.0) - CFPropertyList (~> 2.2) - fog (1.31.0) - fog-atmos - fog-aws (~> 0.0) - fog-brightbox (~> 0.4) - fog-core (~> 1.30) - fog-ecloud - fog-google (>= 0.0.2) - fog-json - fog-local - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - nokogiri (~> 1.5, >= 1.5.11) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (0.6.0) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-brightbox (0.7.2) - fog-core (~> 1.22) - fog-json - inflecto (~> 0.0.2) - fog-core (1.31.1) - builder - excon (~> 0.45) - formatador (~> 0.2) - mime-types - net-scp (~> 1.1) - net-ssh (>= 2.1.3) - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.0.6) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.2.1) - fog-core (~> 1.27) - fog-powerdns (0.1.1) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-profitbricks (0.0.3) - fog-core - fog-xml - nokogiri - fog-radosgw (0.0.4) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.0.1) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (0.4.7) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - formatador (0.2.5) - inflecto (0.0.2) - ipaddress (0.8.0) - mime-types (2.6.1) - mini_portile (0.6.2) + beefcake (1.0.0) + json (1.8.6) mtrc (0.0.4) - multi_json (1.11.1) - multipart-post (2.0.0) - munin-ruby (0.2.5) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - riemann-client (0.2.5) - beefcake (>= 0.3.5) + riemann-client (0.2.6) + beefcake (>= 0.3.5, <= 1.0.0) mtrc (>= 0.0.4) trollop (>= 1.16.2) - riemann-tools (0.2.6) - faraday (>= 0.8.5) - fog (>= 1.4.0) - munin-ruby (>= 0.2.1) - nokogiri (>= 1.5.6) - riemann-client (>= 0.2.2) + riemann-tools (0.2.13) + json (~> 1.8) + riemann-client (>= 0.2.6) trollop (>= 1.16.2) - yajl-ruby (>= 1.1.0) trollop (2.1.2) - yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - riemann-tools (= 0.2.6) + riemann-tools (= 0.2.13) BUNDLED WITH - 1.10.2 + 1.14.6 diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix index 07818fc76bcd..a57139d2f7ca 100644 --- a/pkgs/tools/misc/riemann-tools/gemset.nix +++ b/pkgs/tools/misc/riemann-tools/gemset.nix @@ -1,444 +1,52 @@ { - "CFPropertyList" = { - version = "2.3.1"; + beefcake = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "10gid0a7pdllh3qmjiqkqxgfqvd7m1f2dmcm4gcd19s63pv620gv"; type = "gem"; - sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k"; }; + version = "1.0.0"; }; - "beefcake" = { - version = "1.1.0"; + json = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; - sha256 = "009gzy9jp81lsnxnwisinhc58cd0qljdiipj2701lzzrha5d826z"; }; + version = "1.8.6"; }; - "builder" = { - version = "3.2.2"; + mtrc = { source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "excon" = { - version = "0.45.3"; - source = { - type = "gem"; - sha256 = "183kfxfjjlc97w4rxkrxjw3kis4lxm65vppmvl4bkblvlw4nq94j"; - }; - }; - "faraday" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "fission" = { - version = "0.5.0"; - source = { - type = "gem"; - sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh"; - }; - dependencies = [ - "CFPropertyList" - ]; - }; - "fog" = { - version = "1.31.0"; - source = { - type = "gem"; - sha256 = "0xr8xyrrkljm2hxi420x4qr5v6wqcj8d63v0qy1g6rkb3b1yhl9i"; - }; - dependencies = [ - "fog-atmos" - "fog-aws" - "fog-brightbox" - "fog-core" - "fog-ecloud" - "fog-google" - "fog-json" - "fog-local" - "fog-powerdns" - "fog-profitbricks" - "fog-radosgw" - "fog-riakcs" - "fog-sakuracloud" - "fog-serverlove" - "fog-softlayer" - "fog-storm_on_demand" - "fog-terremark" - "fog-vmfusion" - "fog-voxel" - "fog-xml" - "ipaddress" - "nokogiri" - ]; - }; - "fog-atmos" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-aws" = { - version = "0.6.0"; - source = { - type = "gem"; - sha256 = "1m79s5ha6qq60pxqqxr9qs9fg8fwaz79sfxckidyhxdydcsjwx6z"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - "ipaddress" - ]; - }; - "fog-brightbox" = { - version = "0.7.2"; - source = { - type = "gem"; - sha256 = "0636sqaf2w1rh4i2hxfgs24374l4ai8dgch8a7nycqhvjk2dm0aq"; - }; - dependencies = [ - "fog-core" - "fog-json" - "inflecto" - ]; - }; - "fog-core" = { - version = "1.31.1"; - source = { - type = "gem"; - sha256 = "1bcsy4cq7vyjmdf3h2v7q6hfj64v6phn0rfvwgj5wfza7yaxnhk7"; - }; - dependencies = [ - "builder" - "excon" - "formatador" - "mime-types" - "net-scp" - "net-ssh" - ]; - }; - "fog-ecloud" = { - version = "0.3.0"; - source = { - type = "gem"; - sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-google" = { - version = "0.0.6"; - source = { - type = "gem"; - sha256 = "1g3ykk239nxpdsr5anhprkp8vzk106gi4q6aqjh4z8q4bii0dflm"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-json" = { - version = "1.0.2"; - source = { - type = "gem"; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; - }; - dependencies = [ - "fog-core" - "multi_json" - ]; - }; - "fog-local" = { - version = "0.2.1"; - source = { - type = "gem"; - sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3"; - }; - dependencies = [ - "fog-core" - ]; - }; - "fog-powerdns" = { - version = "0.1.1"; - source = { - type = "gem"; - sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-profitbricks" = { - version = "0.0.3"; - source = { - type = "gem"; - sha256 = "01a3ylfkjkyagf4b4xg9x2v20pzapr3ivn9ydd92v402bjsm1nmr"; - }; - dependencies = [ - "fog-core" - "fog-xml" - "nokogiri" - ]; - }; - "fog-radosgw" = { - version = "0.0.4"; - source = { - type = "gem"; - sha256 = "1pxbvmr4dsqx4x2klwnciyhki4r5ryr9y0hi6xmm3n6fdv4ii7k3"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-riakcs" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm"; - }; - dependencies = [ - "fog-core" - "fog-json" - "fog-xml" - ]; - }; - "fog-sakuracloud" = { - version = "1.0.1"; - source = { - type = "gem"; - sha256 = "1s16b48kh7y03hjv74ccmlfwhqqq7j7m4k6cywrgbyip8n3258n8"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-serverlove" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-softlayer" = { - version = "0.4.7"; - source = { - type = "gem"; - sha256 = "0fgfbhqnyp8ywymvflflhvbns54d1432x57pgpnfy8k1cxvhv9b8"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-storm_on_demand" = { - version = "0.1.1"; - source = { - type = "gem"; - sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y"; - }; - dependencies = [ - "fog-core" - "fog-json" - ]; - }; - "fog-terremark" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-vmfusion" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4"; - }; - dependencies = [ - "fission" - "fog-core" - ]; - }; - "fog-voxel" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx"; - }; - dependencies = [ - "fog-core" - "fog-xml" - ]; - }; - "fog-xml" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa"; - }; - dependencies = [ - "fog-core" - "nokogiri" - ]; - }; - "formatador" = { - version = "0.2.5"; - source = { - type = "gem"; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; - }; - }; - "inflecto" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4"; - }; - }; - "ipaddress" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; - }; - }; - "mime-types" = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; - }; - }; - "mini_portile" = { - version = "0.6.2"; - source = { - type = "gem"; - sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w"; - }; - }; - "mtrc" = { - version = "0.0.4"; - source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0xj2pv4cpn0ad1xw38sinsxfzwhgqs6ff18hw0cwz5xmsf3zqmiz"; - }; - }; - "multi_json" = { - version = "1.11.1"; - source = { - type = "gem"; - sha256 = "0lrmadw2scqwz7nw3j5pfdnmzqimlbaxlxi37xsydrpbbr78qf6g"; - }; - }; - "multipart-post" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; - }; - }; - "munin-ruby" = { - version = "0.2.5"; - source = { - type = "gem"; - sha256 = "0378jyf0hdbfs2vvk7v8k7hqilzi1rfkpn271dyrqqal7g2lnjl2"; - }; - }; - "net-scp" = { - version = "1.2.1"; - source = { - type = "gem"; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - }; - dependencies = [ - "net-ssh" - ]; - }; - "net-ssh" = { - version = "2.9.2"; - source = { - type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; - }; - }; - "nokogiri" = { - version = "1.6.6.2"; - source = { type = "gem"; - sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"; }; - dependencies = [ - "mini_portile" - ]; + version = "0.0.4"; }; - "riemann-client" = { - version = "0.2.5"; + riemann-client = { + dependencies = ["beefcake" "mtrc" "trollop"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "02rp8x2y8h61x8mx9c8kwgm2yyvgg63g8km93zmwmkpp5fyi3fi8"; type = "gem"; - sha256 = "1myhyh31f290jm1wlhhjvf331n5l8qdm7axkxyacdgjsfg4szsjc"; }; - dependencies = [ - "beefcake" - "mtrc" - "trollop" - ]; - }; - "riemann-tools" = { version = "0.2.6"; - source = { - type = "gem"; - sha256 = "0qjm7p55h70l5bs876hhvz3isr204663f97py9g0ajxz2z8jkzpi"; - }; - dependencies = [ - "faraday" - "fog" - "munin-ruby" - "nokogiri" - "riemann-client" - "trollop" - "yajl-ruby" - ]; }; - "trollop" = { - version = "2.1.2"; + riemann-tools = { + dependencies = ["json" "riemann-client" "trollop"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0brf44cq4xz0nqhs189zlg76527bfv3jr453yc00410qdzz8fpxa"; type = "gem"; - sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; }; + version = "0.2.13"; }; - "yajl-ruby" = { - version = "1.2.1"; + trollop = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; type = "gem"; - sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; }; + version = "2.1.2"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 169389928d06..31303dcdd4d7 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "067ds1sdi9ya1yqz9saczj1vml8arwzd46w35gmvdxgmxx4wmihs"; + sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00"; }; outputs = [ "out" "vim" ]; @@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec { patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim + # fix Cargo.lock version + sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock ''; postInstall = '' diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 77622ce8a1ea..30475047c4f7 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.11"; + version = "0.9.13"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d"; + sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 6e50b11568e6..8e05e49962cd 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -5,13 +5,13 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pirate-get"; - version = "0.2.12"; + version = "0.2.13"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1q6hvavj0gswgw3x756h18nmmpnxlgg08qvxphpbzlwd43xrnza3"; + sha256 = "c5b159e02067136d3157d56061958a50e997a078510e4403bb7de40217833f3f"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 4f6bec9c0084..9ef5ff2a4f08 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.33"; + version = "1.0.34"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz"; + sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 0f5fd2836921..db4b6a2281d4 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - version = "1.1pre15"; + version = "1.1pre16"; src = fetchgit { rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "1msym63jpipvzb5dn8yn8yycrii43ncfq6xddxh2ifrakr48l6y5"; + sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c"; }; outputs = [ "out" "man" "info" ]; @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac ''; - postInstall = '' - rm $out/bin/tinc-gui - ''; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index cbd28b6954a3..c6b8cb242fdc 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "wireguard-go-${version}"; - version = "0.0.20180531"; + version = "0.0.20180613"; goPackagePath = "git.zx2c4.com/wireguard-go"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "1vs11kr5a2s99v0g7079nfrfvmjfh1p2lnkj2icjyn2cb0s1vqiy"; + sha256 = "0pvg7s1kyn48az54lsnyn1ryhjk0flmpz5dx520rc94g6xn88fic"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 276d7066c561..e8f8b4258721 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180531"; + version = "0.0.20180613"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0944zxmpx2cs71nxl7rcyhpqlwplkzd7jsf1n66vflngw2sjxm03"; + sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 9a147caa7e21..b86bb1a221c6 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.22"; + name = "gnupg-1.4.23"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m"; + sha256 = "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 5ce0ce0dbc21..37efbd80fbbe 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -29,12 +29,12 @@ let }; generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.2"; name = "password-store-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; + sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"; }; patches = [ ./set-correct-program-name-for-sleep.patch diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index a2c6ff52663d..bf5856aec357 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { version = "1.8.23"; src = fetchurl { - # This URL changes in unpredictable ways, so it is not sensible - # to put a version variable in there. - url = "https://pcsclite.apdu.fr/files/pcsc-lite-1.8.23.tar.bz2"; + url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; }; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = http://pcsclite.alioth.debian.org/; + homepage = https://pcsclite.apdu.fr/; license = licenses.bsd3; maintainers = with maintainers; [ viric wkennington ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index a9902fe50422..d28260ffb8b9 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stoken"; - version = "0.90"; + version = "0.92"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "cernekee"; repo = pname; rev = "v${version}"; - sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af"; + sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y"; }; preConfigure = '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 795925a221c2..3efba58ea11d 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.3.6"; + name = "tor-0.3.3.7"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "1drk2h8zd05xrfpx7xn77pcxz0hs4nrq6figw56qk5gkvgv5kg4r"; + sha256 = "036ybfvldj7yfci9ipjki8smpzyxdg8c5r12bghc9yxdqh9basza"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index b2219d1e66d6..dbec8d353d94 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' cat >> local.h <<EOF - #define USG + ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"} #define TERMLIB "-lncurses" #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}" #define MASTERHASH "americanmed.hash" diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 35fee64ba54f..3bf7ee1fdfec 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -30,7 +30,7 @@ let pkgNeedsRuby = pkg: pkg.tlType == "run" && pkg.pname == "match-parens"; extraInputs = lib.optional (lib.any pkgNeedsPython splitBin.wrong) python - ++ lib.optional (lib.any pkgNeedsPython splitBin.wrong) ruby; + ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby; }; mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: > diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92b25fed9b98..754097c53d29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -571,6 +571,8 @@ with pkgs; aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; + aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; + aws-vault = callPackage ../tools/admin/aws-vault { }; iamy = callPackage ../tools/admin/iamy { }; @@ -1337,7 +1339,7 @@ with pkgs; kisslicer = callPackage ../tools/misc/kisslicer { }; - klaus = callPackage ../servers/web-apps/klaus { }; + klaus = with pythonPackages; toPythonApplication klaus; lcdproc = callPackage ../servers/monitoring/lcdproc { }; @@ -4239,6 +4241,8 @@ with pkgs; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; + opae = callPackage ../development/libraries/opae { }; + openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -4992,7 +4996,9 @@ with pkgs; sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; - sit = callPackage ../applications/version-management/sit { }; + sit = callPackage ../applications/version-management/sit { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; skippy-xd = callPackage ../tools/X11/skippy-xd {}; @@ -7705,7 +7711,9 @@ with pkgs; bam = callPackage ../development/tools/build-managers/bam {}; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; - bazel = callPackage ../development/tools/build-managers/bazel { }; + bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; @@ -8689,7 +8697,8 @@ with pkgs; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost16x = boost166; + boost167 = callPackage ../development/libraries/boost/1.67.nix { }; + boost16x = boost167; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -12646,6 +12655,8 @@ with pkgs; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; + mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; + mediatomb = callPackage ../servers/mediatomb { }; meguca = callPackage ../servers/meguca { }; @@ -20484,6 +20495,7 @@ with pkgs; qucs = callPackage ../applications/science/electronics/qucs { }; + xcircuit = callPackage ../applications/science/electronics/xcircuit { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ee454f09581..6c2b726a06b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -299,10 +299,10 @@ let self = _self // overrides; _self = with self; { }; Appcpanminus = buildPerlPackage rec { - name = "App-cpanminus-1.7043"; + name = "App-cpanminus-1.7044"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "68a06f7da80882a95bc02c92c7ee305846fb6ab648cf83678ea945e44ad65c65"; + sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; }; meta = { homepage = https://github.com/miyagawa/cpanminus; @@ -312,13 +312,13 @@ let self = _self // overrides; _self = with self; { }; }; - Appperlbrew = buildPerlPackage rec { - name = "App-perlbrew-0.82"; + Appperlbrew = buildPerlModule rec { + name = "App-perlbrew-0.83"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0p6l5i85zp89f5sh0gyz7didla672zg169yprbqcf97icmr46g80"; + sha256 = "0sdz0y90pk49cw4njfm1jq7zppha6kdx7i1d6nk41672nqrphdhb"; }; - buildInputs = [ pkgs.curl FileWhich IOAll PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec ]; + buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ]; preConfigure = '' @@ -489,10 +489,10 @@ let self = _self // overrides; _self = with self; { }; ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.23"; + name = "Archive-Tar-Wrapper-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHILLI/Archive-Tar-Wrapper-0.23.tar.gz; - sha256 = "1ykl0r2dwa93l0nxrjgs8qqkwjxn44qbvxpmrwiy269na4x3j0jc"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.24.tar.gz; + sha256 = "0wlc4xc7xfmfwrcrliiv4jv9zh24nj8286hma2hmmm5l8qcqlvh7"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { @@ -523,10 +523,10 @@ let self = _self // overrides; _self = with self; { }; AudioScan = buildPerlPackage rec { - name = "Audio-Scan-0.99"; + name = "Audio-Scan-1.00"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "00092cjj89sp019b35fm3qiz4iczqznwa3yhx5jdkazlwjhlmmma"; + sha256 = "00aj95mv5dsyi0cnmd8b6i6hvvw1xiczgkmc5mv775p385q3pcfm"; }; buildInputs = [ pkgs.zlib TestWarn ]; NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; @@ -630,16 +630,17 @@ let self = _self // overrides; _self = with self; { }; autobox = buildPerlPackage rec { - name = "autobox-2.85"; + name = "autobox-3.0.1"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; - sha256 = "d0b8d0f27f3d1c1e8ef47f806fa06b9c229c3ca84057004fedc35dbbc0341140"; + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz; + sha256 = "c303b7fccfaa1ff4d4c429ab3f15e5ca2a77554ef8c9fc3b8c62ba859e874c98"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ IPCSystemSimple TestFatal ]; }; Autobox = self.autobox; @@ -677,17 +678,7 @@ let self = _self // overrides; _self = with self; { autodie = null; # part of Perl - AutoLoader = buildPerlPackage { - name = "AutoLoader-5.74"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/AutoLoader-5.74.tar.gz; - sha256 = "2fac75b05309f71a6871804cd25e1a3ba0a28f43f294fb54528077558da3aff4"; - }; - meta = { - description = "Load subroutines only on demand"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + AutoLoader = null; # part of Perl 5.22 autovivification = buildPerlPackage rec { name = "autovivification-0.18"; @@ -722,7 +713,7 @@ let self = _self // overrides; _self = with self; { description = "Perl compiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - doCheck = false; + doCheck = false; /* test fails */ }; BFlags = buildPerlPackage rec { @@ -742,10 +733,10 @@ let self = _self // overrides; _self = with self; { }; BHooksEndOfScope = buildPerlPackage rec { - name = "B-Hooks-EndOfScope-0.21"; + name = "B-Hooks-EndOfScope-0.24"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0b70vbpabsy9ia366k330cz1zbdyb1pwhb0l7j28pmpih045iwwh"; + sha256 = "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3"; }; propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { @@ -771,10 +762,10 @@ let self = _self // overrides; _self = with self; { }; bignum = buildPerlPackage rec { - name = "bignum-0.49"; + name = "bignum-0.50"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d"; + sha256 = "82f88a0acbbfa9c4c69f620316b37da8f4b3d2895208e6aad6121a8f0203a94f"; }; meta = { description = "Transparent BigNumber support for Perl"; @@ -914,10 +905,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISSN = buildPerlPackage { - name = "Business-ISSN-0.91"; + name = "Business-ISSN-1.003"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-0.91.tar.gz; - sha256 = "f15b192c0f547bb2967811072b3d343b94bc5ea58d02704c19122f7ae0a9d6b5"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz; + sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1"; }; meta = { description = "Work with International Standard Serial Numbers"; @@ -936,10 +927,10 @@ let self = _self // overrides; _self = with self; { }; CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.46"; + name = "Cache-FastMmap-1.47"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.46.tar.gz; - sha256 = "0061kwlbv398b2hb0kx1r6lmqf4kb6dnq9j4lsikczyk981sxs98"; + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.47.tar.gz; + sha256 = "0fdni3iyjfnx8ldgrz3h6z6yxbklrx76klcghg6xvmzd878yqlmi"; }; }; @@ -1057,10 +1048,10 @@ let self = _self // overrides; _self = with self; { }; CaptureTiny = buildPerlPackage rec { - name = "Capture-Tiny-0.46"; + name = "Capture-Tiny-0.48"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "05bhlx6d4nzamhkkh0pkckg7wlvaq6mazf7q1fbb5wpp1j1nlyjx"; + sha256 = "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc"; }; meta = { homepage = https://metacpan.org/release/Capture-Tiny; @@ -1142,6 +1133,7 @@ let self = _self // overrides; _self = with self; { description = "Sensible default end action"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ HTTPRequestAsCGI ]; }; CatalystActionREST = buildPerlPackage rec { @@ -1158,14 +1150,14 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystAuthenticationCredentialHTTP = buildPerlPackage { - name = "Catalyst-Authentication-Credential-HTTP-1.016"; + CatalystAuthenticationCredentialHTTP = buildPerlModule { + name = "Catalyst-Authentication-Credential-HTTP-1.018"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Credential-HTTP-1.016.tar.gz; - sha256 = "0r4kah3qr9d7iq16i64qbj6hxjfwv5fjy3jzwgs2qmr4mjixsg51"; + url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz; + sha256 = "0ad5clfiyllnf37an99n139cxhhxf5g5rh8cxashsjv4xrnq38bg"; }; - buildInputs = [ TestException TestMockObject ]; - propagatedBuildInputs = [ CatalystPluginAuthentication DataUUID StringEscape ]; + buildInputs = [ ModuleBuildTiny TestException TestMockObject TestNeeds ]; + propagatedBuildInputs = [ CatalystPluginAuthentication ClassAccessor DataUUID StringEscape ]; meta = { description = "HTTP Basic and Digest authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1213,17 +1205,18 @@ let self = _self // overrides; _self = with self; { }; CatalystControllerHTMLFormFu = buildPerlPackage rec { - name = "Catalyst-Controller-HTML-FormFu-2.02"; + name = "Catalyst-Controller-HTML-FormFu-2.04"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.02.tar.gz; - sha256 = "5ddfd4983bfb0c722995c964b4d9264b3a26a89c820c921648631a7717be0551"; + url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz; + sha256 = "f13fb9b3b3b00b35f06abc31614461c8d7346fbe07fb569c71e8d586e5eb5ddc"; }; - buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT TemplateToolkit TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFu RegexpAssemble ]; + buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT CodeTidyAllPluginPerlAlignMooseAttributes PodCoverageTrustPod PodTidy TemplateToolkit TestCPANMeta TestDifferences TestEOL TestKwalitee TestLongString TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFuMultiForm RegexpAssemble ]; meta = { description = "Catalyst integration for HTML::FormFu"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; CatalystControllerPOD = buildPerlModule rec { @@ -1233,7 +1226,7 @@ let self = _self // overrides; _self = with self; { sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; }; buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystPluginStaticSimple FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ]; + propagatedBuildInputs = [ CatalystPluginStaticSimple ClassAccessor FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ]; meta = { homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/; description = "Serves PODs right from your Catalyst application"; @@ -1323,13 +1316,13 @@ let self = _self // overrides; _self = with self; { }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90117"; + name = "Catalyst-Runtime-5.90118"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "fe12d82c4e0704d1f15946651554ca069abccb6afbe5d9de315e97d90c0c92a3"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90118.tar.gz; + sha256 = "a3e979fc822f500d065e39a03d1883179bfdae77a8372cce0070efd1bf1e9a33"; }; 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 ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody 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"; @@ -1397,7 +1390,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz; sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9"; }; - buildInputs = [ TestDeep TestException ]; + buildInputs = [ ClassAccessor TestDeep TestException ]; propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Flexible caching support for Catalyst"; @@ -1573,7 +1566,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f"; }; - propagatedBuildInputs = [ CacheCache CatalystPluginSession ]; + propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ]; meta = { description = "File storage backend for session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1672,7 +1665,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; - propagatedBuildInputs = [ CatalystRuntime TemplateTimer ]; + propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; meta = { description = "Template View Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -1986,10 +1979,10 @@ let self = _self // overrides; _self = with self; { }; ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.33"; + name = "Class-C3-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "1c319k0j9knba2k0xjr8fml54kfvs71wcnc0hxp7s3lqc49mvzxf"; + sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"; }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { @@ -2338,12 +2331,12 @@ let self = _self // overrides; _self = with self; { }; CloneChoose = buildPerlPackage rec { - name = "Clone-Choose-0.008"; + name = "Clone-Choose-0.010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.008.tar.gz; - sha256 = "0grf0bg1ldzqakaq7aaigjngwd07zybrlmwjcnb0q986q0jcfank"; + url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz; + sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn"; }; - buildInputs = [ Clone ClonePP ]; + buildInputs = [ Clone ClonePP TestWithoutModule ]; meta = { description = "Choose appropriate clone utility"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2363,12 +2356,12 @@ let self = _self // overrides; _self = with self; { }; CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.69"; + name = "Code-TidyAll-0.70"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.69.tar.gz; - sha256 = "0pl5pnq9flcak1m9rvqxbygk9vp5ma7dymr90waaazpdqrx4zyhk"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.70.tar.gz; + sha256 = "16s847y7jhx07yn15p84lpr1jn8srqb8ma12g4ngwr46hhkrbz06"; }; - propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich FileZglob Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; + propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich 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"; @@ -2377,6 +2370,19 @@ let self = _self // overrides; _self = with self; { }; }; + CodeTidyAllPluginPerlAlignMooseAttributes = buildPerlPackage rec { + name = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz; + sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd"; + }; + propagatedBuildInputs = [ CodeTidyAll TextAligner ]; + meta = { + description = "TidyAll plugin to sort and align Moose-style attributes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + # For backwards compatibility. CommonSense = self.commonsense; @@ -2403,14 +2409,13 @@ let self = _self // overrides; _self = with self; { description = "Interface to Bzip2 compression library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - doCheck = false; }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.074"; + name = "Compress-Raw-Bzip2-2.081"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0b5jwqf15zr787acnx8sfyy2zavdd7gfkd98n1dgy8fs6r8yb8a4"; + sha256 = "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6"; }; # Don't build a private copy of bzip2. @@ -2454,10 +2459,10 @@ let self = _self // overrides; _self = with self; { }; ConfigAutoConf = buildPerlPackage rec { - name = "Config-AutoConf-0.315"; + name = "Config-AutoConf-0.316"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.315.tar.gz; - sha256 = "0h39x9rzrhhilpg8yxlzpka269qrzsjg0iy0c1b9xflqlvhx2g2b"; + url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.316.tar.gz; + sha256 = "0xxrdg12ig9fcsk0dws50hzfar4a8dsw1pimq6xf14lllrclnvwf"; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -2535,10 +2540,10 @@ let self = _self // overrides; _self = with self; { }; ConfigIniFiles = buildPerlModule rec { - name = "Config-IniFiles-2.95"; + name = "Config-IniFiles-2.98"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "414a19f98cc745769ce762aefce01fa52d031bc244403cd32fd1f6257f2dedc2"; + sha256 = "9d5fc5c2192058e58ad35150ddae3043a2679f2aa4e1fb7e18e36794622b1797"; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -2563,10 +2568,10 @@ let self = _self // overrides; _self = with self; { }; ConfigMVP = buildPerlPackage { - name = "Config-MVP-2.200010"; + name = "Config-MVP-2.200011"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz; - sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz; + sha256 = "23c95666fc43c4adaebcc093b1b56091efc2a6aa2d75366a216d18eda96ad716"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; @@ -2680,13 +2685,7 @@ let self = _self // overrides; _self = with self; { }; }; - constant = buildPerlPackage rec { - name = "constant-1.33"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/constant-1.33.tar.gz; - sha256 = "015my616h5l2fswh52x4dp3n007gk5lax83ww9q6cmzb610mv5kr"; - }; - }; + constant = null; # part of Perl 5.22 constantboolean = buildPerlModule { name = "constant-boolean-0.02"; @@ -2887,10 +2886,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.50"; + name = "CPAN-Perl-Releases-3.58"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1nr739rnrw58p9r9z26pr4sc4s5z7wbhgyva3r2b2spyaylp5qkz"; + sha256 = "1v56gj1032p5hbmlvg0nakrah7rhwin17ak06fpnyjn5lacyy753"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -2900,12 +2899,12 @@ let self = _self // overrides; _self = with self; { }; CPANPLUS = buildPerlPackage rec { - name = "CPANPLUS-0.9172"; + name = "CPANPLUS-0.9174"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1q4b0fkdn4sh8ym9dig21w96p7kzrhq66lqhn0dy1l3pgx413zlc"; + sha256 = "1ahddfs9jc2z3h7z6lkf9ppmrgw2kjnzcpbrhvwq3rlpxa9xshhq"; }; - propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants TermUI ]; + propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { homepage = https://github.com/jib/cpanplus-devel; description = "Ameliorated interface to the CPAN"; @@ -3015,12 +3014,12 @@ let self = _self // overrides; _self = with self; { }; CryptRandomSource = buildPerlModule { - name = "Crypt-Random-Source-0.12"; + name = "Crypt-Random-Source-0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.12.tar.gz; - sha256 = "00mw5m52sbz9nqp3f6axyrgcrihqxn7k8gv0vi1kvm1j1nc9g29h"; + url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz; + sha256 = "1rpdds3sy5l1fhngnkrsgwsmwd54wpicx3i9ds69blcskwkcwkpc"; }; - buildInputs = [ ModuleBuildTiny TestException TestSimple13 ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ]; meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; @@ -3107,25 +3106,40 @@ let self = _self // overrides; _self = with self; { NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; + CryptOpenSSLGuess = buildPerlPackage rec { + name = "Crypt-OpenSSL-Guess-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz; + sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; + }; + meta = { + description = "Guess OpenSSL include path"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess"; + }; + }; + CryptOpenSSLRandom = buildPerlPackage rec { - name = "Crypt-OpenSSL-Random-0.11"; + name = "Crypt-OpenSSL-Random-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "0yjcabkibrkafywvdkmd1xpi6br48skyk3l15ni176wvlg38335v"; + sha256 = "1x6ffps8q7mnawmcfq740llzy7i10g3319vap0wiw4d33fm6z1zh"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; + buildInputs = [ CryptOpenSSLGuess ]; }; CryptOpenSSLRSA = buildPerlPackage rec { - name = "Crypt-OpenSSL-RSA-0.28"; + name = "Crypt-OpenSSL-RSA-0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; - sha256 = "5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be"; + url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.30.tar.gz; + sha256 = "23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; + buildInputs = [ CryptOpenSSLGuess ]; }; CryptSSLeay = buildPerlPackage rec { @@ -3190,10 +3204,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.059"; + name = "CryptX-0.060"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "3ef0d6493f332b6a2e1b0d20eda034d060d66f19f48d47244c788c26dca09d27"; + sha256 = "8fab3d34fd4892349151fa4220e582d05baed8444613afa8e75e961385a6af69"; }; meta = { description = "Crypto toolkit"; @@ -3623,10 +3637,10 @@ let self = _self // overrides; _self = with self; { }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.70"; + name = "Date-Manip-6.71"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0r4k4ypb09xwhvq6das0vpx2c0xbhhhx83knq6jfpf8m55h8qi9r"; + sha256 = "1v998nvj81av6w3cvfc80ya91k61zdv9nx9mw9skg3ifc8qycwzv"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3651,10 +3665,10 @@ let self = _self // overrides; _self = with self; { }; DateTime = buildPerlPackage rec { - name = "DateTime-1.48"; + name = "DateTime-1.49"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0glcsvgldrmbwbaps6hssjzipzghhx4jh3g4jdncjspdmdp481ah"; + sha256 = "0hbw4zq1562slnz7g7hyhfhyq98dzkk3i5g21x3xra5cvfix93kh"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; @@ -3880,12 +3894,12 @@ let self = _self // overrides; _self = with self; { }; DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-1.17"; + name = "DateTime-Locale-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0ca6598b3f89e92e3d1140e5685c69f6f795f6eed158fa482f33ce2122b35cc9"; + sha256 = "998f034234441932c82a4598fa49a14f346d6e981d1d2d91a179913a9f81b898"; }; - buildInputs = [ CPANMetaCheck FileShareDirInstall TestFatal TestFileShareDir TestRequires TestWarnings ]; + buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/DateTime-Locale; @@ -3908,10 +3922,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.18"; + name = "DateTime-TimeZone-2.19"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "b7f74295650bde3f378017113dcc504cefecc054cf6ef31133dc76940e15453a"; + sha256 = "b9192efe202d71b4ff7840718807a244bfca3992afd7e7ca78da20849f5ea4f8"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -3991,10 +4005,10 @@ let self = _self // overrides; _self = with self; { }; DevelChecklib = buildPerlPackage rec { - name = "Devel-CheckLib-1.11"; + name = "Devel-CheckLib-1.12"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; - sha256 = "1h9jna2d83kpckkm87xwqx84kwd83d2dsynky3hnvgl0gqc1qvdx"; + sha256 = "0lcmpp5spa6rx3b0lv8lzj55hxl72g332lngnhqhmp22aimvw2m9"; }; buildInputs = [ IOCaptureOutput MockConfig ]; }; @@ -4023,10 +4037,10 @@ let self = _self // overrides; _self = with self; { }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.36"; + name = "Devel-PPPort-3.42"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLFSAGE/${name}.tar.gz"; - sha256 = "b70fb1b4e2d48983ad20052fd7ae6df4c10ceffdedbacb2d691ddc9c957afa52"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.42.tar.gz; + sha256 = "bac5d98b92fe2673a84ea45f1c9b615e3a46c3cc6db59c61a2fc95dd3cf9e14a"; }; meta = { description = "Perl/Pollution/Portability"; @@ -4034,18 +4048,7 @@ let self = _self // overrides; _self = with self; { }; }; - DevelSelfStubber = buildPerlPackage { - name = "Devel-SelfStubber-1.05"; - src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Devel-SelfStubber-1.05.tar.gz; - sha256 = "b7bd750e41ec2dbca3f2f1d48e5e8ba594dcc8bc7a923a2565611ab8d0846bf8"; - }; - meta = { - homepage = http://search.cpan.org/dist/Devel-SelfStubber; - description = "Generate stubs for a SelfLoading module"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + DevelSelfStubber = null; # part of Perl 5.22 DevelSizeMe = buildPerlPackage { name = "Devel-SizeMe-0.19"; @@ -4490,17 +4493,7 @@ let self = _self // overrides; _self = with self; { }; }; - Digest = buildPerlPackage { - name = "Digest-1.17"; - src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-1.17.tar.gz; - sha256 = "2f6a54459fc7f37c0669d548bb224b695eb8d2ddc089aa5547645ce1f5fd86f7"; - }; - meta = { - description = "Modules that calculate message digests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + Digest = null; # part of Perl 5.22 DigestCRC = buildPerlPackage rec { name = "Digest-CRC-0.22.2"; @@ -4629,13 +4622,13 @@ let self = _self // overrides; _self = with self; { }; DistZilla = buildPerlPackage { - name = "Dist-Zilla-6.011"; + name = "Dist-Zilla-6.012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.011.tar.gz; - sha256 = "0cai08gzrvf9mkqsj3b8vhcwxaxs30h4gx0wffq8c5dja9fhzjxs"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz; + sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37"; }; 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 ]; + propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; @@ -4657,7 +4650,7 @@ let self = _self // overrides; _self = with self; { description = "Test your dist with every testing plugin conceivable"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - doCheck = false; + doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; DistZillaPluginCheckChangeLog = buildPerlPackage { @@ -4689,19 +4682,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestMojibake ]; }; - DistZillaPluginNoTabsTests = buildPerlPackage { - name = "Dist-Zilla-Plugin-NoTabsTests-0.01"; - src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Dist-Zilla-Plugin-NoTabsTests-0.01.tar.gz; - sha256 = "fd4ed380de4fc2bad61db377cc50ab26b567e53b3a1efd0b8d8baab80256ef9e"; - }; - propagatedBuildInputs = [ DistZilla Moose TestNoTabs namespaceautoclean ]; - meta = { - homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests; - description = "Release tests making sure hard tabs aren't used"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + DistZillaPluginNoTabsTests = DistZillaPluginTestNoTabs; DistZillaPluginPodWeaver = buildPerlPackage { name = "Dist-Zilla-Plugin-PodWeaver-4.008"; @@ -5129,20 +5110,7 @@ let self = _self // overrides; _self = with self; { }; }; - EmailMIMEModifier = buildPerlPackage rec { - doCheck = false; # tests are broken, it seems - name = "Email-MIME-Modifier-1.444"; - src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "4521cf361527cd9b5e8b0db3d2e6c9588c52de6a8997e1daf5c21ed1eb7a4ba2"; - }; - propagatedBuildInputs = [ EmailMIME EmailMIMEContentType ]; - meta = { - homepage = "http://search.cpan.org/~rjbs/${name}"; - description = "Modify Email::MIME Objects Easily"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + EmailMIMEModifier = EmailMIME; EmailSend = buildPerlPackage rec { name = "Email-Send-2.201"; @@ -5231,10 +5199,10 @@ let self = _self // overrides; _self = with self; { }; Encode = buildPerlPackage rec { - name = "Encode-2.97"; + name = "Encode-2.98"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "044d2fc743bdf5ce4509a0e717a7adb31d488dafae63fde794f57a9f47b2ecb7"; + sha256 = "303d396477c94c43c2f83da1a8025d68de76bd7e52c2cc35fbdf5c59b4c2cffa"; }; meta = { description = "Character encodings in Perl"; @@ -5310,6 +5278,19 @@ let self = _self // overrides; _self = with self; { }; }; + EncodeNewlines = buildPerlPackage rec { + name = "Encode-Newlines-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz; + sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl"; + }; + meta = { + description = "Normalize line ending sequences"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Encode-Newlines"; + }; + }; + enum = buildPerlPackage rec { name = "enum-1.11"; src = fetchurl { @@ -5347,10 +5328,10 @@ let self = _self // overrides; _self = with self; { }; Error = buildPerlModule rec { - name = "Error-0.17025"; + name = "Error-0.17026"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc"; + sha256 = "1nam651w5ffsh64nnqjpzirm5g3ck92idzz1f0sf0fnp5jb0ln9p"; }; }; @@ -5473,18 +5454,7 @@ let self = _self // overrides; _self = with self; { }; }; - ExtUtilsCommand = buildPerlPackage { - name = "ExtUtils-Command-1.20"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Command-1.20.tar.gz; - sha256 = "740cccc93ba851aae803695b7a5b65ccbaa78bf4e96aa2e54f3f632c87a98c98"; - }; - meta = { - homepage = http://search.cpan.org/dist/ExtUtils-Command; - description = "Utilities to replace common UNIX commands in Makefiles etc"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ExtUtilsCommand = ExtUtilsMakeMaker; Expect = buildPerlPackage { name = "Expect-1.35"; @@ -5499,17 +5469,7 @@ let self = _self // overrides; _self = with self; { }; }; - Exporter = buildPerlPackage { - name = "Exporter-5.72"; - src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Exporter-5.72.tar.gz; - sha256 = "cd13b7a0e91e8505a0ce4b25f40fab2c92bb28a99ef0d03da1001d95a32f0291"; - }; - meta = { - description = "Implements default import method for modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + Exporter = null; # part of Perl 5.22 ExtUtilsCBuilder = buildPerlPackage rec { name = "ExtUtils-CBuilder-0.280230"; @@ -5545,10 +5505,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsConstant = buildPerlPackage { - name = "ExtUtils-Constant-0.24"; + name = "ExtUtils-Constant-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.24.tar.gz; - sha256 = "aa9e8c0b564576195a7508374f4a80b97fe3cf4a4c13efe4c949ece3e76b217d"; + url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz; + sha256 = "6933d0e963b62281ef7561068e6aecac8c4ac2b476b2bba09ab0b90fbac9d757"; }; }; @@ -5602,10 +5562,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsInstallPaths = buildPerlPackage { - name = "ExtUtils-InstallPaths-0.011"; + name = "ExtUtils-InstallPaths-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz; - sha256 = "0z06y0fhx9hy9x01abb7s2xdbqrh9x4ps7avmlf4bwfwih2gl2bn"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz; + sha256 = "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4"; }; propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { @@ -5654,10 +5614,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.70"; + name = "ExtUtils-Manifest-1.71"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz; - sha256 = "159bypwl8xpq1yi39prr49hl7x2xww5aj97nv169c8xja0h0dzzf"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Manifest-1.71.tar.gz; + sha256 = "1qa7jwhy78byvfzpjnn5k2jm30sb5m1z6k2m79iy6gg2xj41nrq0"; }; }; @@ -5855,13 +5815,26 @@ let self = _self // overrides; _self = with self; { }; FileCopyRecursive = buildPerlPackage rec { - name = "File-Copy-Recursive-0.40"; + name = "File-Copy-Recursive-0.44"; src = fetchurl { url = "mirror://cpan/authors/id/D/DM/DMUEY/${name}.tar.gz"; - sha256 = "18amrqvdjlb4hc7mblbwb63q96ql1rnlb5saknsvrxqfjcxr5f78"; + sha256 = "1r3frbl61kr7ig9bzd60fka772cd504v3kx9kgnwvcy1inss06df"; }; - propagatedBuildInputs = [ PathTiny ]; - buildInputs = [ TestDeep TestException TestFile TestWarn ]; + buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ]; + }; + + FileCopyRecursiveReduced = buildPerlPackage rec { + name = "File-Copy-Recursive-Reduced-0.006"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz; + sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676"; + }; + buildInputs = [ CaptureTiny PathTiny ]; + meta = { + description = "Recursive copying of files and directories within Perl 5 toolchain"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://thenceforward.net/perl/modules/File-Copy-Recursive-Reduced/"; + }; }; FileDesktopEntry = buildPerlPackage rec { @@ -5899,10 +5872,10 @@ let self = _self // overrides; _self = with self; { }; FileFindObjectRule = buildPerlModule rec { - name = "File-Find-Object-Rule-0.0306"; + name = "File-Find-Object-Rule-0.0307"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "2ce55766b25fb8799d37b95bca61e8a71d8a437e28541e1cd06b7eb89f7739d1"; + sha256 = "571d92c1bbd749b03a5e063b65cdef081b8063fe190fca7ed2e37af7ccb5a99a"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; meta = { @@ -5975,10 +5948,10 @@ let self = _self // overrides; _self = with self; { }; FileHomeDir = buildPerlPackage { - name = "File-HomeDir-1.002"; + name = "File-HomeDir-1.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz; - sha256 = "eb4c0c85775138460cd4013d8117232f08e88381c95c6a93b3d11e969185c274"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz; + sha256 = "45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad"; }; propagatedBuildInputs = [ FileWhich ]; meta = { @@ -6122,10 +6095,10 @@ let self = _self // overrides; _self = with self; { }; Filepushd = buildPerlPackage { - name = "File-pushd-1.014"; + name = "File-pushd-1.016"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz; - sha256 = "b5ab37ffe3acbec53efb7c77b4423a2c79afa30a48298e751b9ebee3fdc6340b"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz; + sha256 = "d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc"; }; meta = { homepage = https://metacpan.org/release/File-pushd; @@ -6186,11 +6159,11 @@ let self = _self // overrides; _self = with self; { }; }; - FileShareDirInstall = buildPerlModule { - name = "File-ShareDir-Install-0.11"; + FileShareDirInstall = buildPerlPackage { + name = "File-ShareDir-Install-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz; - sha256 = "1j0cw1aq9fdv9kl1a6fnfa4zihsvmcqzy9sb0xk0i9pyx5r8ggrj"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz; + sha256 = "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5"; }; meta = { description = "Install shared files"; @@ -6198,7 +6171,6 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; - buildInputs = [ ModuleBuildTiny ]; }; FilesysNotifySimple = buildPerlPackage { @@ -6296,7 +6268,7 @@ 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"; @@ -6435,10 +6407,10 @@ let self = _self // overrides; _self = with self; { }; GamesSolitaireVerify = buildPerlModule { - name = "Games-Solitaire-Verify-0.1701"; + name = "Games-Solitaire-Verify-0.1800"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1701.tar.gz; - sha256 = "71383f9c44a344aa92eca6ad999103b05809f19b3e078cf01651f2298bc435c1"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1800.tar.gz; + sha256 = "935ba997c49437a095adb39fd18233d5e378941aa9974df46e56aa6234f1fced"; }; buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ]; @@ -6585,10 +6557,10 @@ let self = _self // overrides; _self = with self; { }; Glib = buildPerlPackage rec { - name = "Glib-1.326"; + name = "Glib-1.327"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0prn9kkdpwjq9qmzqashbhk3pq4gvlrmvm3b10xf1dhc48406382"; + sha256 = "0n7hjhbh5xhagvb0qjwzg21j22ks0csah0chgk98g4wnfllxjl0k"; }; buildInputs = [ pkgs.glib ]; meta = { @@ -7093,19 +7065,33 @@ let self = _self // overrides; _self = with self; { }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-2.05"; + name = "HTML-FormFu-2.06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-2.05.tar.gz; - sha256 = "0xz41ap0vyw9yfjci84i5ixc6jshjrd2swhiv8dsy5xx9x71iw1q"; + url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.06.tar.gz; + sha256 = "1g9zi7cg53527hlqb9h73i75vfzm52dwjrm8784vykn4kw4kklsv"; }; - buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle ]; - propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten MooseXAliases NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; + buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ]; + propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; meta = { description = "HTML Form Creation, Rendering and Validation Framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; + HTMLFormFuMultiForm = buildPerlPackage rec { + name = "HTML-FormFu-MultiForm-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz; + sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n"; + }; + propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ]; + meta = { + description = "Handle multi-page/stage forms with FormFu"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/FormFu/HTML-FormFu-MultiForm"; + }; + }; + HTMLFormHandler = buildPerlPackage { name = "HTML-FormHandler-0.40068"; src = fetchurl { @@ -7580,18 +7566,7 @@ let self = _self // overrides; _self = with self; { }; }; - I18NCollate = buildPerlPackage { - name = "I18N-Collate-1.02"; - src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/I18N-Collate-1.02.tar.gz; - sha256 = "9174506bc903eda89690394e3f45558ab7e013114227896d8569d6164648fe37"; - }; - meta = { - homepage = http://search.cpan.org/dist/I18N-Collate; - description = "Compare 8-bit scalar data according to the current locale"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + I18NCollate = null; # part of Perl 5.22 iCalParser = buildPerlPackage rec { name = "iCal-Parser-1.21"; @@ -7687,10 +7662,10 @@ let self = _self // overrides; _self = with self; { }; IO = buildPerlPackage { - name = "IO-1.25"; + name = "IO-1.39"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/IO-1.25.tar.gz; - sha256 = "89790db8b9281235dc995c1a85d532042ff68a90e1504abd39d463f05623e7b5"; + url = mirror://cpan/authors/id/T/TO/TODDR/IO-1.39.tar.gz; + sha256 = "4f0502e7f123ac824188eb8873038aaf2ddcc29f8babc1a0b2e1cd34b55a1fca"; }; doCheck = false; meta = { @@ -7739,10 +7714,10 @@ let self = _self // overrides; _self = with self; { }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.074"; + name = "IO-Compress-2.081"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "b4bd68ce895a6578e5be96ade36449461becc328cc7ab900ae4e362380f097f2"; + sha256 = "5211c775544dc8c511af08edfb1c0c22734daa2789149c2a88d68e17b43546d9"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { @@ -7972,10 +7947,10 @@ let self = _self // overrides; _self = with self; { IPCRun = buildPerlPackage { - name = "IPC-Run-0.98"; + name = "IPC-Run-20180523.0"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.98.tar.gz; - sha256 = "018r6jb8h0danyd3g8k03ziaf4w2d31qi9x876gn21js8l232spl"; + url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz; + sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q"; }; doCheck = false; /* attempts a network connection to localhost */ meta = { @@ -8101,11 +8076,11 @@ let self = _self // overrides; _self = with self; { }; InlineJava = buildPerlPackage rec { - name = "Inline-Java-0.53"; + name = "Inline-Java-0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PATL/${name}.tar.gz"; - sha256 = "1d9hq09nv3l6m015ws08b3gbfp8daxryqr7p0yi0xhqr44j9qcj8"; + url = mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz; + sha256 = "0j6r6gxdn3wzx36cgcx4znj4ihp5fjl4gzk1623vvwgnwrlf0hy7"; }; propagatedBuildInputs = [ Inline ]; @@ -8130,6 +8105,7 @@ let self = _self // overrides; _self = with self; { maintainers = [ ]; }; + buildInputs = [ ExtUtilsMakeMaker ]; }; IPCSignal = buildPerlPackage rec { @@ -8195,10 +8171,10 @@ let self = _self // overrides; _self = with self; { }; JSONMaybeXS = buildPerlPackage rec { - name = "JSON-MaybeXS-1.003010"; + name = "JSON-MaybeXS-1.004000"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.003010.tar.gz; - sha256 = "0hs504x5zsa2vl6r7b3rvbygsak1ly24m1lg636bqp3x7jirmb30"; + url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz; + sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"; }; meta = { description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>"; @@ -8280,17 +8256,7 @@ let self = _self // overrides; _self = with self; { }; }; - lib_ = buildPerlPackage { - name = "lib-0.63"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/lib-0.63.tar.gz; - sha256 = "72f63db9220098e834d7a38231626bd0c9b802c1ec54a628e2df35f3818e5a00"; - }; - meta = { - description = "Manipulate @INC at compile time"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + lib_ = null; # part of Perl 5.22 libapreq2 = buildPerlPackage { name = "libapreq2-2.13"; @@ -8441,10 +8407,10 @@ let self = _self // overrides; _self = with self; { }; LinguaENTagger = buildPerlPackage { - name = "Lingua-EN-Tagger-0.28"; + name = "Lingua-EN-Tagger-0.29"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.28.tar.gz; - sha256 = "1rm223d871s150dgnhbar71w56bim950cp45f0904w6px5fifcqa"; + url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.29.tar.gz; + sha256 = "0dssn101kmpkh2ik1430mj2ikk04849vbpgi60382kvh9xn795na"; }; propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; meta = { @@ -8676,10 +8642,10 @@ let self = _self // overrides; _self = with self; { }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.56"; + name = "Locale-Codes-3.57"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.56.tar.gz; - sha256 = "d82f3340ecb7f8700493df0273dede0c049fbc44c2fe1e811fc6c5a79b79ae79"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.57.tar.gz; + sha256 = "3547cffeb6098a706a5647f6079e06cbdb68a6b7f9c8d5b0032659df7bfd8812"; }; meta = { description = "A distribution of modules to handle locale codes"; @@ -8744,13 +8710,7 @@ let self = _self // overrides; _self = with self; { }; }; - LocaleMaketextSimple = buildPerlPackage { - name = "Locale-Maketext-Simple-0.21"; - src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Locale-Maketext-Simple-0.21.tar.gz; - sha256 = "1ad9vh45j8c32nzkbjipinawyg1pnjckwlhsjqcqs47vyi8zy2dh"; - }; - }; + LocaleMaketextSimple = null; # part of Perl 5.22 LocaleMsgfmt = buildPerlPackage { name = "Locale-Msgfmt-0.15"; @@ -9238,10 +9198,10 @@ let self = _self // overrides; _self = with self; { }; MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.52"; + name = "Mail-DKIM-0.53"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.52.tar.gz; - sha256 = "1dbczg7vyvvm12d9gbiqd9a24qg4254cz7bh7yf3p27i58hhpbwy"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.53.tar.gz; + sha256 = "1aqmffkbsqcckllf6hxbdm1xcybw6674h18np2aaas8z42g0ji3w"; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailTools NetDNSResolverMock YAMLLibYAML ]; doCheck = false; # tries to access the domain name system @@ -9367,10 +9327,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999811"; + name = "Math-BigInt-1.999813"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "d4bfa5ad0127b6360ad29971da6fa08bcfb56a471d55db3c7419d05f8a947b8d"; + sha256 = "67a10a10a806bd7add463acc1557554381052426cbcb04b1ffbeccfb6775be3d"; }; meta = { description = "Arbitrary size integer/float math package"; @@ -9379,10 +9339,10 @@ let self = _self // overrides; _self = with self; { }; MathBigIntGMP = buildPerlPackage rec { - name = "Math-BigInt-GMP-1.6004"; + name = "Math-BigInt-GMP-1.6005"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "1wiklyxxpf02c01flymyjqh46lhi0qhkvf14icni8grjgpfjjqi3"; + sha256 = "0a5qwsjrp46lkmaxpw408lv14ygivk9i3cbbcrjim1qwsk1jlmjc"; }; buildInputs = [ pkgs.gmp ]; doCheck = false; @@ -9392,10 +9352,10 @@ let self = _self // overrides; _self = with self; { }; MathBigIntLite = buildPerlPackage rec { - name = "Math-BigInt-Lite-0.17"; + name = "Math-BigInt-Lite-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.17.tar.gz; - sha256 = "1pii36cykpja9al6bdnsxn2w0la674qagqcff6lhk9yx6xakycpk"; + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz; + sha256 = "1m97jkh26nrji6mjdwhwlq9bcdn8qlw3vimik8bs2hw80syi70j4"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -9404,10 +9364,10 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.2613"; + name = "Math-BigRat-0.2614"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "b893dfe2caf27b233a3678abc39176e706a9b518e8937bc496e46e125e960e22"; + sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -9417,22 +9377,16 @@ let self = _self // overrides; _self = with self; { }; MathClipper = buildPerlModule rec { - name = "Math-Clipper-1.23"; + name = "Math-Clipper-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-Clipper-1.23.tar.gz; - sha256 = "0i9wzvig7ayijc9nvh5x5rryk1jrcj1hcvfmlcj449rnnxx24dav"; + url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.27.tar.gz; + sha256 = "0di8frcxa8laa5s0x4vkr2mp9abv2a099c3x4gsdpnbijj10j6dn"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; }; - MathComplex = buildPerlPackage { - name = "Math-Complex-1.59"; - src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz; - sha256 = "f35eb4987512c51d2c47294a008ede210d8dd759b90b887d04847c69b42dd6d1"; - }; - }; + MathComplex = null; # part of Perl 5.22 MathConvexHullMonotoneChain = buildPerlPackage rec { name = "Math-ConvexHull-MonotoneChain-0.01"; @@ -9595,13 +9549,7 @@ let self = _self // overrides; _self = with self; { }; }; - MIMEBase64 = buildPerlPackage rec { - name = "MIME-Base64-3.15"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1f8y78dskf91p4xym73n9lqbj15av5vxpsivm7nr7jx9lrk3b1kz"; - }; - }; + MIMEBase64 = null; # part of Perl 5.22 MIMECharset = buildPerlPackage { name = "MIME-Charset-1.012.2"; @@ -9656,10 +9604,10 @@ let self = _self // overrides; _self = with self; { }; MIMETypes = buildPerlPackage rec { - name = "MIME-Types-2.13"; + name = "MIME-Types-2.17"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "1y3vnxk4wv4a00lxcp39hw9650cdl455d3y7nv42rqmvaxikghwr"; + sha256 = "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0"; }; meta = { description = "Definition of MIME types"; @@ -9801,12 +9749,12 @@ let self = _self // overrides; _self = with self; { }; ModuleBuildXSUtil = buildPerlModule rec { - name = "Module-Build-XSUtil-0.18"; + name = "Module-Build-XSUtil-0.19"; src = fetchurl { url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; - sha256 = "1vjl77iwbwr2xhdlyqva3hhma9r1fgr2rappwsimwqjmybdrfd6b"; + sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh"; }; - buildInputs = [ CaptureTiny CwdGuard FileCopyRecursive ]; + buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; meta = { description = "A Module::Build class for building XS modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9830,23 +9778,24 @@ let self = _self // overrides; _self = with self; { }; ModuleCPANfile = buildPerlPackage rec { - name = "Module-CPANfile-1.1002"; + name = "Module-CPANfile-1.1004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1002.tar.gz; - sha256 = "1z9wsps70h7ypaxmwq8l8wp0dg4kqrxmaqgzbh2fq8jw9idw55dz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz; + sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8"; }; meta = { description = "Parse cpanfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/cpanfile"; }; + buildInputs = [ Filepushd ]; }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180221"; + name = "Module-CoreList-5.20180420"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180221.tar.gz; - sha256 = "12gad19gxvrv19938f6hs2i2fanq2s1dx3l1yy8nh0nvc2mwggzl"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180420.tar.gz; + sha256 = "1bp22m50rjv8qjvygciy60j7kblksvhglsdgaabhmrqcmx5ysj5p"; }; meta = { homepage = http://dev.perl.org/; @@ -10147,10 +10096,10 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.71"; + name = "Mojolicious-7.82"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "25d8ab46fd7c340abcbbe740f690c197df6ff40a9c3dddf907629211bf3ad905"; + sha256 = "70c5f211ba81982752eae189ca7aea0ea14fb7534449114d0a3d47d96c0d05c4"; }; meta = { homepage = http://mojolicious.org; @@ -10217,10 +10166,10 @@ let self = _self // overrides; _self = with self; { }; Moose = buildPerlPackage { - name = "Moose-2.2010"; + name = "Moose-2.2011"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2010.tar.gz; - sha256 = "af0905b69f18c27de1177c9bc7778ee495d4ec91be1f223e8ca8333af4de08c5"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2011.tar.gz; + sha256 = "973d0a35d9f39bf93bbc5206c25f5ec3651f96356f082d31873c0ac9a5c1cd82"; }; buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ]; @@ -11053,10 +11002,10 @@ let self = _self // overrides; _self = with self; { }; Mouse = buildPerlModule rec { - name = "Mouse-2.5.2"; + name = "Mouse-2.5.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.2.tar.gz; - sha256 = "17nr2432cfw7q2qxiz8pv7lw91dszgvn4ln77gpv2m77kjh5ilbs"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.4.tar.gz; + sha256 = "041nm46bxxyi1fd8w69r45k434b6m43va2s06pr3bys6igxic79d"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; @@ -11200,7 +11149,6 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; - doCheck = false; }; NetAmazonAWSSign = buildPerlPackage { @@ -11248,7 +11196,7 @@ let self = _self // overrides; _self = with self; { patches = [ ../development/perl-modules/net-amazon-mechanicalturk.patch ]; propagatedBuildInputs = [ DigestHMAC LWPProtocolHttps XMLParser ]; - doCheck = false; + doCheck = false; /* wants network */ }; NetAmazonS3 = buildPerlPackage rec { @@ -11410,10 +11358,10 @@ let self = _self // overrides; _self = with self; { }; NetHTTP = buildPerlPackage rec { - name = "Net-HTTP-6.17"; + name = "Net-HTTP-6.18"; src = fetchurl { url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; - sha256 = "1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611"; + sha256 = "7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -11422,7 +11370,7 @@ let self = _self // overrides; _self = with self; { description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - doCheck = false; + doCheck = false; /* wants network */ }; NetIDNEncode = buildPerlModule { @@ -11792,10 +11740,10 @@ let self = _self // overrides; _self = with self; { }; NetOpenSSH = buildPerlPackage rec { - name = "Net-OpenSSH-0.77"; + name = "Net-OpenSSH-0.78"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; - sha256 = "16e965c6ed3dfe0f1288a6ba932d0e8d5c7846ce86de05c0dbd64259df2a2477"; + sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; @@ -12037,19 +11985,7 @@ let self = _self // overrides; _self = with self; { }; }; - ParseCPANMeta = buildPerlPackage { - name = "Parse-CPAN-Meta-1.4414"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4414.tar.gz; - sha256 = "cd7608154dfb72c9e110f012befe6b75d78448cb3e761716b60aa7545e16ca1b"; - }; - propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; - meta = { - homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta; - description = "Parse META.yml and META.json CPAN metadata files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ParseCPANMeta = CPANMeta; ParseDebControl = buildPerlPackage rec { name = "Parse-DebControl-2.005"; @@ -12238,13 +12174,13 @@ let self = _self // overrides; _self = with self; { }; PerlCritic = buildPerlModule rec { - name = "Perl-Critic-1.130"; + name = "Perl-Critic-1.132"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6"; + sha256 = "bcf36e32830373cf1ee35abbe2e20336fbbcad5041c14aad6822ac947be092b1"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress FileHomeDir ModulePluggable PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny FileHomeDir ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; @@ -12281,16 +12217,7 @@ let self = _self // overrides; _self = with self; { }; }; - PerlIOviaQuotedPrint = buildPerlPackage { - name = "PerlIO-via-QuotedPrint-0.08"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/PerlIO-via-QuotedPrint-0.08.tar.gz; - sha256 = "9b999a54134816de5217f7a8cac69fa5d89ab32dc589fcd5c9e84902f608cb9c"; - }; - meta = { - description = "PerlIO Layer for quoted-printable encoding"; - }; - }; + PerlIOviaQuotedPrint = null; # part of Perl 5.22 PerlIOviasymlink = buildPerlPackage { name = "PerlIO-via-symlink-0.05"; @@ -12514,10 +12441,10 @@ let self = _self // overrides; _self = with self; { }; PlackMiddlewareMethodOverride = buildPerlPackage rec { - name = "Plack-Middleware-MethodOverride-0.15"; + name = "Plack-Middleware-MethodOverride-0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "2b4a6e67006f97a2b4cf7980900f6a8ababb1cf97d6597319f9897ada3c555bc"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz; + sha256 = "dbfb5a2efb48bfeb01cb3ae1e1c677e155dc7bfe210c7e7f221bae3cb6aab5f1"; }; propagatedBuildInputs = [ Plack ]; meta = { @@ -12682,11 +12609,24 @@ let self = _self // overrides; _self = with self; { }; }; + PPIxQuoteLike = buildPerlModule rec { + name = "PPIx-QuoteLike-0.005"; + src = fetchurl { + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.005.tar.gz; + sha256 = "13jvbjiqpm52kknjryzk3v4rnq70rzmx7w1bny9v5m5j6g029a4s"; + }; + propagatedBuildInputs = [ PPI ]; + meta = { + description = "Parse Perl string literals and string-literal-like things."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.056"; + name = "PPIx-Regexp-0.059"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "37992de526a368d120506e8c6c0498266e4de81942658cf0af1db89b12302f15"; + sha256 = "f2464c449d9cb21866f8adc7b5299d1f611cef5322b9d885ec55790243458635"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -12933,13 +12873,7 @@ let self = _self // overrides; _self = with self; { }; }; - PodEscapes = let version = "1.07"; in buildPerlPackage { - name = "Pod-Escapes-${version}"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Pod-Escapes-${version}.tar.gz"; - sha256 = "0213lmbbw3vy50ahlp2lqmmnkwhrizyl1y87i4jgnla9k0kwixyv"; - }; - }; + PodEscapes = null; # part of Perl 5.22 PodEventual = buildPerlPackage { name = "Pod-Eventual-0.094001"; @@ -13093,7 +13027,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz; sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"; }; - propagatedBuildInputs = [ TextTabsWrap ]; }; PodSpell = buildPerlPackage rec { @@ -13118,6 +13051,20 @@ let self = _self // overrides; _self = with self; { }; }; + PodTidy = buildPerlModule rec { + name = "Pod-Tidy-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz; + sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8"; + }; + propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ]; + buildInputs = [ TestCmd ]; + meta = { + description = "a reformatting Pod Processor"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodUsage = buildPerlPackage { name = "Pod-Usage-1.69"; src = fetchurl { @@ -13146,6 +13093,17 @@ let self = _self // overrides; _self = with self; { }; }; + PodWrap = buildPerlModule rec { + name = "Pod-Wrap-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz; + sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ProbePerl = buildPerlPackage rec { name = "Probe-Perl-0.03"; src = fetchurl { @@ -13181,7 +13139,6 @@ let self = _self // overrides; _self = with self; { description = "Collaborative, content-based spam filtering network agent"; license = stdenv.lib.licenses.mit; }; - doCheck = false; }; @@ -13399,35 +13356,30 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; - doCheck = false; + doCheck = false; /* creates files in HOME */ }; RTClientREST = buildPerlPackage { - name = "RT-Client-REST-0.51"; + name = "RT-Client-REST-0.52"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.51.tar.gz; - sha256 = "6a9df61c7f209f634613a8824393932d2faf2497b1c580ed8e5dd7794a36ea7d"; + url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.52.tar.gz; + sha256 = "d058b8aa0db21aa1734ac50ae557297f603c2be60fa95a1d85278dbd11e19500"; }; - buildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies LWP ParamsValidate TestException ]; + buildInputs = [ CGI HTTPServerSimple TestException ]; meta = { description = "Talk to RT installation using REST protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ DateTimeFormatDateParse Error LWP ParamsValidate ]; }; - Safe = buildPerlPackage { - name = "Safe-2.35"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Safe-2.35.tar.gz; - sha256 = "e5d09756580287d7dc183ddaf26e4b2467e6f75b52ad73decdbe62d0750979b1"; - }; - }; + Safe = null; # part of Perl 5.22 SafeIsa = buildPerlPackage { - name = "Safe-Isa-1.000008"; + name = "Safe-Isa-1.000010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000008.tar.gz; - sha256 = "08r74hwxq5b3bibnbwjr9anybg15l3zqdgcirpw1xm2qpvcxgdkx"; + url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz; + sha256 = "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -13490,17 +13442,7 @@ let self = _self // overrides; _self = with self; { }; }; - SearchDict = buildPerlPackage { - name = "Search-Dict-1.07"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Search-Dict-1.07.tar.gz; - sha256 = "b128cdae4712fe53e83a219ca65478a84c1b128a2c6c86933e47923cf19c6554"; - }; - meta = { - description = "Look - search for key in dictionary file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + SearchDict = null; # part of Perl 5.22 SelfLoader = buildPerlPackage { name = "SelfLoader-1.24"; @@ -13912,10 +13854,10 @@ let self = _self // overrides; _self = with self; { }; StatisticsDescriptive = buildPerlModule { - name = "Statistics-Descriptive-3.0612"; + name = "Statistics-Descriptive-3.0613"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz; - sha256 = "772413148e5e00efb32f277c4254aa78b9112490a896208dcd0025813afdbf7a"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0613.tar.gz; + sha256 = "ee053899c06bb042c7ff3a0d32feabe457ed0a2c893355633288436a49707ead"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement @@ -13943,10 +13885,10 @@ let self = _self // overrides; _self = with self; { }; Storable = buildPerlPackage { - name = "Storable-2.51"; + name = "Storable-3.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMS/Storable-2.51.tar.gz; - sha256 = "a566b792112bbba21131ec1d7a2bf78170c648484895283ae53c7f0c3dc2f0be"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.11.tar.gz; + sha256 = "b2dac116d2f5adaf289e9a8a9bbac35cc2c24a9d2221fea9b6578a33b8ec7d28"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13967,10 +13909,10 @@ let self = _self // overrides; _self = with self; { }; strictures = buildPerlPackage rec { - name = "strictures-2.000003"; + name = "strictures-2.000005"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "08mgvf1d2651gsg3jgjfs13878ndqa4ji8vfsda9f7jjd84ymy17"; + url = mirror://cpan/authors/id/E/ET/ETHER/strictures-2.000005.tar.gz; + sha256 = "16fxhsmn2v8a1fxd02243zl7vckmvwzwwys1pjp9rw68hagxn2wn"; }; meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; @@ -14335,10 +14277,10 @@ let self = _self // overrides; _self = with self; { }; SubQuote = buildPerlPackage rec { - name = "Sub-Quote-2.005000"; + name = "Sub-Quote-2.005001"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "44b145111bee7b0001818e77f7ce587153232dbc97351f4c5ed34522372b64ff"; + sha256 = "d6ab4f0775def015367a05e02024b403f991b2be11d774f3d235fe7e9bdbba07"; }; buildInputs = [ TestFatal ]; meta = { @@ -14546,7 +14488,7 @@ let self = _self // overrides; _self = with self; { description = "Everything you need to follow the Catalyst Tutorial"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - doCheck = false; + doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; TaskFreecellSolverTesting = buildPerlModule rec { @@ -14589,10 +14531,10 @@ let self = _self // overrides; _self = with self; { }; TaskWeaken = buildPerlPackage { - name = "Task-Weaken-1.05"; + name = "Task-Weaken-1.06"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.05.tar.gz; - sha256 = "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5"; + url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz; + sha256 = "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3"; }; meta = { description = "Ensure that a platform has weaken support"; @@ -14757,12 +14699,12 @@ let self = _self // overrides; _self = with self; { }; TermProgressBar = buildPerlPackage rec { - name = "Term-ProgressBar-2.21"; + name = "Term-ProgressBar-2.22"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; - sha256 = "66994f1a6ca94d8d92e3efac406142fb0d05033360c0acce2599862db9c30e44"; + sha256 = "2642ecca5b0b038c14812bcad3a9611ff7911dc59c9104d220797f837a880c49"; }; - buildInputs = [ CaptureTiny TestException ]; + buildInputs = [ CaptureTiny TestException TestWarnings ]; propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; @@ -14944,16 +14886,7 @@ let self = _self // overrides; _self = with self; { }; }; - Test = buildPerlPackage { - name = "Test-1.26"; - src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Test-1.26.tar.gz; - sha256 = "f7701bd28e05e7f82fe9a181bbab38f53fa6aeae48d2a810da74d1b981d4f392"; - }; - meta = { - description = "Provides a simple framework for writing test scripts"; - }; - }; + Test = null; # part of Perl 5.22 Test2PluginNoWarnings = buildPerlPackage rec { name = "Test2-Plugin-NoWarnings-0.06"; @@ -14971,10 +14904,10 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000111"; + name = "Test2-Suite-0.000114"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "4ca28df74c7c2f37fe63897c5041aee92fba4530544d0afc371e7d14a9b4d0ad"; + sha256 = "439b37d63ffcee7876bc43b4830d4e40c454f02646faff0131e7d36d46fa8c45"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -15037,10 +14970,10 @@ let self = _self // overrides; _self = with self; { TestBase = buildPerlPackage rec { - name = "Test-Base-0.88"; + name = "Test-Base-0.89"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj"; + sha256 = "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517"; }; propagatedBuildInputs = [ Spiffy ]; buildInputs = [ AlgorithmDiff TextDiff ]; @@ -15102,6 +15035,20 @@ let self = _self // overrides; _self = with self; { }; }; + TestCmd = buildPerlPackage rec { + name = "Test-Cmd-1.09"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz; + sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg"; + }; + doCheck = false; /* test fails */ + meta = { + description = "Perl module for portable testing of commands and scripts"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Test-Cmd"; + }; + }; + TestCommand = buildPerlModule { name = "Test-Command-0.11"; src = fetchurl { @@ -15168,10 +15115,10 @@ let self = _self // overrides; _self = with self; { }; TestDeep = buildPerlPackage { - name = "Test-Deep-1.127"; + name = "Test-Deep-1.128"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.127.tar.gz; - sha256 = "0s3jmyvkgk48piw46sxppx11nfsbzhmisb0y513iza8vqiczr35p"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz; + sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -15307,7 +15254,7 @@ let self = _self // overrides; _self = with self; { sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir ScopeGuard ]; + propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir PathTiny ScopeGuard ]; meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; @@ -15483,16 +15430,17 @@ let self = _self // overrides; _self = with self; { }; TestMockModule = buildPerlModule { - name = "Test-MockModule-0.13"; + name = "Test-MockModule-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz; - sha256 = "0lwh6fvnc16r6d74vvh5h4b5a1spcslpjb3mcqbv23k01lm78wvl"; + url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz; + sha256 = "0nx3nz7yvgcw9vw646520hh1jb3kz6sspsfqa69v3vczdkfgx5qn"; }; propagatedBuildInputs = [ SUPER ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestWarnings ]; }; SUPER = buildPerlModule rec { @@ -15526,10 +15474,10 @@ let self = _self // overrides; _self = with self; { TestMoose = Moose; TestMockTime = buildPerlPackage rec { - name = "Test-MockTime-0.16"; + name = "Test-MockTime-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz"; - sha256 = "1vxv7y7jn71m8v8ag0z0dd0zadhxp264dppb40islcjl4g7r6x08"; + sha256 = "1y820qsq7yf7r6smy5c6f0mpf2cis2q24vwmpim1svv0n8cf2qrk"; }; }; @@ -15560,6 +15508,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestMoreUTF8 = buildPerlPackage rec { + name = "Test-More-UTF8-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz; + sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr"; + }; + meta = { + description = "Enhancing Test::More for UTF8-based projects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestMore = TestSimple; TestMost = buildPerlPackage { @@ -15589,10 +15549,10 @@ let self = _self // overrides; _self = with self; { }; TestNoTabs = buildPerlPackage { - name = "Test-NoTabs-2.00"; + name = "Test-NoTabs-2.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.00.tar.gz; - sha256 = "127kpl1va267qar2ia4c22xb96jby2jqnda3sj5pjgmxg8si26cg"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz; + sha256 = "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv"; }; meta = { description = "Check the presence of tabs in your project"; @@ -15668,10 +15628,10 @@ let self = _self // overrides; _self = with self; { }; TestPod = buildPerlPackage rec { - name = "Test-Pod-1.51"; + name = "Test-Pod-1.52"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1yvy5mc4j3s2h4aizryvark2nm58g2c6zhw9mlx9wmsavz7d78f1"; + sha256 = "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30"; }; meta = { homepage = http://search.cpan.org/dist/Test-Pod/; @@ -15935,10 +15895,10 @@ let self = _self // overrides; _self = with self; { TestSimple = null; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302135"; + name = "Test-Simple-1.302136"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302135.tar.gz; - sha256 = "889b59d5fb5955b5d15dbef1020aa2e9a3ccafacc8717c16a939d7cfd619ab70"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302136.tar.gz; + sha256 = "8d9a5c53b0309257af58b55177045f7d94e095e1c1416cb1e11aae4c1cdad446"; }; meta = { description = "Basic utilities for writing tests"; @@ -15996,6 +15956,19 @@ let self = _self // overrides; _self = with self; { }; }; + TestTempDirTiny = buildPerlPackage rec { + name = "Test-TempDir-Tiny-0.017"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.017.tar.gz; + sha256 = "0y2km1lbvp4hhsah2yc8vacp705zi1ijflsf7lkvqh640q6p5m55"; + }; + meta = { + description = "Temporary directories that stick around when tests fail"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; + }; + }; + TestTCP = buildPerlPackage rec { name = "Test-TCP-2.19"; src = fetchurl { @@ -16009,13 +15982,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestSharedFork ]; }; - TestTester = buildPerlPackage { - name = "Test-Tester-0.109"; - src = fetchurl { - url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.109.tar.gz; - sha256 = "0m9n28z09kq455r5nydj1bnr85lvmbfpcbjdkjfbpmfb5xgciiyk"; - }; - }; + TestTester = TestSimple; TestTime = buildPerlPackage rec { name = "Test-Time-0.05"; @@ -16068,24 +16035,13 @@ let self = _self // overrides; _self = with self; { }; }; - Testuseok = buildPerlPackage { - name = "Test-use-ok-0.11"; - src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.11.tar.gz; - sha256 = "8410438a2acf127bffcf1ab92205b747a615b487e80a48e8c3d0bb9fa0dbb2a8"; - }; - meta = { - homepage = https://github.com/audreyt/Test-use-ok/tree; - description = "Alternative to Test::More::use_ok"; - license = "unrestricted"; - }; - }; + Testuseok = TestSimple; TestWarn = buildPerlPackage { - name = "Test-Warn-0.32"; + name = "Test-Warn-0.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz; - sha256 = "1lkkpx8gyfsxfkys1psp990xyy1zxf8rsqd44az57x4y3zkidi9g"; + url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.34.tar.gz; + sha256 = "1zzqfl47l3y3agwplnxl9ypcpph0qjj12sspk1y0x10ygkn12yl1"; }; propagatedBuildInputs = [ SubUplevel ]; meta = { @@ -16125,10 +16081,10 @@ let self = _self // overrides; _self = with self; { }; TestWWWMechanize = buildPerlPackage { - name = "Test-WWW-Mechanize-1.48"; + name = "Test-WWW-Mechanize-1.50"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.48.tar.gz; - sha256 = "1d11fx9155d5v17d5w7q3kj37b01l8yj2yb0g6b0z1vh938rrlcr"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.50.tar.gz; + sha256 = "097pl87vdbxbb56vawzvs6ikrlb8nz3dx223kjjbdn3jlli3jjhg"; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; @@ -16183,10 +16139,10 @@ let self = _self // overrides; _self = with self; { }; TestXPath = buildPerlModule { - name = "Test-XPath-0.16"; + name = "Test-XPath-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz; - sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi"; + url = mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz; + sha256 = "1wy0488yg15kahfafnlmlhppxik7d0z00wxwj9fszrsq2h6crz6y"; }; propagatedBuildInputs = [ XMLLibXML ]; meta = { @@ -16204,18 +16160,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestBase ]; }; - TextAbbrev = buildPerlPackage { - name = "Text-Abbrev-1.02"; - src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Text-Abbrev-1.02.tar.gz; - sha256 = "9cfb8bea2d5806b72fa1a0e1a3367ce662262eaa2701c6a3143a2a8076917433"; - }; - meta = { - homepage = http://search.cpan.org/dist/Text-Abbrev; - description = "Abbrev - create an abbreviation table from a list"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + TextAbbrev = null; # part of Perl 5.22 TextAligner = buildPerlModule rec { name = "Text-Aligner-0.13"; @@ -16360,13 +16305,12 @@ let self = _self // overrides; _self = with self; { }; }; - TextFormat = buildPerlPackage rec { - name = "Text-Format-0.60"; + TextFormat = buildPerlModule rec { + name = "Text-Format-0.61"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "664f313570604624ff9e1fc9b26b6d04e06897b3e4eac83089fc0905a692a2b8"; + sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; }; - buildInputs = [ ModuleBuild ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/Text-Format/; description = "Format text"; @@ -16414,10 +16358,10 @@ let self = _self // overrides; _self = with self; { }; TestManifest = buildPerlPackage { - name = "Test-Manifest-2.02"; + name = "Test-Manifest-2.021"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz; - sha256 = "064783ceaf7dd569a5724d40900a3f9d92168ee4c613f7a3cb99a99aa8283396"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz; + sha256 = "a47aaad71c580e16e6e63d8c037cdddcd919876754beb2c95d9a88682dd332d9"; }; meta = { description = "Interact with a t/test_manifest file"; @@ -16583,10 +16527,10 @@ let self = _self // overrides; _self = with self; { }; TextSprintfNamed = buildPerlModule rec { - name = "Text-Sprintf-Named-0.0402"; + name = "Text-Sprintf-Named-0.0403"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "951317fce8fa5dd08190ba760182bc71f2b4346fa21df55c76155e6353e2864f"; + sha256 = "8a2f6e52998d1d8adb6ce0f5be85265be2e51ce06cf8ae23b3a0f059ba21b888"; }; buildInputs = [ TestWarn ]; meta = { @@ -16610,16 +16554,7 @@ let self = _self // overrides; _self = with self; { }; }; - TextTabsWrap = buildPerlPackage { - name = "Text-Tabs+Wrap-2013.0523"; - src = fetchurl { - url = mirror://cpan/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz; - sha256 = "b9cb056fffb737b9c12862099b952bf4ab4b1f599fd34935356ae57dab6f655f"; - }; - meta = { - description = "Expand tabs and do simple line wrapping"; - }; - }; + TextTabsWrap = null; # part of Perl 5.22 TextTabularDisplay = buildPerlPackage rec { name = "Text-TabularDisplay-1.38"; @@ -16630,16 +16565,16 @@ let self = _self // overrides; _self = with self; { }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.52"; + name = "Text-Template-1.53"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.52.tar.gz; - sha256 = "85da7a5e7eecf1871cda8bf3ce7b8ad0b5f75c6c5791f43a7d94373406859b6c"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz; + sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4"; }; meta = { description = "Unknown"; license = "unknown"; }; - buildInputs = [ TestWarnings ]; + buildInputs = [ TestMoreUTF8 TestWarnings ]; }; TestTrap = buildPerlModule rec { @@ -16672,10 +16607,10 @@ let self = _self // overrides; _self = with self; { }; TestVersion = buildPerlPackage rec { - name = "Test-Version-2.07"; + name = "Test-Version-2.09"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "eae8b758395d6b23d4ce3109b055663379b9970fb8f81e5803d145dbc5ccdbac"; + sha256 = "9ce1dd2897a5f30e1b7f8966ec66f57d8d8f280f605f28c7ca221fa79aca38e0"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ FileFindRulePerl ]; @@ -17115,10 +17050,10 @@ let self = _self // overrides; _self = with self; { }; TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.002001"; + name = "Type-Tiny-1.002002"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002001.tar.gz; - sha256 = "93c9eeaaf23016625126794af483bc626a149f7226f9a6ec1081ef896acc13dd"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002002.tar.gz; + sha256 = "a85b0c8f99b5c9b5558f0bcc8893b44299fcccf3c264ff924940d09d91d8882c"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { @@ -17425,10 +17360,10 @@ let self = _self // overrides; _self = with self; { }; version = buildPerlPackage rec { - name = "version-0.9918"; + name = "version-0.9924"; src = fetchurl { url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz"; - sha256 = "54175c7ead4e2259c2fb2b83440b821e4287842067227e48fb899b5cae52237b"; + sha256 = "81e4485ff3faf9b7813584d57b557f4b34e73b6c2eb696394f6deefacf5ca65b"; }; meta = { description = "Structured version objects"; @@ -17456,12 +17391,12 @@ let self = _self // overrides; _self = with self; { }; VMEC2 = buildPerlModule rec { - name = "VM-EC2-1.25"; + name = "VM-EC2-1.28"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "cc8002965e3a4919527a85a84100cfc3703165a449ade29e95f4e31889fbd9ad"; + sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; }; - propagatedBuildInputs = [ AnyEventHTTP JSON StringApprox 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 ]; @@ -18034,13 +17969,13 @@ let self = _self // overrides; _self = with self; { }; YAML = buildPerlPackage rec { - name = "YAML-1.24"; + name = "YAML-1.26"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.24.tar.gz; - sha256 = "1dpzgnjbd8yvf94vf45cmyj5bc6vrm6bchhx9xqwxqd5f9d093dm"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.26.tar.gz; + sha256 = "1g3zjm145zsackgnzkkb1chd15xns84jccm6knpwbysa9karjbzs"; }; - buildInputs = [ TestBase TestYAML ]; + buildInputs = [ TestBase TestDeep TestYAML ]; meta = { homepage = https://github.com/ingydotnet/yaml-pm/tree; @@ -18076,7 +18011,6 @@ 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 { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0aa78e3178d9..a1015c780241 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.12.0"; + version = "2.12.1"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1vz3s0hbqp1rzgrqfnr0jj5qds1jnw7kyhpl4qjlpd4s40x0n4b1"; + sha256 = "1ifwb30wddp5blqnrkdmf0x11dk7nbxj4z2v5403fn7wfhgvibd2"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c774ec1bab0e..7d17e16f1c69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -239,6 +239,8 @@ in { dbfread = callPackage ../development/python-modules/dbfread { }; + deap = callPackage ../development/python-modules/deap { }; + dkimpy = callPackage ../development/python-modules/dkimpy { }; diff_cover = callPackage ../development/python-modules/diff_cover { }; @@ -6927,6 +6929,8 @@ in { kiwisolver = callPackage ../development/python-modules/kiwisolver { }; + klaus = callPackage ../development/python-modules/klaus {}; + klein = callPackage ../development/python-modules/klein { }; koji = callPackage ../development/python-modules/koji { }; @@ -18200,6 +18204,11 @@ EOF gast = callPackage ../development/python-modules/gast { }; + IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { }; + + qiskit = callPackage ../development/python-modules/qiskit { }; + + qasm2image = callPackage ../development/python-modules/qasm2image { }; }); in fix' (extends overrides packages) |