git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit0a1dc96ada214bb61ee867030b3bd9797f57b356 authorFrederik Rietdijk <fridh@fridh.nl> dateWed 26 Dec 2018, 09:29 (8 years ago) parent552d8a7a809f88
57 files changed+383−227
nixos/doc/manual/release-notes/rl-1412.xml+1−1 nixos/modules/services/desktops/geoclue2.nix+2 pkgs/applications/editors/eclipse/plugins.nix+2−2 pkgs/applications/misc/girara/default.nix+2−2 pkgs/applications/misc/masterpdfeditor/default.nix+2−2 pkgs/applications/misc/pcmanfm/default.nix+3−3 pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2 pkgs/applications/office/skrooge/default.nix+2−2 pkgs/applications/version-management/gitlab/data.json+10−10 pkgs/build-support/fetchgit/nix-prefetch-git+1−1 pkgs/development/compilers/jsonnet/default.nix+2−2 pkgs/development/libraries/adns/default.nix+1−1 pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch+55 pkgs/development/libraries/geoclue/default.nix+6 pkgs/development/libraries/gnome-sharp/Makefile.in.patch−11 pkgs/development/libraries/gnome-sharp/default.nix+27−9 pkgs/development/libraries/gtest/default.nix+6 pkgs/development/libraries/gtk-sharp/2.0.nix+29−13 pkgs/development/libraries/libdeflate/default.nix+31 pkgs/development/libraries/libfm/default.nix+10−4 pkgs/development/libraries/libhandy/default.nix+2−2 pkgs/development/libraries/libqmatrixclient/default.nix+2−2 pkgs/development/libraries/libsigcxx/default.nix+13−8 pkgs/development/libraries/libuchardet/default.nix+17−11 pkgs/development/libraries/menu-cache/default.nix+2−2 pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix+13−12 pkgs/development/ocaml-modules/ppxfind/default.nix+21 pkgs/development/python-modules/affine/default.nix+2−2 pkgs/development/python-modules/biopython/default.nix+2−2 pkgs/development/python-modules/buildbot/default.nix+2−2 pkgs/development/python-modules/dpkt/default.nix+2−2 pkgs/development/python-modules/easyprocess/default.nix+2−2 pkgs/development/python-modules/goobook/default.nix+2−1 pkgs/development/python-modules/jsonrpclib-pelix/default.nix+2 pkgs/development/python-modules/lz4/default.nix−29 pkgs/development/python-modules/ofxparse/default.nix+2−1 pkgs/development/python-modules/parsel/default.nix+4−3 pkgs/development/python-modules/pytesseract/default.nix+2−2 pkgs/development/python-modules/python-lz4/default.nix+3−3 pkgs/development/python-modules/pytorch/default.nix+32−11 pkgs/development/python-modules/qrcode/default.nix+2 pkgs/development/python-modules/secretstorage/2.nix+24 pkgs/development/python-modules/secretstorage/default.nix+1−1 pkgs/development/python-modules/shellingham/default.nix+2−2 pkgs/development/python-modules/taskw/default.nix+2−1 pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch+4−38 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix+4−4 pkgs/development/tools/misc/dejagnu/default.nix+1−1 pkgs/os-specific/linux/ati-drivers/default.nix+1−1 pkgs/servers/monitoring/net-snmp/default.nix+1−1 pkgs/servers/monitoring/uchiwa/bower-packages.nix+2−2 pkgs/servers/monitoring/uchiwa/src.nix+2−2 pkgs/tools/compression/mozlz4a/default.nix+3−2 pkgs/tools/misc/coreutils/default.nix+2−2 pkgs/top-level/all-packages.nix+5−5 pkgs/top-level/ocaml-packages.nix+2 pkgs/top-level/python-packages.nix+4−3
nixos/doc/manual/release-notes/rl-1412.xml+1−1
@@ -17,7 +17,7 @@
1717 </listitem>
1818 <listitem>
1919 <para>
20− <link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
20+ <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
2121 Nix has been updated to 1.8.</link>
2222 </para>
2323 </listitem>
nixos/modules/services/desktops/geoclue2.nix+2
@@ -61,6 +61,8 @@ in
6161 wantedBy = [ "default.target" ];
6262 };
6363 };
64+
65+ environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf";
6466 };
6567
6668}
pkgs/applications/editors/eclipse/plugins.nix+2−2
@@ -555,12 +555,12 @@ rec {
555555
556556 spotbugs = buildEclipseUpdateSite rec {
557557 name = "spotbugs-${version}";
558− version = "3.1.9";
558+ version = "3.1.10";
559559
560560 src = fetchzip {
561561 stripRoot = false;
562562 url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
563− sha256 = "0m68jbyaiz0rm4qq3nnwnvgndzv2c6ay6i29kh0p0vdbanggq3xz";
563+ sha256 = "0xrflgw0h05z3za784ach2fx6dh04lgmfr426m1q235vv2ibds5y";
564564 };
565565
566566 meta = with stdenv.lib; {
pkgs/applications/misc/girara/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "girara-${version}";
6− version = "0.3.1";
6+ version = "0.3.2";
77
88 src = fetchurl {
99 url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
10− sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w";
10+ sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
1111 };
1212
1313 nativeBuildInputs = [ meson ninja pkgconfig gettext ];
pkgs/applications/misc/masterpdfeditor/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
22
33let
4− version = "5.1.60";
4+ version = "5.2.20";
55
66in stdenv.mkDerivation {
77 name = "masterpdfeditor-${version}";
88
99 src = fetchurl {
1010 url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
11− sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz";
11+ sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m";
1212 };
1313
1414 nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
pkgs/applications/misc/pcmanfm/default.nix+3−3
@@ -7,10 +7,10 @@ let
77 inherit (stdenv.lib) optional;
88in
99stdenv.mkDerivation rec {
10− name = "pcmanfm-1.3.0";
10+ name = "pcmanfm-1.3.1";
1111 src = fetchurl {
1212 url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
13− sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas";
13+ sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
1414 };
1515
1616 buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 configureFlags = optional withGtk3 "--with-gtk=3";
2020
2121 meta = with stdenv.lib; {
22− homepage = http://blog.lxde.org/?cat=28/;
22+ homepage = https://blog.lxde.org/category/pcmanfm/;
2323 license = licenses.gpl2Plus;
2424 description = "File manager with GTK+ interface";
2525 maintainers = [ maintainers.ttuegel ];
pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 name = "psi-plus-${version}";
8− version = "1.4.404";
8+ version = "1.4.504";
99
1010 src = fetchFromGitHub {
1111 owner = "psi-plus";
1212 repo = "psi-plus-snapshots";
1313 rev = "${version}";
14− sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m";
14+ sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
1515 };
1616
1717 resources = fetchFromGitHub {
pkgs/applications/office/skrooge/default.nix+2−2
@@ -7,11 +7,11 @@
77
88mkDerivation rec {
99 name = "skrooge-${version}";
10− version = "2.16.2";
10+ version = "2.17.0";
1111
1212 src = fetchurl {
1313 url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
14− sha256 = "0idvqbra8a71jb5kq9y5v377l7k3shf4z7w71apc3rjvb4l0jkhj";
14+ sha256 = "0v83bcabchsz5fs0iv5i75ps01sga48hq4cx29dajcq3kf9xgwhr";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/applications/version-management/gitlab/data.json+10−10
@@ -1,12 +1,12 @@
11{
22 "ce": {
3− "version": "11.5.4",
4− "repo_hash": "1mk7zj79cz9g8y6b5p4cznv90h94mwgy14w9vdvmqbgbnx9bayc8",
5− "deb_hash": "18i3w1k8l5hj3732w3adw3cma78l9hx77wlrgvssg9gz609kqvx6",
6− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.4-ce.0_amd64.deb/download.deb",
3+ "version": "11.5.5",
4+ "repo_hash": "1dxky06im18s4kxbb33qwm22pkkhgvyjggx31164iy71zcxxj1jr",
5+ "deb_hash": "0wnyfl1bb5wb8kdyarjk9y4ydla84f3alnk3m3zwmdqfg9jsqgb8",
6+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.5-ce.0_amd64.deb/download.deb",
77 "owner": "gitlab-org",
88 "repo": "gitlab-ce",
9− "rev": "v11.5.4",
9+ "rev": "v11.5.5",
1010 "passthru": {
1111 "GITALY_SERVER_VERSION": "0.129.0",
1212 "GITLAB_PAGES_VERSION": "1.3.1",
@@ -15,13 +15,13 @@
1515 }
1616 },
1717 "ee": {
18− "version": "11.5.4",
19− "repo_hash": "1rpj34wblhk6yirix16grrlhg4dfna3mjvhn8bz82m94dkhx06lc",
20− "deb_hash": "05lizhf45xv4j0y0yafrpcrqmav1xmncxxgsm97s2mlhdwn5rfnd",
21− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.4-ee.0_amd64.deb/download.deb",
18+ "version": "11.5.5",
19+ "repo_hash": "1j5g0x7rxrdb39b12psjirsa3s0lhqgnxh0q3r22cgzgxv0332b8",
20+ "deb_hash": "193s1f7w9lcamqnmrc7c3klmybqqra7yr16x6ay0cznwcdgirisp",
21+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.5-ee.0_amd64.deb/download.deb",
2222 "owner": "gitlab-org",
2323 "repo": "gitlab-ee",
24− "rev": "v11.5.4-ee",
24+ "rev": "v11.5.5-ee",
2525 "passthru": {
2626 "GITALY_SERVER_VERSION": "0.129.0",
2727 "GITLAB_PAGES_VERSION": "1.3.1",
pkgs/build-support/fetchgit/nix-prefetch-git+1−1
@@ -152,7 +152,7 @@ checkout_ref(){
152152 if "$deepClone"; then
153153 # The caller explicitly asked for a deep clone. Deep clones
154154 # allow "git describe" and similar tools to work. See
155− # http://thread.gmane.org/gmane.linux.distributions.nixos/3569
155+ # https://marc.info/?l=nix-dev&m=139641582514772
156156 # for a discussion.
157157 return 1
158158 fi
pkgs/development/compilers/jsonnet/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "jsonnet-${version}";
5− version = "0.11.2";
5+ version = "0.12.1";
66
77 src = fetchFromGitHub {
88 rev = "v${version}";
99 owner = "google";
1010 repo = "jsonnet";
11− sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
11+ sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb";
1212 };
1313
1414 enableParallelBuilding = true;
pkgs/development/libraries/adns/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818 preConfigure =
1919 stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
2020
21− # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
21+ # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
2222 doCheck = false;
2323
2424 postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patchnew file+55
@@ -0,0 +1,55 @@
1+--- a/data/meson.build
2++++ b/data/meson.build
3+@@ -7,7 +7,7 @@
4+ conf.set('demo_agent', '')
5+ endif
6+
7+- conf_dir = join_paths(get_option('sysconfdir'), 'geoclue')
8++ conf_dir = join_paths(sysconfdir_install, 'geoclue')
9+ configure_file(output: 'geoclue.conf',
10+ input: 'geoclue.conf.in',
11+ configuration: conf,
12+@@ -26,7 +26,7 @@
13+ # DBus Service policy file
14+ dbus_service_dir = get_option('dbus-sys-dir')
15+ if dbus_service_dir == ''
16+- dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
17++ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d')
18+ endif
19+ configure_file(output: 'org.freedesktop.GeoClue2.conf',
20+ input: 'org.freedesktop.GeoClue2.conf.in',
21+--- a/demo/meson.build
22++++ b/demo/meson.build
23+@@ -56,8 +56,7 @@
24+ install_dir: desktop_dir)
25+
26+ # Also install in the autostart directory.
27+- autostart_dir = join_paths(get_option('prefix'),
28+- get_option('sysconfdir'),
29++ autostart_dir = join_paths(sysconfdir_install,
30+ 'xdg', 'autostart')
31+ meson.add_install_script('install-file.py',
32+ desktop_file.full_path(),
33+--- a/meson.build
34++++ b/meson.build
35+@@ -22,6 +22,11 @@
36+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
37+ conf.set_quoted('LOCALEDIR', datadir + '/locale')
38+ conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
39++if get_option('sysconfdir_install') != ''
40++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
41++else
42++ sysconfdir_install = get_option('sysconfdir')
43++endif
44+
45+ configure_file(output: 'config.h', configuration : conf)
46+ configinc = include_directories('.')
47+--- a/meson_options.txt
48++++ b/meson_options.txt
49+@@ -34,3 +34,6 @@
50+ option('dbus-srv-user',
51+ type: 'string', value: 'root',
52+ description: 'The user (existing) as which the service will run')
53++option('sysconfdir_install',
54++ type: 'string', value: '',
55++ description: 'sysconfdir to use during installation')
pkgs/development/libraries/geoclue/default.nix+6
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
1717 sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
1818 };
1919
20+ patches = [
21+ ./add-option-for-installation-sysconfdir.patch
22+ ];
23+
2024 outputs = [ "out" "dev" "devdoc" ];
2125
2226 nativeBuildInputs = [
@@ -36,6 +40,8 @@ stdenv.mkDerivation rec {
3640 mesonFlags = [
3741 "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
3842 "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
43+ "--sysconfdir=/etc"
44+ "-Dsysconfdir_install=${placeholder "out"}/etc"
3945 ] ++ optionals stdenv.isDarwin [
4046 "-D3g-source=false"
4147 "-Dcdma-source=false"
pkgs/development/libraries/gnome-sharp/Makefile.in.patchdeleted−11
@@ -1,11 +0,0 @@
1−--- a/sample/gnomevfs/Makefile.in 2009-03-03 16:09:52.000000000 +0000
2−+++ b/sample/gnomevfs/Makefile.in 2014-10-14 13:35:51.020427244 +0100
3−@@ -218,7 +218,7 @@
4−
5− @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS =
6− @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS =
7−-@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
8−+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
9− assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
10− references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
11− noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)
pkgs/development/libraries/gnome-sharp/default.nix+27−9
@@ -1,17 +1,35 @@
1−{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}:
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, pkgconfig
5+, gtk2
6+, mono
7+, gtk-sharp-2_0
8+, gnome2
9+, autoconf
10+, automake
11+, libtool
12+, which
13+}:
214
3−stdenv.mkDerivation {
4− name = "gnome-sharp-2.24.1";
5− src = fetchurl {
6− url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
7− sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p";
15+stdenv.mkDerivation rec {
16+ name = "gnome-sharp-${version}";
17+ version = "2.24.4";
18+
19+ src = fetchFromGitHub {
20+ owner = "mono";
21+ repo = "gnome-sharp";
22+ rev = "${version}";
23+ sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
824 };
925
10− nativeBuildInputs = [ pkgconfig ];
26+ nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
1127 buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
12− ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]);
28+ ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
1329
14− patches = [ ./Makefile.in.patch ];
30+ preConfigure = ''
31+ ./bootstrap-${lib.versions.majorMinor version}
32+ '';
1533
1634 dontStrip = true;
1735
pkgs/development/libraries/gtest/default.nix+6
@@ -3,6 +3,8 @@ stdenv.mkDerivation rec {
33 name = "gtest-${version}";
44 version = "1.8.1";
55
6+ outputs = [ "out" "dev" ];
7+
68 src = fetchFromGitHub {
79 owner = "google";
810 repo = "googletest";
@@ -12,6 +14,10 @@ stdenv.mkDerivation rec {
1214
1315 nativeBuildInputs = [ cmake ninja ];
1416
17+ cmakeFlags = [
18+ "-DBUILD_SHARED_LIBS=ON"
19+ ];
20+
1521 meta = with stdenv.lib; {
1622 description = "Google's framework for writing C++ tests";
1723 homepage = https://github.com/google/googletest;
pkgs/development/libraries/gtk-sharp/2.0.nix+29−13
@@ -1,4 +1,8 @@
1−{ stdenv, fetchurl, pkgconfig, mono
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, pkgconfig
5+, mono
26, glib
37, pango
48, gtk2
@@ -12,32 +16,44 @@
1216, libgnomeprintui ? null
1317, libxml2
1418, monoDLLFixer
19+, autoconf
20+, automake
21+, libtool
22+, which
1523}:
1624
17−stdenv.mkDerivation {
18− name = "gtk-sharp-2.12.10";
25+stdenv.mkDerivation rec {
26+ name = "gtk-sharp-${version}";
27+ version = "2.12.45";
1928
2029 builder = ./builder.sh;
21− src = fetchurl {
22− url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
23− sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
30+ src = fetchFromGitHub {
31+ owner = "mono";
32+ repo = "gtk-sharp";
33+ rev = version;
34+ sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
2435 };
2536
26− # patches = [ ./dllmap-glue.patch ];
27−
28− # patch bad usage of glib, which wasn't tolerated anymore
29− prePatch = ''
30− for f in glib/glue/{thread,list,slist}.c; do
31− sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f"
37+ postInstall = ''
38+ pushd $out/bin
39+ for f in gapi2-*
40+ do
41+ substituteInPlace $f --replace mono ${mono}/bin/mono
3242 done
43+ popd
3344 '';
3445
35− nativeBuildInputs = [ pkgconfig ];
46+ nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
47+
3648 buildInputs = [
3749 mono glib pango gtk2 GConf libglade libgnomecanvas
3850 libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
3951 ];
4052
53+ preConfigure = ''
54+ ./bootstrap-${lib.versions.majorMinor version}
55+ '';
56+
4157 dontStrip = true;
4258
4359 inherit monoDLLFixer;
pkgs/development/libraries/libdeflate/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, lib, fetchFromGitHub }:
2+
3+stdenv.mkDerivation rec {
4+ name = "libdeflate-${version}";
5+ version = "1.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "ebiggers";
9+ repo = "libdeflate";
10+ rev = "v${version}";
11+ sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb";
12+ };
13+
14+ postPatch = ''
15+ substituteInPlace Makefile --replace /usr $out
16+ '';
17+
18+ configurePhase = ''
19+ make programs/config.h
20+ '';
21+
22+ enableParallelBuilding = true;
23+
24+ meta = with lib; {
25+ description = "Fast DEFLATE/zlib/gzip compressor and decompressor";
26+ license = licenses.mit;
27+ homepage = https://github.com/ebiggers/libdeflate;
28+ platforms = platforms.linux;
29+ maintainers = with maintainers; [ orivej ];
30+ };
31+}
pkgs/development/libraries/libfm/default.nix+10−4
@@ -9,23 +9,29 @@ stdenv.mkDerivation rec {
99 name = if extraOnly
1010 then "libfm-extra-${version}"
1111 else "libfm-${version}";
12− version = "1.3.0.2";
12+ version = "1.3.1";
1313
1414 src = fetchurl {
1515 url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
16− sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q";
16+ sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
1717 };
1818
1919 nativeBuildInputs = [ vala pkgconfig intltool ];
2020 buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache;
2121
22− configureFlags = optional extraOnly "--with-extra-only"
22+ configureFlags = [
23+ "--sysconfdir=/etc"
24+ ] ++ optional extraOnly "--with-extra-only"
2325 ++ optional withGtk3 "--with-gtk=3";
2426
27+ installFlags = [
28+ "sysconfdir=${placeholder "out"}/etc"
29+ ];
30+
2531 enableParallelBuilding = true;
2632
2733 meta = with stdenv.lib; {
28− homepage = http://blog.lxde.org/?cat=28/;
34+ homepage = https://blog.lxde.org/category/pcmanfm/;
2935 license = licenses.lgpl21Plus;
3036 description = "A glib-based library for file management";
3137 maintainers = [ maintainers.ttuegel ];
pkgs/development/libraries/libhandy/default.nix+2−2
@@ -6,7 +6,7 @@
66
77let
88 pname = "libhandy";
9− version = "0.0.5";
9+ version = "0.0.6";
1010in stdenv.mkDerivation rec {
1111 name = "${pname}-${version}";
1212
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
1818 owner = "Librem5";
1919 repo = pname;
2020 rev = "v${version}";
21− sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
21+ sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5";
2222 };
2323
2424 nativeBuildInputs = [
pkgs/development/libraries/libqmatrixclient/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 name = "libqmatrixclient-${version}";
6− version = "0.4.0";
6+ version = "0.4.1";
77
88 src = fetchFromGitHub {
99 owner = "QMatrixClient";
1010 repo = "libqmatrixclient";
1111 rev = "v${version}";
12− sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn";
12+ sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns";
1313 };
1414
1515 buildInputs = [ qtbase ];
pkgs/development/libraries/libsigcxx/default.nix+13−8
@@ -1,20 +1,25 @@
1−{ stdenv, fetchurl, pkgconfig, gnum4 }:
2−let
3− ver_maj = "2.10"; # odd major numbers are unstable
4− ver_min = "0";
5−in
1+{ stdenv, fetchurl, pkgconfig, gnum4, gnome3 }:
2+
63stdenv.mkDerivation rec {
7− name = "libsigc++-${ver_maj}.${ver_min}";
4+ pname = "libsigc++";
5+ version = "2.10.1";
86
97 src = fetchurl {
10− url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz";
11− sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81";
8+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9+ sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
1210 };
1311
1412 nativeBuildInputs = [ pkgconfig gnum4 ];
1513
1614 doCheck = true;
1715
16+ passthru = {
17+ updateScript = gnome3.updateScript {
18+ packageName = pname;
19+ attrPath = "libsigcxx";
20+ };
21+ };
22+
1823 meta = with stdenv.lib; {
1924 homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
2025 description = "A typesafe callback system for standard C++";
pkgs/development/libraries/libuchardet/default.nix+17−11
@@ -1,25 +1,31 @@
1−{ stdenv, fetchFromGitHub, cmake }:
1+{ stdenv, fetchurl, cmake }:
22
33stdenv.mkDerivation rec {
4− name = "libuchardet-${version}";
4+ pname = "uchardet";
5+ version = "0.0.6";
56
6− version = "0.0.5";
7+ outputs = [ "bin" "out" "man" "dev" ];
78
8− src = fetchFromGitHub {
9− owner = "BYVoid";
10− repo = "uchardet";
11− rev = "v${version}";
12− sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm";
9+ src = fetchurl {
10+ url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
11+ sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
1312 };
1413
1514 buildInputs = [ cmake ];
1615
17− doCheck = false; # fails all the tests (ctest)
16+ cmakeFlags = [
17+ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
18+ # TODO: move the following to CMake setup hook
19+ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
20+ "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man"
21+ ];
22+
23+ doCheck = true;
1824
1925 meta = with stdenv.lib; {
2026 description = "Mozilla's Universal Charset Detector C/C++ API";
21− homepage = https://www.byvoid.com/zht/project/uchardet;
22− license = licenses.mpl11;
27+ homepage = https://www.freedesktop.org/wiki/Software/uchardet/;
28+ license = licenses.mpl11;
2329 maintainers = with maintainers; [ cstrahan ];
2430 platforms = with platforms; unix;
2531 };
pkgs/development/libraries/menu-cache/default.nix+2−2
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
1414 buildInputs = [ glib libfm-extra ];
1515
1616 meta = with stdenv.lib; {
17− homepage = http://blog.lxde.org/?tag=menu-cache;
18− license = licenses.gpl2Plus;
1917 description = "Library to read freedesktop.org menu files";
18+ homepage = https://blog.lxde.org/tag/menu-cache/;
19+ license = licenses.gpl2Plus;
2020 maintainers = [ maintainers.ttuegel ];
2121 platforms = platforms.linux ++ platforms.darwin;
2222 };
pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix+13−12
@@ -1,29 +1,30 @@
1−{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo
2−, ppx_deriving, yojson, ounit
1+{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit
2+, ppx_deriving, yojson
33}:
44
5−stdenv.mkDerivation rec {
6− name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}";
7− version = "3.1";
5+buildDunePackage rec {
6+ pname = "ppx_deriving_yojson";
7+ version = "3.3";
8+
9+ minimumOCamlVersion = "4.04";
810
911 src = fetchFromGitHub {
1012 owner = "ocaml-ppx";
1113 repo = "ppx_deriving_yojson";
1214 rev = "v${version}";
13− sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw";
15+ sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz";
1416 };
1517
16− buildInputs = [ ocaml findlib ocamlbuild cppo ounit ];
18+ buildInputs = [ ppxfind ounit ];
1719
1820 propagatedBuildInputs = [ ppx_deriving yojson ];
1921
20− inherit (topkg) installPhase;
22+ doCheck = true;
2123
2224 meta = {
23− description = "A Yojson codec generator for OCaml >= 4.02.";
25+ description = "A Yojson codec generator for OCaml >= 4.04";
2426 inherit (src.meta) homepage;
25− license = stdenv.lib.licenses.mit;
26− maintainers = [ stdenv.lib.maintainers.vbgl ];
27− inherit (ocaml.meta) platforms;
27+ license = lib.licenses.mit;
28+ maintainers = [ lib.maintainers.vbgl ];
2829 };
2930}
pkgs/development/ocaml-modules/ppxfind/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ lib, buildDunePackage, fetchurl, ocaml-migrate-parsetree }:
2+
3+buildDunePackage rec {
4+ pname = "ppxfind";
5+ version = "1.2";
6+ src = fetchurl {
7+ url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
8+ sha256 = "1687jbgii5w5dvvid3ri2cx006ysv0rrspn8dz8x7ma8615whz2h";
9+ };
10+
11+ minimumOCamlVersion = "4.03";
12+
13+ buildInputs = [ ocaml-migrate-parsetree ];
14+
15+ meta = {
16+ homepage = "https://github.com/diml/ppxfind";
17+ description = "ocamlfind ppx tool";
18+ license = lib.licenses.bsd3;
19+ maintainers = [ lib.maintainers.vbgl ];
20+ };
21+}
pkgs/development/python-modules/affine/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "affine";
5− version = "2.2.1";
5+ version = "2.2.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0j3mvcnmgjvvm0znqyf7xylq7i89zjf4dq0g8280xs6bwbl5cvih";
9+ sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz";
1010 };
1111
1212 checkInputs = [ pytest ];
pkgs/development/python-modules/biopython/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "biopython";
9− version = "1.72";
9+ version = "1.73";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2";
13+ sha256 = "1q55jhf76z3k6is3psis0ckbki7df26x7dikpcc3vhk1vhkwribh";
1414 };
1515
1616 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/buildbot/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
22 python, twisted, jinja2, zope_interface, future, sqlalchemy,
33 sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
4− txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint,
4+ txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
55 flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
66
77let
@@ -55,7 +55,7 @@ let
5555 boto3
5656 moto
5757 mock
58− lz4
58+ python-lz4
5959 setuptoolsTrial
6060 isort
6161 pylint
pkgs/development/python-modules/dpkt/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "dpkt";
5− version = "1.9.1";
5+ version = "1.9.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6";
9+ sha256 = "0m0ym219zsqfjl6jwivw5as3igjbmhpcn4dvabc5nkd0bk6jxaaj";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/development/python-modules/easyprocess/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "EasyProcess";
5− version = "0.2.3";
5+ version = "0.2.5";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll";
9+ sha256 = "0gdl6y37g8rns2i26d2zlx7x4kbpql9h5qd8k23ka69q6frcpb8k";
1010 };
1111
1212 # No tests
pkgs/development/python-modules/goobook/default.nix+2−1
@@ -4,6 +4,7 @@
44, isPy3k
55, oauth2client
66, gdata
7+, google_api_python_client
78, simplejson
89, httplib2
910, keyring
@@ -21,7 +22,7 @@ buildPythonPackage rec {
2122 sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
2223 };
2324
24− propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ];
25+ propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ];
2526
2627 preConfigure = ''
2728 sed -i '/distribute/d' setup.py
pkgs/development/python-modules/jsonrpclib-pelix/default.nix+2
@@ -12,6 +12,8 @@ buildPythonPackage rec {
1212 sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
1313 };
1414
15+ doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
16+
1517 meta = with lib; {
1618 description = "JSON RPC client library - Pelix compatible fork";
1719 homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/;
pkgs/development/python-modules/lz4/default.nixdeleted−29
@@ -1,29 +0,0 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchPypi
4−, pytestrunner
5−, pytest
6−, psutil
7−, pkgconfig
8−, setuptools_scm
9−}:
10−
11−buildPythonPackage rec {
12− pname = "lz4";
13− version = "2.1.2";
14−
15− src = fetchPypi {
16− inherit pname version;
17− sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
18− };
19−
20− buildInputs = [ setuptools_scm pytestrunner pkgconfig ];
21− checkInputs = [ pytest psutil ];
22−
23− meta = with stdenv.lib; {
24− description = "Compression library";
25− homepage = https://github.com/python-lz4/python-lz4;
26− license = licenses.bsd3;
27− };
28−
29−}
pkgs/development/python-modules/ofxparse/default.nix+2−1
@@ -3,6 +3,7 @@
33, fetchPypi
44, six
55, beautifulsoup4
6+, lxml
67}:
78
89buildPythonPackage rec {
@@ -14,7 +15,7 @@ buildPythonPackage rec {
1415 sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
1516 };
1617
17− propagatedBuildInputs = [ six beautifulsoup4 ];
18+ propagatedBuildInputs = [ six beautifulsoup4 lxml ];
1819
1920 meta = with stdenv.lib; {
2021 homepage = "http://sites.google.com/site/ofxparse";
pkgs/development/python-modules/parsel/default.nix+4−3
@@ -1,8 +1,9 @@
1−{ stdenv
1+{ lib
22, buildPythonPackage
33, fetchPypi
44, pytest
55, pytestrunner
6+, functools32
67, six
78, w3lib
89, lxml
@@ -19,13 +20,13 @@ buildPythonPackage rec {
1920 };
2021
2122 buildInputs = [ pytest pytestrunner ];
22− propagatedBuildInputs = [ six w3lib lxml cssselect ];
23+ propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ];
2324
2425 checkPhase = ''
2526 py.test
2627 '';
2728
28− meta = with stdenv.lib; {
29+ meta = with lib; {
2930 homepage = "https://github.com/scrapy/parsel";
3031 description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
3132 license = licenses.bsd3;
pkgs/development/python-modules/pytesseract/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pytesseract";
5− version = "0.2.5";
5+ version = "0.2.6";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0wlz1vbg1k8cdrpzvrahjnbsfs4ki6xqhbkv17ycfchh7h6kfkfm";
9+ sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi";
1010 };
1111
1212 patches = [
pkgs/development/python-modules/python-lz4/default.nix+3−3
@@ -12,14 +12,14 @@
1212
1313buildPythonPackage rec {
1414 pname = "python-lz4";
15− version = "2.1.0";
15+ version = "2.1.2";
1616
1717 # get full repository inorder to run tests
1818 src = fetchFromGitHub {
1919 owner = pname;
2020 repo = pname;
2121 rev = "v${version}";
22− sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6";
22+ sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d";
2323 };
2424
2525 buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
@@ -34,7 +34,7 @@ buildPythonPackage rec {
3434 meta = {
3535 description = "LZ4 Bindings for Python";
3636 homepage = https://github.com/python-lz4/python-lz4;
37− license = lib.licenses.bsd0;
37+ license = lib.licenses.bsd3;
3838 maintainers = with lib.maintainers; [ costrouc ];
3939 };
4040}
pkgs/development/python-modules/pytorch/default.nix+32−11
@@ -1,6 +1,6 @@
1−{ buildPythonPackage, pythonOlder,
1+{ stdenv, fetchurl, buildPythonPackage, pythonOlder,
22 cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
3− fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake,
3+ fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
44 linkFarm, symlinkJoin,
55 utillinux, which }:
66
@@ -25,7 +25,7 @@ let
2525 "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
2626
2727in buildPythonPackage rec {
28− version = "0.4.1";
28+ version = "1.0.0";
2929 pname = "pytorch";
3030
3131 src = fetchFromGitHub {
@@ -33,9 +33,17 @@ in buildPythonPackage rec {
3333 repo = "pytorch";
3434 rev = "v${version}";
3535 fetchSubmodules = true;
36− sha256 = "1cr8h47jxgfar5bamyvlayvqymnb2qvp7rr0ka2d2d4rdldf9lrp";
36+ sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm";
3737 };
3838
39+ patches =
40+ [ # Skips two tests that are only meant to run on multi GPUs
41+ (fetchurl {
42+ url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch";
43+ sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i";
44+ })
45+ ];
46+
3947 preConfigure = lib.optionalString cudaSupport ''
4048 export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
4149 '' + lib.optionalString (cudaSupport && cudnn != null) ''
@@ -58,12 +66,24 @@ in buildPythonPackage rec {
5866 done
5967 '';
6068
69+ # Override the (weirdly) wrong version set by default. See
70+ # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038
71+ # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267
72+ PYTORCH_BUILD_VERSION = version;
73+ PYTORCH_BUILD_NUMBER = 0;
74+
75+ # Suppress a weird warning in mkl-dnn, part of ideep in pytorch
76+ # (upstream seems to have fixed this in the wrong place?)
77+ # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
78+ NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ];
79+
6180 buildInputs = [
6281 cmake
6382 numpy.blas
6483 utillinux
6584 which
66− ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn];
85+ ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ]
86+ ++ lib.optionals stdenv.isLinux [ numactl ];
6787
6888 propagatedBuildInputs = [
6989 cffi
@@ -71,15 +91,16 @@ in buildPythonPackage rec {
7191 pyyaml
7292 ] ++ lib.optional (pythonOlder "3.5") typing;
7393
94+ checkInputs = [ hypothesis ];
7495 checkPhase = ''
75− ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils distributed
96+ ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
7697 '';
7798
7899 meta = {
79− description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
80− homepage = https://pytorch.org/;
81− license = lib.licenses.bsd3;
82− platforms = lib.platforms.linux;
83− maintainers = with lib.maintainers; [ teh ];
100+ description = "Open source, prototype-to-production deep learning platform";
101+ homepage = https://pytorch.org/;
102+ license = lib.licenses.bsd3;
103+ platforms = lib.platforms.linux;
104+ maintainers = with lib.maintainers; [ teh thoughtpolice ];
84105 };
85106}
pkgs/development/python-modules/qrcode/default.nix+2
@@ -1,5 +1,6 @@
11{ stdenv
22, buildPythonPackage
3+, isPy27
34, fetchPypi
45, six
56, pillow
@@ -18,6 +19,7 @@ buildPythonPackage rec {
1819
1920 propagatedBuildInputs = [ six pillow pymaging_png ];
2021 checkInputs = [ mock ];
22+ doCheck = isPy27; # https://github.com/lincolnloop/python-qrcode/issues/163
2123
2224 meta = with stdenv.lib; {
2325 description = "Quick Response code generation for Python";
pkgs/development/python-modules/secretstorage/2.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:
2+
3+buildPythonPackage rec {
4+ pname = "secretstorage";
5+ version = "2.3.1";
6+
7+ src = fetchPypi {
8+ pname = "SecretStorage";
9+ inherit version;
10+ sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";
11+ };
12+
13+ propagatedBuildInputs = [ cryptography dbus-python ];
14+
15+ # Needs a D-Bus Sesison
16+ doCheck = false;
17+
18+ meta = with lib; {
19+ homepage = https://github.com/mitya57/secretstorage;
20+ description = "Python bindings to FreeDesktop.org Secret Service API";
21+ license = licenses.bsd3;
22+ maintainers = with maintainers; [ orivej ];
23+ };
24+}
pkgs/development/python-modules/secretstorage/default.nix+1−1
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 meta = with lib; {
2525 homepage = https://github.com/mitya57/secretstorage;
2626 description = "Python bindings to FreeDesktop.org Secret Service API";
27− license = licenses.bsdOriginal;
27+ license = licenses.bsd3;
2828 maintainers = with maintainers; [ teto ];
2929 };
3030}
pkgs/development/python-modules/shellingham/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "shellingham";
6− version = "1.2.7";
6+ version = "1.2.8";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "06biyiwq9571mryzbr50am3mxpc3blscwqhiq8c66ac4xm3maszm";
10+ sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn";
1111 };
1212
1313 meta = with stdenv.lib; {
pkgs/development/python-modules/taskw/default.nix+2−1
@@ -5,6 +5,7 @@
55, tox
66, six
77, dateutil
8+, kitchen
89, pytz
910, pkgs
1011}:
@@ -28,7 +29,7 @@ buildPythonPackage rec {
2829 doCheck = false;
2930
3031 buildInputs = [ nose pkgs.taskwarrior tox ];
31− propagatedBuildInputs = [ six dateutil pytz ];
32+ propagatedBuildInputs = [ six dateutil kitchen pytz ];
3233
3334 meta = with stdenv.lib; {
3435 homepage = https://github.com/ralphbean/taskw;
pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch+4−38
@@ -4,45 +4,11 @@ Date: Sun Nov 16 15:19:38 2014 +0100
44
55 Use a template for taskwarrior install path.
66
7−diff --git a/taskw/warrior.py b/taskw/warrior.py
8−index 21dde88..e0509f2 100644
97--- a/taskw/warrior.py
108+++ b/taskw/warrior.py
11−@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase):
12− def _execute(self, *args):
13− """ Execute a given taskwarrior command with arguments
14−
15− Returns a 2-tuple of stdout and stderr (respectively).
16−
17− """
18− command = (
19− [
9+@@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase):
2010- 'task',
2111+ '@@taskwarrior@@/bin/task',
22− 'rc:%s' % self.config_filename,
23− ]
24− + self.get_configuration_override_args()
25− + [six.text_type(arg) for arg in args]
26− )
27−
28− # subprocess is expecting bytestrings only, so nuke unicode if present
29− for i in range(len(command)):
30−@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase):
31− except OSError:
32− # OSError is raised if subprocess.Popen fails to find
33− # the executable.
34− return False
35−
36− @classmethod
37− def get_version(cls):
38− taskwarrior_version = subprocess.Popen(
39−- ['task', '--version'],
40−+ ['@@taskwarrior@@/bin/task', '--version'],
41− stdout=subprocess.PIPE
42− ).communicate()[0]
43− return LooseVersion(taskwarrior_version.decode())
44−
45− def sync(self, init=False):
46− if self.get_version() < LooseVersion('2.3'):
47− raise UnsupportedVersionException(
48− "'sync' requires version 2.3 of taskwarrior or later."
12+@@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase):
13+- ['task', '--version'],
14++ ['@@taskwarrior@@/bin/task', '--version'],
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix+4−4
@@ -1,16 +1,16 @@
11{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
22
33let
4− version = "11.5.0";
4+ version = "11.6.0";
55 # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
66 docker_x86_64 = fetchurl {
77 url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
8− sha256 = "1siiws19qzfv2nnyp9fy215yd08iv70x830b61kr1742ywc0jcbn";
8+ sha256 = "16xwj962biny18ci8lvfc6r6jq9vcdlc8vs6w7d5yzvd9x55rvwd";
99 };
1010
1111 docker_arm = fetchurl {
1212 url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
13− sha256 = "0d7wnpry4861dcmpspbaar97mkf0jf2bcxvr4nph9xnkw8w7fs2z";
13+ sha256 = "05wb7imly0c5zqmxrgdpls8izsq1g409nh31yf6j0sr76m8qkvf9";
1414 };
1515in
1616buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
2929 owner = "gitlab-org";
3030 repo = "gitlab-runner";
3131 rev = "v${version}";
32− sha256 = "028bl249yfccdnwskbn6sxzf1xsg94chbm107n2h83j7a81cz8kw";
32+ sha256 = "1g9wyi9n9xvynvn7c8kjzm5pznyw7w4ziklxjniaa69idzgvbl5g";
3333 };
3434
3535 patches = [ ./fix-shell-path.patch ];
pkgs/development/tools/misc/dejagnu/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
1616 # the build daemon when building in a chroot. See
17− # <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for
17+ # <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for
1818 # details.
1919
2020 # The test-suite needs to have a non-empty stdin:
pkgs/os-specific/linux/ati-drivers/default.nix+1−1
@@ -19,7 +19,7 @@ with stdenv.lib;
1919# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
2020# which is a problem because it doesn't contain the xorgserver patch supporting
2121# the XORG_DRI_DRIVER_PATH env var.
22−# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
22+# See https://marc.info/?l=nix-dev&m=139641585515351 for a
2323# workaround (TODO)
2424
2525# The gentoo ebuild contains much more "magic" and is usually a great resource to
pkgs/servers/monitoring/net-snmp/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 perlarchname=$(perl -e 'use Config; print $Config{archname};')
2929 installFlags="INSTALLSITEARCH=$out/lib/perl5/site_perl/$perlversion/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3"
3030
31− # http://comments.gmane.org/gmane.network.net-snmp.user/32434
31+ # http://article.gmane.org/gmane.network.net-snmp.user/32434
3232 substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v'
3333 '';
3434
pkgs/servers/monitoring/uchiwa/bower-packages.nix+2−2
@@ -1,7 +1,7 @@
11# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
22{ fetchbower, buildEnv }:
33buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
4− (fetchbower "uchiwa-web" "1.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk")
4+ (fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1")
55 (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")
66 (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
77 (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")
@@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
1919 (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")
2020 (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")
2121 (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
22− (fetchbower "ua-parser-js" "0.7.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn")
22+ (fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4")
2323 (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
2424 (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx")
2525]; }
pkgs/servers/monitoring/uchiwa/src.nix+2−2
@@ -1,4 +1,4 @@
11{
2− version = "1.3.1-1";
3− sha256 = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi";
2+ version = "1.5.0-1";
3+ sha256 = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b";
44}
pkgs/tools/compression/mozlz4a/default.nix+3−2
@@ -1,4 +1,5 @@
1−{stdenv, fetchurl, python3, pylz4}:
1+{ stdenv, fetchurl, python3 }:
2+
23stdenv.mkDerivation rec {
34 name = "${pname}-${version}";
45 pname = "mozlz4a";
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
2122 chmod a+x "$out/bin/mozlz4a"
2223 '';
2324
24− buildInputs = [ pylz4 python3 ];
25+ buildInputs = [ python3 python3.pkgs.python-lz4 ];
2526
2627 meta = {
2728 inherit version;
pkgs/tools/misc/coreutils/default.nix+2−2
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
6363 ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
6464
6565 # The tests are known broken on Cygwin
66− # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
67− # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
66+ # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
67+ # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
6868 # and {Open,Free}BSD.
6969 # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
7070 doCheck = stdenv.hostPlatform == stdenv.buildPlatform
pkgs/top-level/all-packages.nix+5−5
@@ -1693,9 +1693,7 @@ in
16931693
16941694 mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
16951695
1696− mozlz4a = callPackage ../tools/compression/mozlz4a {
1697− pylz4 = python3Packages.lz4;
1698− };
1696+ mozlz4a = callPackage ../tools/compression/mozlz4a { };
16991697
17001698 msr-tools = callPackage ../os-specific/linux/msr-tools { };
17011699
@@ -4796,7 +4794,7 @@ in
47964794
47974795 fmodex = callPackage ../games/zandronum/fmod.nix { };
47984796
4799− pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; };
4797+ pdfmod = callPackage ../applications/misc/pdfmod { };
48004798
48014799 pdf-quench = callPackage ../applications/misc/pdf-quench { };
48024800
@@ -10313,7 +10311,7 @@ in
1031310311
1031410312 hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
1031510313
10316− hyena = callPackage ../development/libraries/hyena { mono = mono4; };
10314+ hyena = callPackage ../development/libraries/hyena { };
1031710315
1031810316 hyperscan = callPackage ../development/libraries/hyperscan { };
1031910317
@@ -10700,6 +10698,8 @@ in
1070010698
1070110699 libde265 = callPackage ../development/libraries/libde265 {};
1070210700
10701+ libdeflate = callPackage ../development/libraries/libdeflate { };
10702+
1070310703 libdevil = callPackage ../development/libraries/libdevil {
1070410704 inherit (darwin.apple_sdk.frameworks) OpenGL;
1070510705 };
pkgs/top-level/ocaml-packages.nix+2
@@ -580,6 +580,8 @@ let
580580 piqi = callPackage ../development/ocaml-modules/piqi { };
581581 piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
582582
583+ ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
584+
583585 ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
584586
585587 psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { };
pkgs/top-level/python-packages.nix+4−3
@@ -648,6 +648,7 @@ in {
648648 python-hosts = callPackage ../development/python-modules/python-hosts { };
649649
650650 python-lz4 = callPackage ../development/python-modules/python-lz4 { };
651+ lz4 = self.python-lz4; # alias 2018-12-05
651652
652653 python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
653654
@@ -3268,8 +3269,6 @@ in {
32683269
32693270 ldappool = callPackage ../development/python-modules/ldappool { };
32703271
3271− lz4 = callPackage ../development/python-modules/lz4 { };
3272−
32733272 retrying = callPackage ../development/python-modules/retrying { };
32743273
32753274 fasteners = callPackage ../development/python-modules/fasteners { };
@@ -4259,7 +4258,9 @@ in {
42594258
42604259 blessings = callPackage ../development/python-modules/blessings { };
42614260
4262− secretstorage = callPackage ../development/python-modules/secretstorage { };
4261+ secretstorage = if isPy3k
4262+ then callPackage ../development/python-modules/secretstorage { }
4263+ else callPackage ../development/python-modules/secretstorage/2.nix { };
42634264
42644265 semantic = callPackage ../development/python-modules/semantic { };
42654266