From bc2905b02032ce66f012482b638edc2e1cea5e55 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 24 Sep 2018 20:40:45 +0000 Subject: [PATCH 01/81] libbladeRF: 1.9.0 -> 2.0.2 --- pkgs/development/libraries/libbladeRF/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 04bd3f3d71e..ac8de886fad 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -2,14 +2,14 @@ , libusb1, udev }: stdenv.mkDerivation rec { - version = "1.9.0"; + version = "2.0.2"; name = "libbladeRF-${version}"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa"; + sha256 = "18qwljjdnf4lds04kc1zvslr5hh9cjnnjkcy07lbkrq7pj0pfnc6"; }; nativeBuildInputs = [ pkgconfig ]; From f96349c45658174d33836ea6c2b5528473977284 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 03:58:35 -0500 Subject: [PATCH 02/81] pypy: Change libPrefix from pypy5.10 to pypy2.7 To avoid conflicting with pypy3, as per https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484. Signed-off-by: Anders Kaseorg --- .../development/interpreters/python/pypy/2.7/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d95707ecb22..3e2aa9d8d83 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -10,19 +10,16 @@ assert zlibSupport -> zlib != null; let - majorVersion = "6.0"; - minorVersion = "0"; - minorVersionSuffix = ""; + version = "6.0.0"; pythonVersion = "2.7"; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "pypy${majorVersion}"; + libPrefix = "pypy${pythonVersion}"; sitePackages = "site-packages"; pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); in stdenv.mkDerivation rec { name = "pypy-${version}"; - inherit majorVersion version pythonVersion; + inherit version pythonVersion; src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; From 91333c1740f45fe55ae248dddc9c86f057f02310 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:00:41 -0500 Subject: [PATCH 03/81] pypy: Remove redundant --withmod-* flags --allworkingmodules is already the default. Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 3e2aa9d8d83..854467e65a8 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -66,12 +66,7 @@ in stdenv.mkDerivation rec { ${pythonForPypy.interpreter} rpython/bin/rpython \ --make-jobs="$NIX_BUILD_CORES" \ -Ojit \ - --batch pypy/goal/targetpypystandalone.py \ - --withmod-_minimal_curses \ - --withmod-unicodedata \ - --withmod-thread \ - --withmod-bz2 \ - --withmod-_multiprocessing + --batch pypy/goal/targetpypystandalone.py ''; setupHook = python-setup-hook sitePackages; From 8b80dec522bd5e0e628e8ac018ed7b58f397a57f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:01:25 -0500 Subject: [PATCH 04/81] pypy: Reenable tests fixed upstream Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 854467e65a8..d8fb633958e 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -79,9 +79,7 @@ in stdenv.mkDerivation rec { # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure - # disable test_zipfile64 because it causes ENOSPACE - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil )' lib-python ''; installPhase = '' From 6d80927a43baee1b006fd54944084001dc04b5a5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:06:08 -0500 Subject: [PATCH 05/81] pypy: Set isPy2, isPy27 Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d8fb633958e..6f7fa962296 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -116,6 +116,8 @@ in stdenv.mkDerivation rec { inherit zlibSupport libPrefix sitePackages; executable = "pypy"; isPypy = true; + isPy2 = true; + isPy27 = true; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; interpreter = "${self}/bin/${executable}"; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; From 9a619df54753e28945c8251af4837ed282915d55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Dec 2018 14:48:39 -0800 Subject: [PATCH 06/81] xl2tpd: 1.3.12 -> 1.3.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xl2tpd/versions --- pkgs/tools/networking/xl2tpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index d86b1613a9a..f3c1fbd853a 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xl2tpd-${version}"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0slza1v8qligy8c83j0x3jzb85m9ibjxyyvpwsykrkypav8a6ii1"; + sha256 = "1nzkmhi9arwd4smhr07l0sssx46w48z0cblv7xcz25wg4hw86mcd"; }; buildInputs = [ libpcap ]; From b33fc4e6180639da886e62b2bf2ee703dc1557bb Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Thu, 13 Dec 2018 02:20:31 -0800 Subject: [PATCH 07/81] retroarch: Remove --menu from wrapper --- pkgs/misc/emulators/retroarch/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index f85d85f8621..71ae168f1b2 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \ --suffix-each LD_LIBRARY_PATH ':' "$cores" \ - --add-flags "-L $out/lib/ --menu" \ + --add-flags "-L $out/lib/" \ ''; cores = map (x: x + x.libretroCore) cores; From f5b3450e887742a0d862b4eecc5cc94ef7e0e64b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 02:46:00 -0800 Subject: [PATCH 08/81] synthv1: 0.9.3 -> 0.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/synthv1/versions --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 13560e34062..e44df51404a 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0f58k5n2k667q8wsigg7bzl3lfgaf6jdj98r2a5nvyb18v1wpy2c"; + sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; From b17326750173cf9c0033aba11ec1c3ae777f4af9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 03:27:38 -0800 Subject: [PATCH 09/81] sound-juicer: 3.16.1 -> 3.24.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sound-juicer/versions --- pkgs/applications/audio/sound-juicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 5679a4d5342..686b27223a6 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -4,13 +4,13 @@ let pname = "sound-juicer"; - version = "3.16.1"; + version = "3.24.0"; in stdenv.mkDerivation rec{ name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; + sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; }; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; From f0d95f00d0aff960bebe3ea708abfde27a184ec9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 04:51:58 -0800 Subject: [PATCH 10/81] riemann_c_client: 1.10.3 -> 1.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riemann-c-client/versions --- pkgs/tools/misc/riemann-c-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index bbbb19fc200..970cf28c26d 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.3"; + name = "riemann-c-client-1.10.4"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; rev = "${name}"; - sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc"; + sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From fbe282b25a6770d22a31584651f5219fd2ee50dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 05:19:41 -0800 Subject: [PATCH 11/81] samplv1: 0.9.3 -> 0.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/samplv1/versions --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 71912e73c47..73f24e03e30 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1yvdr0fvw13lj2r8dppmn0aw83g9f5r1hp5ixvw7cdhrxs7fh4vw"; + sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; From 567910d3e31548a0af54fafdb35bf8fe126d9a7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 06:11:09 -0800 Subject: [PATCH 12/81] pywal: 3.1.0 -> 3.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pywal/versions --- pkgs/tools/graphics/pywal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index a1d1f21a007..4d493bdd73e 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "pywal"; - version = "3.1.0"; + version = "3.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76"; + sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; }; # necessary for imagemagick to be found during tests From 6b77a7f8bfb507eb5cd16c41068a885b2630c3b6 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 14 Dec 2018 20:27:50 +0300 Subject: [PATCH 13/81] fprint_demo: drop package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://fprint.freedesktop.org/ fprint_demo is obsolete. Most features are integrated into fprintd’s helpers, and libfprint has an examples section --- pkgs/tools/security/fprint_demo/default.nix | 24 --------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/tools/security/fprint_demo/default.nix diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix deleted file mode 100644 index 2179b2b7b03..00000000000 --- a/pkgs/tools/security/fprint_demo/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }: - -stdenv.mkDerivation rec { - name = "fprint_demo-2008-03-03"; - - src = fetchgit { - url = "git://github.com/dsd/fprint_demo"; - rev = "5d86c3f778bf97a29b73bdafbebd1970e560bfb0"; - sha256 = "1rysqd8kdqgis1ykrbkiy1bcxav3vna8zdgbamyxw4hj5764xdcm"; - }; - - buildInputs = [ libfprint gtk2 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - - hardeningDisable = [ "format" ]; - - meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/; - description = "A simple GTK+ application to demonstrate and test libfprint's capabilities"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05dbfacb628..7a4ea7aecd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2750,8 +2750,6 @@ in fprintd = callPackage ../tools/security/fprintd { }; - fprint_demo = callPackage ../tools/security/fprint_demo { }; - franz = callPackage ../applications/networking/instant-messengers/franz { }; freedroidrpg = callPackage ../games/freedroidrpg { }; From 04e2dd4c4fd16cbf6bb58540363340347df940ef Mon Sep 17 00:00:00 2001 From: tilpner Date: Sat, 15 Dec 2018 00:48:32 +0100 Subject: [PATCH 14/81] mkdocs: 0.17.5 -> 1.0.4 --- .../tools/documentation/mkdocs/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 925d0a786af..5f3dff95e35 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,25 +4,24 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.17.5"; + version = "1.0.4"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "1l1dahpwqikmww3yx2m6j2134npk8vcikg9klsmpqjpza8nigwzw"; + sha256 = "1x35vgiskgz4wwrvi4m1mri5wlphf15p90fr3rxsy5bf19v3s9hs"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "tornado>=4.1,<5.0" "tornado>=4.1" - ''; - checkInputs = [ nose nose-exclude mock ]; - NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests"; + NOSE_EXCLUDE_TESTS = lib.concatStringsSep ";" [ + "mkdocs.tests.gh_deploy_tests.TestGitHubDeploy" + "mkdocs.tests.config.config_tests.ConfigTests" + "mkdocs.tests.config.config_options_tests.DirTest" + ]; checkPhase = "nosetests mkdocs"; @@ -33,6 +32,7 @@ buildPythonApplication rec { pyyaml markdown jinja2 + backports_tempfile ]; meta = { From 25debad443253a2c94a0f9b205480c0d22fbced0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 00:44:03 +0000 Subject: [PATCH 15/81] tilix: fix Po4a path --- pkgs/applications/misc/tilix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 98e320b7aaf..5cd1b78e5c1 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=( - PERL5LIB="${perlPackages.Po4a}/lib/perl5" + PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl" DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' ) ''; From df8749b5a0214c8673d70725ed7bde69f4132b05 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 00:45:34 +0000 Subject: [PATCH 16/81] apt: fix Po4a path --- pkgs/tools/package-management/apt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index b2d5e96f391..7139454733a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5"; + export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl"; cmakeFlagsArray+=( -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include From 19d06bc517fe5b697a7f386c69a2d0febaa2cff9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 01:12:14 +0000 Subject: [PATCH 17/81] apt: remove 'export PERL5LIB' --- pkgs/tools/package-management/apt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 7139454733a..abd5e6f2f4f 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl"; - cmakeFlagsArray+=( -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl From 8fd01fd7c8bd2316f03a860fee9ef33052c2dff9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 01:13:00 +0000 Subject: [PATCH 18/81] tilix: remove 'export PERL5LIB' --- pkgs/applications/misc/tilix/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 5cd1b78e5c1..eb7a8e41d4b 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=( - PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl" DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' ) ''; From ac62227cfe4d8b864b84f45cd55ca15b776e6950 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 20:10:07 -0800 Subject: [PATCH 19/81] padthv1: 0.9.3 -> 0.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/padthv1/versions --- pkgs/applications/audio/padthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 5d74db5ec3e..084487fd407 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "157w28wxggqpqkibz716v3r756q2z78g70ipncpalchb9dfr42b6"; + sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; From 84800eb00381c4ae1538b54bba5e8e3788f95d6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 21:14:14 -0800 Subject: [PATCH 20/81] oniguruma: 6.9.0 -> 6.9.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/onig/versions --- pkgs/development/libraries/oniguruma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 956c8b58ffc..4c994d596ba 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.9.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h"; + sha256 = "0dbdd9r15fsqn0rimkjwlv8v68v4i1830h0m7dw56b335wwl6bbg"; }; nativeBuildInputs = [ cmake ]; From 44b2145dbe1642ad9b22b0aa6be1529332dad106 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 22:10:24 -0800 Subject: [PATCH 21/81] osrm-backend: 5.19.0 -> 5.20.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osrm-backend/versions --- pkgs/servers/osrm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 97612f656cb..4e43fffb196 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.19.0"; + version = "5.20.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "1y3k2j4c3jparzm9ck1jkw5g12jr6kd9llq50jran2dwikc6hpyz"; + sha256 = "0frq16p4wms8zfb6mhn7xbxrvf81f1wn37lqlf5p1yjly5fbljhc"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 4c3e1114d8994d5787fad964a93011430b4ef717 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 23:01:19 -0800 Subject: [PATCH 22/81] neovim-qt: 0.2.10 -> 0.2.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neovim-qt/versions --- pkgs/applications/editors/neovim/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index cfdcd7fe939..315a51256f2 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0hq3w9d6qbzf0j7zm3ls0wpvnab64kypb4i0bhmsnk605mvx63r4"; + sha256 = "0pc1adxc89p2rdvb6nxyqr9sjzqz9zw2dg7a4ardxsl3a8jga1wh"; }; cmakeFlags = [ From b2ef061bc21446b73829b1b0721437daa3714314 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 07:35:40 -0800 Subject: [PATCH 23/81] jruby: 9.2.4.0 -> 9.2.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jruby/versions --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 330e6b282ce..cfefa8c95dc 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.2.4.0"; + version = "9.2.5.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr"; + sha256 = "0jgkpp90x4v3izl58r53lg5ndf9pm6q6qgwqvxhkb9zcha00ibgl"; }; buildInputs = [ makeWrapper ]; From 7a97f697d53fd9802c919a0e2b94fb230f1337cb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 16 Dec 2018 12:28:32 +0100 Subject: [PATCH 24/81] dashing: enable on darwin --- pkgs/tools/misc/dashing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index a8a878b1998..5a82c766089 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { homepage = https://github.com/technosophos/dashing; license = licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From ffc586cf49c0ded1026e92b0fa8d9cb2805be6ba Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 16 Dec 2018 09:30:10 -0200 Subject: [PATCH 25/81] fluidsynth_1: init at 1.1.11 --- .../applications/audio/fluidsynth/default.nix | 23 +++++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 33ac7218778..8727c49398e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,17 +1,32 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake , alsaLib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices +, version ? "2" }: +let + versionMap = { + "1" = { + fluidsynthVersion = "1.1.11"; + sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; + }; + "2" = { + fluidsynthVersion = "2.0.1"; + sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"; + }; + }; +in + +with versionMap.${version}; + stdenv.mkDerivation rec { - name = "fluidsynth-${version}"; - version = "2.0.1"; + name = "fluidsynth-${fluidsynthVersion}"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; - rev = "v${version}"; - sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"; + rev = "v${fluidsynthVersion}"; + inherit sha256; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64ef63f55ab..82db9a17f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16836,6 +16836,7 @@ in fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; }; + fluidsynth_1 = fluidsynth.override { version = "1"; }; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; From 86fac8b52863dac169f92c9b5abb286244a8db28 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 16 Dec 2018 09:30:16 -0200 Subject: [PATCH 26/81] csound: depend on fluidsynth_1 csound is incompatible with fluidsynth 2 https://github.com/csound/csound/issues/1078 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82db9a17f38..bb1be7dc2e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16267,7 +16267,9 @@ in csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { }; + csound = callPackage ../applications/audio/csound { + fluidsynth = fluidsynth_1; + }; cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; From 26f6c15a42e8015a5332925719f45c8992a2fc9c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 14 Dec 2018 21:13:35 +0300 Subject: [PATCH 27/81] fprintd: 0.8.0 -> 0.8.1 --- pkgs/tools/security/fprintd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index d0cf2f8091e..65eec89a09f 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fprintd-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz"; + sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; }; buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/fprintd/; + homepage = https://fprint.freedesktop.org/; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; platforms = platforms.linux; From 024ad6c4d5899bbbd2841a7b41e9c2f81719badf Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 17 Dec 2018 21:04:26 +0300 Subject: [PATCH 28/81] libfprint: 0.7.0 -> 0.99.0 --- .../libraries/libfprint/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 8b384a51f01..3f3062e3c08 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 +, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { - name = "libfprint-0.7.0"; + name = "libfprint-${version}"; + version = "0.99.0"; src = fetchurl { - url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz"; - sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; }; - buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pixman glib nss gtk3 ]; + nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; + mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; + + preConfigure = '' + substituteInPlace libfprint/meson.build \ + --replace /bin/echo ${coreutils}/bin/echo + ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/; + homepage = https://fprint.freedesktop.org/; description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl2; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; From c08ec87fe31e7314cfc4f7cbf00af93ff1594294 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Mon, 17 Dec 2018 12:34:39 -0600 Subject: [PATCH 29/81] Emacs site-start: Use correct feature name * pkgs/applications/editors/emacs/site-start.el (tramp-sh): Use correct feature name Tramp upstream recently dropped the autoload cookie from tramp-remote-path. This makes Emacs error when trying to load tramp. Using the correct feature name fixes this. --- pkgs/applications/editors/emacs/site-start.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index cc1ab1d0e30..34addc33a59 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -30,7 +30,7 @@ least specific (the system profile)" woman-manpath))) ;;; Make tramp work for remote NixOS machines -(eval-after-load 'tramp +(eval-after-load 'tramp-sh ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover ;; them dynamically after connecting via `tramp' From 5a44fef594ebffdbacc1b2fb94fe2b1617467f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 17 Dec 2018 23:08:56 +0100 Subject: [PATCH 30/81] adoptopenjdk: autogenerate sources + add support for aarch64 --- .../adoptopenjdk-bin/generate-sources.py | 69 ++++++++++++++ .../adoptopenjdk-bin/jdk-darwin-base.nix | 11 +-- .../adoptopenjdk-bin/jdk-linux-base.nix | 13 ++- .../adoptopenjdk-bin/jdk11-darwin.nix | 44 +-------- .../adoptopenjdk-bin/jdk11-linux.nix | 44 +-------- .../compilers/adoptopenjdk-bin/sources.json | 94 +++++++++++++++++++ 6 files changed, 184 insertions(+), 91 deletions(-) create mode 100755 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.json diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py new file mode 100755 index 00000000000..a410501de0a --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -0,0 +1,69 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests + +import json +import re +import requests +import sys + +releases = ["openjdk11"] +oses = ["mac", "linux"] +types = ["jre", "jdk"] +impls = ["hotspot", "openj9"] + +arch_to_nixos = { + "x64": "x86_64", + "aarch64": "aarch64", +} + +def get_sha256(url): + resp = requests.get(url) + if resp.status_code != 200: + print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr) + sys.exit(1) + return resp.text.strip().split(" ")[0] + +RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13 +def generate_sources(release, assets): + out = {} + for asset in assets: + if asset["os"] not in oses: continue + if asset["binary_type"] not in types: continue + if asset["openjdk_impl"] not in impls: continue + if asset["heap_size"] != "normal": continue + if asset["architecture"] not in arch_to_nixos: continue + + version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups() + + type_map = out.setdefault(asset["os"], {}) + impl_map = type_map.setdefault(asset["binary_type"], {}) + arch_map = impl_map.setdefault(asset["openjdk_impl"], { + "version": version, + "build": build, + "packageType": asset["binary_type"], + "vmType": asset["openjdk_impl"], + }) + + if arch_map["version"] != version or arch_map["build"] != build: + print("error: architectures have different latest versions ({}+{} vs {}+{})".format( + arch_map["version"], arch_map["build"], version, build + ), file=sys.stderr) + sys.exit(1) + + arch_map[arch_to_nixos[asset["architecture"]]] = { + "url": asset["binary_link"], + "sha256": get_sha256(asset["checksum_link"]), + } + + return out + +out = {} +for release in releases: + resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release) + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr) + sys.exit(1) + out[release] = generate_sources(release, resp.json()) + +with open("sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index c2c13649f88..958f36d3928 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -1,7 +1,4 @@ -{ name -, url -, sha256 -}: +sourcePerArch: { swingSupport ? true # not used for now , stdenv @@ -9,10 +6,12 @@ }: let result = stdenv.mkDerivation rec { - inherit name; + name = if sourcePerArch.packageType == "jdk" + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; src = fetchurl { - inherit url sha256; + inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; }; # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index cf38ca9eaeb..eb614b0784f 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -1,7 +1,4 @@ -{ name -, url -, sha256 -}: +sourcePerArch: { swingSupport ? true , stdenv @@ -48,10 +45,12 @@ let in let result = stdenv.mkDerivation rec { - inherit name; + name = if sourcePerArch.packageType == "jdk" + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; src = fetchurl { - inherit url sha256; + inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; }; nativeBuildInputs = [ file ]; @@ -112,7 +111,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; - platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms maintainers = with stdenv.lib.maintainers; [ taku0 ]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 573f5e175ec..d1db77215d1 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,43 +1,9 @@ let - makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { - name = if packageType == "jdk" - then - "adoptopenjdk-${vmType}-bin-${version}" - else - "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - - url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; - - inherit sha256; - }; + sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jdk"; - vmType = "hotspot"; - sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; - }; - jre-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jre"; - vmType = "hotspot"; - sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; - }; - jdk-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jdk"; - vmType = "openj9"; - sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f"; - }; - jre-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jre"; - vmType = "openj9"; - sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8"; - }; + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index f4990b6effc..755ffaab271 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,43 +1,9 @@ let - makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix { - name = if packageType == "jdk" - then - "adoptopenjdk-${vmType}-bin-${version}" - else - "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - - url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; - - inherit sha256; - }; + sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jdk"; - vmType = "hotspot"; - sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; - }; - jre-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jre"; - vmType = "hotspot"; - sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; - }; - jdk-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jdk"; - vmType = "openj9"; - sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251"; - }; - jre-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jre"; - vmType = "openj9"; - sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff"; - }; + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json new file mode 100644 index 00000000000..bacb468c0ec --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -0,0 +1,94 @@ +{ + "openjdk11": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz" + }, + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "hotspot", + "x86_64": { + "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz" + } + }, + "openj9": { + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "openj9", + "x86_64": { + "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz" + }, + "build": "28", + "packageType": "jre", + "version": "11", + "vmType": "hotspot", + "x86_64": { + "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz" + } + }, + "openj9": { + "build": "28", + "packageType": "jre", + "version": "11", + "vmType": "openj9", + "x86_64": { + "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "hotspot", + "x86_64": { + "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz" + } + }, + "openj9": { + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "openj9", + "x86_64": { + "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + } + } + }, + "jre": { + "hotspot": { + "build": "28", + "packageType": "jre", + "version": "11", + "vmType": "hotspot", + "x86_64": { + "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz" + } + } + } + } + } +} \ No newline at end of file From b4b67177b53c23c6fb77aea7f0bc5c559f8bebe5 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 17 Dec 2018 15:42:41 -0800 Subject: [PATCH 31/81] nixos/bash: Fix prompt regression in Emacs term mode --- nixos/modules/programs/bash/bash.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 2b01c9d26c4..d22f9dfa319 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -98,7 +98,12 @@ in if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" let $UID && PROMPT_COLOR="1;32m" - PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " + if [ -n "$INSIDE_EMACS" ]; then + # Emacs term mode doesn't support xterm title escape sequence (\e]0;) + PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " + else + PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " + fi if test "$TERM" = "xterm"; then PS1="\[\033]2;\h:\u:\w\007\]$PS1" fi From 26785ae6facfc2b2e8ed79f35d521aa97deceb70 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 18 Dec 2018 01:52:07 +0100 Subject: [PATCH 32/81] gotop: 1.5.0 -> 1.7.1 --- pkgs/tools/system/gotop/default.nix | 6 +++-- pkgs/tools/system/gotop/deps.nix | 39 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/system/gotop/deps.nix diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 3aba05f7aef..2b918d15581 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotop-${version}"; - version = "1.5.0"; + version = "1.7.1"; goPackagePath = "github.com/cjbassi/gotop"; @@ -10,9 +10,11 @@ buildGoPackage rec { repo = "gotop"; owner = "cjbassi"; rev = version; - sha256 = "19kj7mziwkfcf9kkwph05jh5vlkfqpyrpxdk5gdf2swg07w1ld35"; + sha256 = "0dxnhal10kv6ypsg6mildzpz6vi1iw996q47f4rv8hvfyrffhzc9"; }; + goDeps = ./deps.nix; + meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = https://github.com/cjbassi/gotop; diff --git a/pkgs/tools/system/gotop/deps.nix b/pkgs/tools/system/gotop/deps.nix new file mode 100644 index 00000000000..ceae7857551 --- /dev/null +++ b/pkgs/tools/system/gotop/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/cjbassi/termui"; + fetch = { + type = "git"; + url = "https://github.com/cjbassi/termui"; + rev = "e8dd23f6146c0e0d80f1be0163b8069abfbb921b"; + sha256 = "0jds2mpa7whrwaznlkcn2y92q41zbf2rjj5267kl8zqllbia8cbx"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; + sha256 = "0hlra7rmi5pmd7d93rv56ahiy4qkgmq8a6mz0jpadvbi5qh8lq6j"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "51e6519305e4871657c291a6281fcddc6364bbef"; + sha256 = "1pvvaj51m0w2v6bp5hhhzfy27hbicf4ga7r9m073vqcwjnfyz431"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"; + sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6"; + }; + } +] From fb66e2d7926eae8765b3dbbf11b385112174198b Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 17 Dec 2018 18:49:54 -0800 Subject: [PATCH 33/81] terraform_0_11: 0.11.10 -> 0.11.11 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8c97186b59a..dd0fe0a3eb1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -88,8 +88,8 @@ let plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_11 = pluggable (generic { - version = "0.11.10"; - sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb"; + version = "0.11.11"; + sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 7b884b68077f3c2a48595dc093aa0cd4d60e2597 Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 17 Dec 2018 18:59:30 -0800 Subject: [PATCH 34/81] terraform-providers: bump versions --- .../cluster/terraform-providers/data.nix | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index a69229735f8..3b22aa3b04d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -39,15 +39,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.51.0"; - sha256 = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg"; + version = "1.52.0"; + sha256 = "037n26spp49r4b4f6cyv6d3sgqw2d80g97fqgz1j0hcwi0am56h1"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.19.0"; - sha256 = "1b07g90vmdvlfyz2q40sjd14xnbjyf9c7hgg7rzyhnkfi7imjbbf"; + version = "1.20.0"; + sha256 = "0hfq5gk4bhmw65x1rsdpwv0massgr1sczvcbyh572qlkkhvm59xd"; }; azurestack = { @@ -144,8 +144,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "1.0.2"; - sha256 = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6"; + version = "1.1.0"; + sha256 = "1w5xslm8939rz13bsiv9hfcl8cyvi03gr0h24c0ybwj8alxmxhb4"; }; dme = { @@ -221,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.19.1"; - sha256 = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0"; + version = "1.20.0"; + sha256 = "1brkq4iz140miai6gzvzxfl28qi4j8gcc22igd7cb4qzafnlbxaj"; }; grafana = { @@ -242,15 +242,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.6.2"; - sha256 = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b"; + version = "0.7.0"; + sha256 = "172l5cpl6vfdz75s3s60iqcavi5m66gwbrm7aw47hby8lv5ivflc"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.6.0"; - sha256 = "0byz9prx2x3nz9dl65mjnp0f33in62am35kcsza3538jcvymkhk2"; + version = "1.7.0"; + sha256 = "0zk5w4xwbg631m7592gfmdbsmrr0r7vla5nd1p5frh6szg6psy6m"; }; http = { @@ -396,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.9.0"; - sha256 = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97"; + version = "3.10.0"; + sha256 = "0dhz3y62dp66jkn0q4x7v2cnqw8kiq34sgyfx8mw706hg9sdqb0l"; }; oneandone = { @@ -410,8 +410,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.3.0"; - sha256 = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p"; + version = "1.3.1"; + sha256 = "0rpkhaja6vq1y1xah136vjlp1d5v9adymq300ajssbjkqf93wzs6"; }; openstack = { @@ -424,8 +424,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.3.0"; - sha256 = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk"; + version = "1.4.0"; + sha256 = "0dv756npyhadzr08zlv28ghazaj1fdp3avcld7y6ri99hamncm95"; }; opsgenie = { @@ -438,8 +438,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.3.2"; - sha256 = "138522cidaiy2akqqblik3w6qnx8zgn70ih7am1sxn13vqm1vlhb"; + version = "1.4.0"; + sha256 = "1hhkijxnwmm21b0w9qc3lk5vfcg0ac0sg7v4g0ffjqv68mssrz6x"; }; ovh = { @@ -599,8 +599,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.4.0"; - sha256 = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn"; + version = "0.5.0"; + sha256 = "1acmmsb4nj3l4d7zlzjrh97nhrkgm99wlazjrfavxwly253ck283"; }; tls = { @@ -627,8 +627,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.3.1"; - sha256 = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh"; + version = "1.4.1"; + sha256 = "1nkhcgd2y7wyi179l2znjpakmjjcxarwc9j5mb7r191p2m27k27s"; }; vcd = { From 7112cd88220dd53b95e8a5a43248f33328be357d Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 24 Sep 2018 19:40:45 +0000 Subject: [PATCH 35/81] nixos/hardware/bladeRF: init at 2.0.2 This allows to easily enable bladerf-related udev rules with nixos configuration. --- nixos/modules/hardware/bladeRF.nix | 28 +++++++++++++++++++ nixos/modules/module-list.nix | 1 + .../libraries/libbladeRF/default.nix | 14 ++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/hardware/bladeRF.nix diff --git a/nixos/modules/hardware/bladeRF.nix b/nixos/modules/hardware/bladeRF.nix new file mode 100644 index 00000000000..92544347714 --- /dev/null +++ b/nixos/modules/hardware/bladeRF.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.bladeRF; + +in + +{ + options.hardware.bladeRF = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for BladeRF devices. By default grants access + to users in the "bladerf" group. You may want to install the + libbladeRF package. + ''; + }; + + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.libbladeRF ]; + users.groups.bladerf = {}; + }; +} \ No newline at end of file diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1a8f522a969..aba2b3b562c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -33,6 +33,7 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/bladeRF.nix ./hardware/brightnessctl.nix ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index ac8de886fad..45f24fc5fac 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { @@ -21,8 +21,17 @@ stdenv.mkDerivation rec { # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; + # Fixes macos and freebsd compilation issue. + # https://github.com/Nuand/bladeRF/commit/0cb4ea888543b2dc75b876f7024e180854fbe9c3 + patches = [ (fetchpatch { + name = "fix-OSX-and-FreeBSD-build.patch"; + url = "https://github.com/Nuand/bladeRF/commit/0cb4ea88.diff"; + sha256 = "1ccpa69vz2nlpdnxprh4rd1pgphk82z5lfmbrfdkn7srw6nxl469"; + }) + ]; + # Let us avoid nettools as a dependency. - patchPhase = '' + postPatch = '' sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash ''; @@ -31,6 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" + "-DBLADERF_GROUP=bladerf" ]; hardeningDisable = [ "fortify" ]; From 6bdcc10767dd0c3c96ad1a3c24b4bae38bea3fe1 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 18 Dec 2018 09:30:32 +0100 Subject: [PATCH 36/81] fluidsynth: keep version This avoids a mass-rebuild for packages which depend on fluidsynth 2.x. --- pkgs/applications/audio/fluidsynth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8727c49398e..d40544a0fa4 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -21,6 +21,7 @@ with versionMap.${version}; stdenv.mkDerivation rec { name = "fluidsynth-${fluidsynthVersion}"; + version = fluidsynthVersion; src = fetchFromGitHub { owner = "FluidSynth"; From a532c6318ac2ad112f9c9ac9f6c5455db0633c9f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 18 Dec 2018 09:46:15 +0100 Subject: [PATCH 37/81] csound: document temp dependency on fluidsynth 1 --- pkgs/applications/audio/csound/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index da3cff0bac2..450ece6a12f 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { name = "csound-${version}"; + # When updating, please check if https://github.com/csound/csound/issues/1078 + # has been fixed in the new version so we can use the normal fluidsynth + # version and remove fluidsynth 1.x from nixpkgs again. version = "6.12.0"; enableParallelBuilding = true; From 53a7d5ec99ca2df635b16ce4236af60ac19a01b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 03:28:01 -0800 Subject: [PATCH 38/81] squirrel-sql: 3.8.1 -> 3.9.0 * squirrel-sql: 3.8.1 -> 3.9.0 (#52029) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/squirrel-sql/versions * squirrel-sql: cleanup * squirrel-sql: don't pass stdenv as a build input --- .../tools/database/squirrel-sql/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 7d4cf6ea5d5..548268bb762 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,29 +5,34 @@ , drivers ? [] }: let - version = "3.8.1"; + version = "3.9.0"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; + sha256 = "0b16l7p7klagxnwkx2az4mbyd35kv4aj8xxbwm27pp3spz9dk8m0"; }; - buildInputs = [ - jre makeWrapper stdenv unzip - ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ jre ]; unpackPhase = '' + runHook preUnpack unzip ${src} + runHook postUnpack ''; buildPhase = '' + runHook preBuild cd squirrelsql-${version}-standard chmod +x squirrel-sql.sh + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/squirrel-sql cp -r . $out/share/squirrel-sql @@ -47,6 +52,8 @@ in stdenv.mkDerivation rec { ln -s $out/share/squirrel-sql/icons/acorn.png \ $out/share/icons/hicolor/32x32/apps/squirrel-sql.png ln -s ${desktopItem}/share/applications $out/share + + runHook postInstall ''; desktopItem = makeDesktopItem { @@ -59,11 +66,11 @@ in stdenv.mkDerivation rec { icon = "squirrel-sql"; }; - meta = { + meta = with stdenv.lib; { description = "Universal SQL Client"; homepage = http://squirrel-sql.sourceforge.net/; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ khumba ]; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ khumba ]; }; } From 63576365fec31fa5defc1e58ac11fc8001dd6ade Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Dec 2018 12:50:07 +0100 Subject: [PATCH 39/81] python-osc: update to latest git snapshot --- pkgs/development/python-modules/osc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 87bd6ee258c..7e620769759 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage { pname = "osc"; - version = "0.162.0-55-gb730f88"; - disabled = isPy3k; + version = "0.163.0-40-gb4b1ec7"; + disabled = isPy3k; # urlgrabber doesn't support python-3.x src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "b730f880cfe85a8547f569355a21706f27ebfa78"; - sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh"; + rev = "b4b1ec7b64d4f9bb42f140754519221b810e232c"; + sha256 = "01z1b15x9vzhd7j94f6n3g50h5br7lwz86akgic0wpp41zv37jad"; }; buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper From f09d369fa5fdc99bf84aeda196449876fa6c7165 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 18 Dec 2018 13:10:41 +0100 Subject: [PATCH 40/81] soapybladerf: 0.3.5 -> 0.4.0 resolves compatability issue with libbladerf-2.0.2 --- pkgs/applications/misc/soapybladerf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix index 4e1adc32946..bab829e05e3 100644 --- a/pkgs/applications/misc/soapybladerf/default.nix +++ b/pkgs/applications/misc/soapybladerf/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.5"; + version = "0.4.0"; in stdenv.mkDerivation { name = "soapybladerf-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyBladeRF"; rev = "soapy-bladerf-${version}"; - sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg"; + sha256 = "1gf1azfydw033nlg2bgs9cbsbp9npjdrgjwlsffn0d9x0qbgxjqp"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 685c4f56083272594a53143c19c08906961c4b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Delgado=20Kr=C3=A4mer?= Date: Mon, 17 Dec 2018 19:11:40 +0100 Subject: [PATCH 41/81] nixos/oh-my-zsh: fix wrong manual information Manual still refers to 'programs.ohMyZsh' although it should be 'programs.zsh.ohMyZsh'. --- nixos/modules/programs/zsh/oh-my-zsh.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index 5cf690c1a56..b26980daf06 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -19,7 +19,7 @@ configuration format of oh-my-zsh. { - programs.ohMyZsh = { + programs.zsh.ohMyZsh = { enable = true; plugins = [ "git" "python" "man" ]; theme = "agnoster"; @@ -51,7 +51,7 @@ The module can do this as well: { - programs.ohMyZsh.custom = "~/path/to/custom/scripts"; + programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; } @@ -73,7 +73,7 @@ { pkgs, ... }: { - programs.ohMyZsh.customPkgs = with pkgs; [ + programs.zsh.ohMyZsh.customPkgs = with pkgs; [ pkgs.nix-zsh-completions # and even more... ]; @@ -87,7 +87,7 @@ Please keep in mind that this is not compatible with - programs.ohMyZsh.custom as it requires an immutable store + programs.zsh.ohMyZsh.custom as it requires an immutable store path while custom shall remain mutable! An evaluation failure will be thrown if both custom and customPkgs are set. From db558b31b9af9db59a8000c85c21057c88efcc25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Dec 2018 14:44:37 +0100 Subject: [PATCH 42/81] python3.pkgs.git-annex-adapter: 0.2.0 -> 0.2.1 --- .../git-annex-adapter/default.nix | 38 ++----------------- .../not-a-git-repo-testcase.patch | 13 ------- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index f4d690eedc3..d8fc12b1c42 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { pname = "git-annex-adapter"; - version = "0.2.0"; + version = "0.2.1"; disabled = !isPy3k; - # There is only a wheel on PyPI - build from source instead + # No tests in PyPI tarball src = fetchFromGitHub { owner = "alpernebbi"; repo = pname; rev = "v${version}"; - sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz"; + sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; }; prePatch = '' @@ -22,38 +22,6 @@ buildPythonPackage rec { --replace "'git-annex'" "'${git-annex}/bin/git-annex'" ''; - patches = [ - # fixes the "not-a-git-repo" testcase where recent git versions expect a slightly different error. - ./not-a-git-repo-testcase.patch - - # fixes the testcase which parses the output of `git-annex info` where several - # new lines are displayed that broke the test. - (fetchpatch { - url = "https://github.com/Ma27/git-annex-adapter/commit/39cb6da69c1aec3d57ea9f68c2dea5113ae1b764.patch"; - sha256 = "0wyy2icqan3jpiw7dm50arfq3mgq4b5s3g91k82srap763r9hg5m"; - }) - - # fixes the testcase which runs "git status" and complies with the - # slightly altered output. - (fetchpatch { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; - sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir"; - }) - - # fix test broken due to renaming of repository version 6 to 7 - (fetchpatch { - url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch; - sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7"; - }) - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin: - # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b - (fetchpatch { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/0b60b4577528b309f6ac9d47b55a00dbda9850ea.patch"; - sha256 = "0z608hpmyzv1mm01dxr7d6bi1hc77h4yafghkynmv99ijgnm1qk7"; - }) - ]; - checkInputs = [ utillinux # `rev` is needed in tests/test_process.py ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch deleted file mode 100644 index 2a386ee3f2f..00000000000 --- a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_process.py b/tests/test_process.py -index 493fc8f..feb1833 100644 ---- a/tests/test_process.py -+++ b/tests/test_process.py -@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase): - with self.assertRaises(subprocess.CalledProcessError) as cm: - runner('status', '-sb') - self.assertIn( -- "fatal: Not a git repository", -+ "fatal: not a git repository", - cm.exception.stderr, - ) - From fb227af6a079b5ec70e9996237d62850bdb59364 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 06:11:23 -0800 Subject: [PATCH 43/81] subsonic: 6.1.3 -> 6.1.5 * subsonic: 6.1.3 -> 6.1.5 (#52019) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subsonic/versions * subsonic: license is unfree Went closed-source since 6.0beta2 See: http://forum.subsonic.org/forum/viewtopic.php?f=4&t=16604#p71128 --- pkgs/servers/misc/subsonic/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index f546b0b075e..50e754791e6 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, jre }: -let version = "6.1.3"; in - stdenv.mkDerivation rec { name = "subsonic-${version}"; - inherit version; + version = "6.1.5"; src = fetchurl { url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz"; - sha256 = "1v21gfymaqcx6n6d88hvha60q9hgj5z1wsac5gcwq7cjah1893jx"; + sha256 = "1xz3flxd5hxcvvg1izzxpv5rxwb5zprk92vsgvmcniy7j7r66936"; }; inherit jre; @@ -16,20 +14,24 @@ stdenv.mkDerivation rec { # Create temporary directory to extract tarball into to satisfy Nix's need # for a directory to be created in the unpack phase. unpackPhase = '' + runHook preUnpack mkdir ${name} tar -C ${name} -xzf $src + runHook postUnpack ''; installPhase = '' + runHook preInstall mkdir $out cp -r ${name}/* $out + runHook postInstall ''; - meta = { + meta = with stdenv.lib; { homepage = http://subsonic.org; description = "Personal media streamer"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ telotortium ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.unfree; + maintainers = with maintainers; [ telotortium ]; + platforms = platforms.unix; }; phases = ["unpackPhase" "installPhase"]; From 4d1487908195d8c0975a3aca0b7a3a2dbf7301a8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 18 Dec 2018 09:11:56 -0500 Subject: [PATCH 44/81] linux: 4.4.167 -> 4.4.168 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9ef3768332d..5005e5b1d84 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.167"; + version = "4.4.168"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pryjpih8js9640jhv74wzvka4199irnp7bzn33lyh35lll4rjik"; + sha256 = "0zhmhccwki1r7p99ap772p3bknl4hm6zfwvzk97nas42anqc0ylg"; }; } // (args.argsOverride or {})) From e60233db007a81eb846a39ca4a17db00d8d8cc26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 06:46:05 -0800 Subject: [PATCH 45/81] sundials: 3.2.1 -> 4.0.0 * sundials: 3.2.1 -> 4.0.0 (#52022) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sundials/versions * sundials: cleanup --- pkgs/development/libraries/sundials/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index f3cfc1e56e8..2a5acc31382 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,23 +3,24 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.2.1"; + version = "4.0.0"; name = "${pname}-${version}"; src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; + url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; + sha256 = "06cspmhx9qn7x722lmy9q2jr80hnnv2h7n54da7y5m951p1xfgcm"; }; preConfigure = '' export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" ''; - buildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ python ]; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/casc/sundials/main.html; + homepage = https://computation.llnl.gov/projects/sundials; platforms = platforms.all; maintainers = [ maintainers.idontgetoutmuch ]; license = licenses.bsd3; From 3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 2 Dec 2018 11:11:38 -0500 Subject: [PATCH 46/81] pagmo2: 2.8 -> 2.9 fix broken package corrects the library nlopt location as well. --- pkgs/development/libraries/pagmo2/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index c680efa95f8..842fae5ea93 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -11,32 +11,34 @@ stdenv.mkDerivation rec { name = "pagmo2-${version}"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z"; + sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; }; - buildInputs = [ cmake eigen nlopt ipopt boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen nlopt ipopt boost ]; - preBuild = '' - cp -r $src/* . - ''; + cmakeFlags = [ + "-DPAGMO_BUILD_TESTS=no" + "-DPAGMO_WITH_EIGEN3=yes" + "-DPAGMO_WITH_NLOPT=yes" + "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt.so" + "-DPAGMO_WITH_IPOPT=yes" + "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" + ]; - cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" - "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes" - "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes" - "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ]; - - # All but one test pass skip for now (tests also take about 30 min to compile) + # tests pass but take 30+ minutes doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = https://esa.github.io/pagmo2/; description = "Scientific library for massively parallel optimization"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = [ maintainers.costrouc ]; }; } From de6b13db63d3ff3cbc53d4152e31bc742ddf0991 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:32:19 -0500 Subject: [PATCH 47/81] liberationsansnarrow_binary: remove --- .../fonts/liberationsansnarrow/binary.nix | 22 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 23 deletions(-) delete mode 100644 pkgs/data/fonts/liberationsansnarrow/binary.nix diff --git a/pkgs/data/fonts/liberationsansnarrow/binary.nix b/pkgs/data/fonts/liberationsansnarrow/binary.nix deleted file mode 100644 index c7afc91af84..00000000000 --- a/pkgs/data/fonts/liberationsansnarrow/binary.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, liberationsansnarrow }: - -stdenv.mkDerivation rec { - version = "1.07.3"; - name = "liberationsansnarrow-${version}"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true - ''; - - inherit (liberationsansnarrow) meta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9be90a907ef..a24d8c84050 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15536,7 +15536,6 @@ in liberation_ttf = liberation_ttf_v2_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; - liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; liberastika = callPackage ../data/fonts/liberastika { }; From ec8d663d597204402a6deea6600a070870ecf2f7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:36:11 -0500 Subject: [PATCH 48/81] liberationsansnarrow: 1.07.3 -> 1.07.6, rename to liberation-sans-narrow Upstream also moved to github --- .../default.nix | 24 +++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) rename pkgs/data/fonts/{liberationsansnarrow => liberation-sans-narrow}/default.nix (63%) diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix similarity index 63% rename from pkgs/data/fonts/liberationsansnarrow/default.nix rename to pkgs/data/fonts/liberation-sans-narrow/default.nix index 0027d44d9db..97a1ff70f49 100644 --- a/pkgs/data/fonts/liberationsansnarrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, fontforge, pythonPackages, python}: +{ stdenv, fetchFromGitHub, fontforge, pythonPackages, python }: stdenv.mkDerivation rec { - pname = "liberationsansnarrow"; - version = "1.07.3"; - name = "${pname}-${version}"; + pname = "liberation-sans-narrow"; + version = "1.07.6"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp"; + src = fetchFromGitHub { + owner = "liberationfonts"; + repo = pname; + rev = version; + sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm"; }; buildInputs = [ fontforge pythonPackages.fonttools python ]; @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/fonts/truetype cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + mkdir -p "$out/doc/${pname}-${version}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true ''; meta = with stdenv.lib; { @@ -32,8 +33,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ maintainers.leenaars - ]; + homepage = https://github.com/liberationfonts; + maintainers = [ maintainers.leenaars ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d29370c876..b92c02e9fa4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -161,6 +161,7 @@ mapAliases ({ libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 + liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a24d8c84050..4843d2e1a48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15535,7 +15535,7 @@ in liberation_ttf_v2_binary; liberation_ttf = liberation_ttf_v2_binary; - liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; + liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; liberastika = callPackage ../data/fonts/liberastika { }; From b2c6efeaed7a5897de33dae7ab632b9b582f6a2f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:54:38 -0500 Subject: [PATCH 49/81] liberation_ttf: drop binary packages That means the following attributes are gone: - liberation_ttf_v1_binary - liberation_ttf_v2_binary Because of this Libreoffice uses liberation source fonts I've renamed these attributes because the binary form is gone: - liberation_ttf_v1_from_source -> liberation_ttf_v1 - liberation_ttf_v2_from_source -> liberation_ttf_v2 They're aliases for these. --- .../fonts/redhat-liberation-fonts/default.nix | 18 ++---------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 13 ++++++------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 88d438096c1..bd83e16b89c 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -49,21 +49,14 @@ let }; in { - liberation_ttf_v1_from_source = common rec { + liberation_ttf_v1 = common rec { version = "1.07.4"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; nativeBuildInputs = [ fontforge ]; outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; }; - liberation_ttf_v1_binary = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; - nativeBuildInputs = [ ]; - outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab"; - }; - liberation_ttf_v2_from_source = common rec { + liberation_ttf_v2 = common rec { version = "2.00.1"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; @@ -75,11 +68,4 @@ in { ''; outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; }; - liberation_ttf_v2_binary = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; - nativeBuildInputs = [ ]; - outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk"; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b92c02e9fa4..8360bf44706 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -161,6 +161,8 @@ mapAliases ({ libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 + liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 + liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4843d2e1a48..0688b2853f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15529,11 +15529,10 @@ in league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) - liberation_ttf_v1_from_source - liberation_ttf_v1_binary - liberation_ttf_v2_from_source - liberation_ttf_v2_binary; - liberation_ttf = liberation_ttf_v2_binary; + liberation_ttf_v1 + liberation_ttf_v2 + ; + liberation_ttf = liberation_ttf_v2; liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; @@ -17910,8 +17909,8 @@ in fontDirectories = [ carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary + liberation_ttf_v1 + liberation_ttf_v2 ]; }; clucene_core = clucene_core_2; From 0adf200ad593273543c7be9ea9391bea56501ad9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:58:09 -0500 Subject: [PATCH 50/81] liberation_ttf: v1: 1.07.4 -> 1.07.5 v2: 2.00.1 -> 2.00.4 Upstream moved to github. Using fetchFromGitHub. --- .../fonts/redhat-liberation-fonts/default.nix | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index bd83e16b89c..0ee2a0c308c 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, fontforge, python2}: +{ stdenv, fetchFromGitHub, fontforge, python3 }: let - inherit (python2.pkgs) fonttools; + inherit (python3.pkgs) fonttools; common = - {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}: + { version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }: stdenv.mkDerivation rec { - name = "liberation-fonts-${version}"; - src = fetchurl { - inherit url sha256; + pname = "liberation-fonts"; + inherit version; + + src = fetchFromGitHub { + owner = "liberationfonts"; + rev = version; + inherit repo sha256; }; inherit nativeBuildInputs postPatch; @@ -17,8 +21,8 @@ let mkdir -p $out/share/fonts/truetype cp -v $( find . -name '*.ttf') $out/share/fonts/truetype - mkdir -p "$out/share/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true + mkdir -p "$out/share/doc/${pname}-${version}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true ''; outputHashAlgo = "sha256"; @@ -40,7 +44,7 @@ let ''; license = licenses.ofl; - homepage = https://pagure.io/liberation-fonts/; + homepage = https://github.com/liberationfonts; maintainers = [ maintainers.raskin ]; @@ -50,22 +54,22 @@ let in { liberation_ttf_v1 = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; + repo = "liberation-1.7-fonts"; + version = "1.07.5"; nativeBuildInputs = [ fontforge ]; - outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4"; }; liberation_ttf_v2 = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; + repo = "liberation-fonts"; + version = "2.00.4"; nativeBuildInputs = [ fontforge fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' ''; - outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; + sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; + outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn"; }; } From 19d077a157caabb65133e48fbd109e94932ffab3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 2 Dec 2018 11:21:50 -0500 Subject: [PATCH 51/81] pythonPackages.pygmo: 2.8 -> 2.9 refactor fix broken package Introduce a `pagmo2WithPython` which overrides the pagmo2 expression and enables the pygmo build. Then hand it over to `buildPythonPackage` by making it the src to produce a usable package. --- .../python-modules/pygmo/default.nix | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 2500121dc9e..30e4444f552 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , buildPythonPackage -, cmake , eigen , nlopt , ipopt @@ -11,38 +10,44 @@ , cloudpickle , ipyparallel , numba +, python }: -buildPythonPackage rec { - pname = "pygmo"; - version = "2.8"; - - src = fetchFromGitHub { - owner = "esa"; - repo = "pagmo2"; - rev = "v${version}"; - sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z"; - }; - - buildInputs = [ cmake eigen nlopt ipopt boost pagmo2 ]; +let propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ]; - preBuild = '' - cp -v -r $src/* . - cmake -DCMAKE_INSTALL_PREFIX=$out -DPAGMO_BUILD_TESTS=no -DCMAKE_SYSTEM_NAME=Linux -DPagmo_DIR=${pagmo2} -DPAGMO_BUILD_PYGMO=yes -DPAGMO_BUILD_PAGMO=no -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so -DPAGMO_WITH_IPOPT=yes -DIPOPT=${ipopt} + pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DPAGMO_BUILD_PYGMO=yes" + "-DPAGMO_BUILD_PAGMO=no" + "-DPagmo_DIR=${pagmo2}" + ]; + buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs; + postInstall = '' + mv wheel $out + ''; + }); - make install - mv $out/lib/python*/site-packages/pygmo wheel +in buildPythonPackage rec { + pname = "pygmo"; + version = pagmo2WithPython.version; + + inherit propagatedBuildInputs; + + src = pagmo2WithPython; + + preBuild = '' + mv ${python.sitePackages}/pygmo wheel cd wheel ''; # dont do tests doCheck = false; - meta = { + meta = with lib; { description = "Parallel optimisation for Python"; homepage = https://esa.github.io/pagmo2/; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.gpl3Plus; + maintainers = [ maintainers.costrouc ]; }; } From 66a6445f6671bf55807ecdd61e99371b2a34a986 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Nov 2018 15:27:07 -0800 Subject: [PATCH 52/81] python36Packages.ase: 3.16.2 -> 3.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.6-ase/versions --- pkgs/development/python-modules/ase/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 1f7b9419278..3a466170c77 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , numpy , scipy @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "3.16.2"; pname = "ase"; + version = "3.17.0"; - src = fetchurl { - url = "https://gitlab.com/${pname}/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "171j3f4a261cfnqjq98px5fldxql65i3jgf60wc945xvh0mbc8ds"; + src = fetchPypi { + inherit pname version; + sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -27,10 +27,10 @@ buildPythonPackage rec { # tests just hang most likely due to something with subprocesses and cli doCheck = false; - meta = { + meta = with lib; { description = "Atomic Simulation Environment"; homepage = https://wiki.fysik.dtu.dk/ase/; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ costrouc ]; }; } From f486f475e712750b91e9d97bf69c2f77dcfc2e65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 22:45:13 -0800 Subject: [PATCH 53/81] notejot: 1.4.7 -> 1.5.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notejot/versions --- pkgs/applications/misc/notejot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 7ad834f8172..a687e104605 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "1.4.7"; + version = "1.5.2"; name = "${pname}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb"; + sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk"; }; nativeBuildInputs = [ From c2cde10f3086ff389b136636f812193532abfa62 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Dec 2018 08:15:57 -0600 Subject: [PATCH 54/81] vivid: init at 0.4.0 --- pkgs/tools/misc/vivid/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/vivid/default.nix diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix new file mode 100644 index 00000000000..7b1abd80758 --- /dev/null +++ b/pkgs/tools/misc/vivid/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "${pname}-${version}"; + pname = "vivid"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "13x0295v5blvv8dxhimbdjh81l7xl0vm6zni3qjd85psfn61371q"; + }; + + postPatch = '' + substituteInPlace src/main.rs --replace /usr/share $out/share + ''; + + cargoSha256 = "156wapa2ds7ij1jhrpa8mm6dicwq934qxl56sqw3bgz6pfa8fldz"; + + postInstall = '' + mkdir -p $out/share/${pname} + cp -rv config/* themes $out/share/${pname} + ''; + + meta = with stdenv.lib; { + description = "A generator for LS_COLORS with support for multiple color themes"; + homepage = https://github.com/sharkdp/vivid; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dtzWill ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73eaccda0ce..9cd79c98beb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22890,6 +22890,8 @@ in virglrenderer = callPackage ../development/libraries/virglrenderer { }; + vivid = callPackage ../tools/misc/vivid { }; + vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; wavegain = callPackage ../applications/audio/wavegain { }; From a375d4bfc35998aec36ee15b7c71d99a5b78fa2d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 18 Dec 2018 10:50:53 -0500 Subject: [PATCH 55/81] stdenv: shorten evaluation errors when in Hydra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hydra's page showing evaluation errors is about a mile long, showing buckets of user-friendly errors, like this: in job ‘seyren.aarch64-linux’: Package ‘oraclejre-8u191’ in /nix/store/fa9zzkbljkvdavwzirkrr5irg25ymbjl-source/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix:71 has an unfree license (‘unfree’), refusing to evaluate. a) For `nixos-rebuild` you can set { nixpkgs.config.allowUnfree = true; } in configuration.nix to override this. b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allowUnfree = true; } to ~/.config/nixpkgs/config.nix. in job ‘jetbrains.webstorm.x86_64-linux’: Package ‘webstorm-2018.3.1’ in /nix/store/fa9zzkbljkvdavwzirkrr5irg25ymbjl-source/pkgs/applications/editors/jetbrains/default.nix:230 has an unfree license (‘unfree’), refusing to evaluate. a) For `nixos-rebuild` you can set { nixpkgs.config.allowUnfree = true; } in configuration.nix to override this. b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allowUnfree = true; } to ~/.config/nixpkgs/config.nix. This makes it extremely hard to find actual issues in the output. This patch set makes the output much more condensed in Hydra: Failed to evaluate nifticlib-2.0.0: «unsupported»: is not supported on ‘x86_64-apple-darwin’ Failed to evaluate dmd-2.081.2: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate dmdBuild-2.081.2: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldc-1.11.0: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldcBuild-1.11.0: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldc-0.17.5: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldcBuild-0.17.5: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ --- pkgs/stdenv/generic/check-meta.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index d09dff10b27..fe0c8cfad91 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -4,6 +4,10 @@ { lib, config, hostPlatform, meta }: let + # If we're in hydra, we can dispense with the more verbose error + # messages and make problems easier to spot. + inHydra = config.inHydra or false; + # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 # for why this defaults to false, but I (@copumpkin) want to default it to true soon. shouldCheckMeta = config.checkMeta or false; @@ -141,10 +145,12 @@ let handleEvalIssue = attrs: { reason , errormsg ? "" }: let - msg = '' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + msg = if inHydra + then "Failed to evaluate ${attrs.name or "«name-missing»"}: «${reason}»: ${errormsg}" + else '' + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. - '' + (builtins.getAttr reason remediation) attrs; + '' + (builtins.getAttr reason remediation) attrs; handler = if config ? "handleEvalIssue" then config.handleEvalIssue reason From d268e3b2c07b9e99ab02c6d3f3241d5182675a21 Mon Sep 17 00:00:00 2001 From: Member Betty <45791182+memberbetty@users.noreply.github.com> Date: Tue, 18 Dec 2018 12:03:10 +0100 Subject: [PATCH 56/81] aws-google-auth: use python3 (#52445) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0688b2853f9..2d84dc296ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -622,7 +622,7 @@ in aws-env = callPackage ../tools/admin/aws-env { }; - aws-google-auth = pythonPackages.callPackage ../tools/admin/aws-google-auth { }; + aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; aws-okta = callPackage ../tools/security/aws-okta { }; From 050dad2901375c1d6a21d7c8c019ce47fd1a4edf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 16:42:24 -0800 Subject: [PATCH 57/81] polar-bookshelf: 1.1.0 -> 1.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/polar-bookshelf/versions --- pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index f1325a6c6ac..e889a8fd8cb 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.1.0"; + version = "1.1.1"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw"; + sha256 = "0i83vwylszx1ci381izzrmcwbqmknrpny4r3rb0xn3jbz27126zr"; }; buildInputs = [ From d8b5275d43e2517eda50490d1c245e22c5a4e741 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:06:43 -0500 Subject: [PATCH 58/81] vscode-extensions.ms-python.python: 2018.11.0 -> 2018.12.1 --- pkgs/misc/vscode-extensions/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 6860a0d2ad0..65130da9095 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2018.11.0"; - sha256 = "0z9ca14qzy6zw0cfir7hdnhin01c1wsr6lbb2xp6rpq06vh7nivl"; + version = "2018.12.1"; + sha256 = "1cf3yll2hfililcwq6avscgi35caccv8m8fdsvzqdfrggn5h41h4"; }; postPatch = '' From 2e64abd82f8bb85393a2e62f5238f788e8af2744 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 23:21:19 -0800 Subject: [PATCH 59/81] focuswriter: 1.6.16 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 000797c9b70..2708c40d509 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.16"; + version = "1.7.0"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m"; + sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From a32c2f99ee6bca60e8635457cfd832680bc2413b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 05:09:51 -0800 Subject: [PATCH 60/81] libraw: 0.19.0 -> 0.19.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index e009a9f920b..e08cf3fe7a8 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8"; + sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452"; }; outputs = [ "out" "lib" "dev" "doc" ]; From 2cb1949548531334d469aadba6a1c502935da96c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 20:18:19 -0600 Subject: [PATCH 61/81] polar-bookshelf: 1.1.1 -> 1.5.1 --- pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index e889a8fd8cb..bcff0db65ab 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.1.1"; + version = "1.5.1"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "0i83vwylszx1ci381izzrmcwbqmknrpny4r3rb0xn3jbz27126zr"; + sha256 = "1nnbybrzk1ms83490gbw5gakfim0j2c8gp83d9iaqwl4590qgwlg"; }; buildInputs = [ From 33fcf39a6e959b3f985b927b9f6a02b4766af218 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Tue, 18 Dec 2018 19:39:06 +0100 Subject: [PATCH 62/81] Geany: Taking over maintainership --- pkgs/applications/editors/geany/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index d1499fc2180..caead872eb2 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.geany.org/; license = licenses.gpl2; - maintainers = []; + maintainers = with maintainers; [ frlan ]; platforms = platforms.all; }; } From 6da82e7c35fa60d102cd6b0f6a4665531e93efae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 14:04:21 -0800 Subject: [PATCH 63/81] python37Packages.fonttools: 3.32.0 -> 3.33.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fonttools/versions --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 0cab6fc18a5..d435cae9419 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.32.0"; + version = "3.33.0"; src = fetchPypi { inherit pname version; - sha256 = "16cg5v50x905c0dr34wqk70b0n3mqzp41iir2rd73f31d1z9jndq"; + sha256 = "196yl6m3fycrbsclcmg550821j18ga6dpghmk5nb1xi4j4yb62gq"; extension = "zip"; }; From 96203f5fc3ab771d63fa2f01870a10a6783862b4 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:08:16 -0500 Subject: [PATCH 64/81] wakatime: 10.2.1 -> 10.6.0 --- pkgs/tools/misc/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 6d71a407239..710c6c61c64 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.2.1"; + version = "10.6.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx"; + sha256 = "0g4zvy1ll30jg55ddpfqmlncqd0igg6kqy87j4izs1dpapk7a1ln"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt From ceb89f042ebecf50331a68231016483f41d88e5f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:07:42 -0500 Subject: [PATCH 65/81] vscode-extensions.WakaTime.vscode-wakatime: 1.2.4 -> 1.2.5 --- pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 48e7c9268ee..084a1e01375 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -7,8 +7,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.4"; - sha256 = "0qghn4kakv0jrjcl65p1v5r6j7608269zyhh75b15p12mdvi21vb"; + version = "1.2.5"; + sha256 = "011yx3pwqbcz5fmzani57k0axgh458r4ipqwbjlklnrwbrkjhzra"; }; postPatch = '' From 23859991e90acb8cbd111d8204e13030c1a77d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Dec 2018 20:24:58 +0100 Subject: [PATCH 66/81] adoptopenjdk-bin: use python-withPackages for shebang Co-Authored-By: bennofs --- pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index a410501de0a..66e1abd05e9 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" import json import re From 43dd779a8d019a0667e3eed1346f83ffe2004e05 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 14 Dec 2018 13:22:30 +0100 Subject: [PATCH 67/81] radarr: 0.2.0.1120 -> 0.2.0.1217 --- pkgs/servers/radarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 8d920af654d..62cb2d7f348 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.1120"; + version = "0.2.0.1217"; src = fetchurl { - url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0vsjaza0k4djb3vnazl2py4qmbxqfyyr0x9p4flq78yn79hp3439"; + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.v${version}.linux.tar.gz"; + sha256 = "09zzvfqpv58b79a906013pjq42qwbibf16rz24gnqg7wq7az83jy"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/{bin,share/${name}} @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Usenet/BitTorrent movie downloader."; + description = "A Usenet/BitTorrent movie downloader"; homepage = https://radarr.video/; license = licenses.gpl3; maintainers = with maintainers; [ edwtjo ]; From 016d1a991d8d1ef284f0d0a97f82a75a28a5ef6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 07:49:24 -0800 Subject: [PATCH 68/81] jackett: 0.10.471 -> 0.10.504 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index b3328538496..41da87d4065 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.471"; + version = "0.10.504"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0la05akvpvfg9jdgfd39wnc87zi7axzx7499w9m3py7qqqyvgyin"; + sha256 = "1nqci6a9is0kf0vn8wlbfbynllf0pkndcb1z49d1n3wwc8dhji86"; }; buildInputs = [ makeWrapper ]; From f751f85b638611844f4d3e4476e2ccfeef53f713 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 02:41:03 -0800 Subject: [PATCH 69/81] shotcut: 18.10.08 -> 18.11.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shotcut/versions --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 0c9d9757584..877d1a7525f 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.10.08"; + version = "18.11.18"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1s2zic675f7rx61j839fn86bwckb4823j9krv1q7z4hsvbpiyj08"; + sha256 = "0yhrjqc5cby9vc81z5zh5xg34mvh6q8dd896p2izfcqcdhdz7cs3"; }; enableParallelBuilding = true; From 61b435d8665d3e1ee2029e95b9934aed76fe0ef1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 04:36:18 -0800 Subject: [PATCH 70/81] librelp: 1.2.18 -> 1.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librelp/versions --- pkgs/development/libraries/librelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index e5d64c4143f..284b95b8a2b 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.18"; + name = "librelp-1.3.0"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "0grrnxhazd9iirj07al524xykk0k33vs0dgnpajz5vpqig4qyk53"; + sha256 = "1xg99ndn65984mrh30qvys5npc73ag4348whshghrcj9azya494z"; }; nativeBuildInputs = [ pkgconfig ]; From de9c97c0c872d06799075f18e263b5dd101bd839 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 03:25:01 -0800 Subject: [PATCH 71/81] libcouchbase: 2.10.0 -> 2.10.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index c4824bf7a05..00e080d8584 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.10.0"; + version = "2.10.2"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2"; + sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From b513231dc643f65db55bb32a5b25f67925b2fd94 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Fri, 30 Nov 2018 18:33:46 -0500 Subject: [PATCH 72/81] servant: Sphinx is a build-time dependency --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d2b9d566786..9e71044d823 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -736,7 +736,7 @@ self: super: { rev = "v${ver}"; sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; - buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; + nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; installPhase = '' mv _build/html $out From 6c6341335b26ac668a3c63c4f1c0c78ec5365138 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 18 Dec 2018 23:44:23 +0100 Subject: [PATCH 73/81] nixos/test-driver: fix wording in error message about invalid node names Since 113a6b9325b92d483e6c2f12c35c2887ab175a8d the test driver explicitly ensures if the node names won't break the resulting Perl script at runtime. This slightly improves the correctness of the error message. --- nixos/lib/testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 96a42c2f305..57b4412d9bb 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -164,8 +164,8 @@ in rec { if lib.length invalidNodeNames > 0 then throw '' Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are references as perl variables in the testing framework which will break the - script when special characters are allowed. + All machines are referenced as perl variables in the testing framework which will break the + script when special characters are used. Please stick to alphanumeric chars and underscores as separation. '' From 9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 19 Dec 2018 00:24:51 +0100 Subject: [PATCH 74/81] oxidized: 0.21.0 -> 0.25.0, drop obsolete patch (#52492) This removes the patch for support of Dell X-series because oxidized now includes a model for these switches. --- .../ruby-modules/gem-config/default.nix | 7 - pkgs/tools/admin/oxidized/Gemfile | 6 +- pkgs/tools/admin/oxidized/Gemfile.lock | 51 +++--- pkgs/tools/admin/oxidized/gemset.nix | 146 ++++++++++++++---- .../admin/oxidized/temporary-x-series.patch | 22 --- 5 files changed, 150 insertions(+), 82 deletions(-) delete mode 100644 pkgs/tools/admin/oxidized/temporary-x-series.patch diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9a2aaa91ad8..3671605a407 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -270,13 +270,6 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; - oxidized = attrs: { - postInstall = '' - cd "$(cat "$out/nix-support/gem-meta/install-path")" - patch -p1 < ${../../../tools/admin/oxidized/temporary-x-series.patch} - ''; - }; - pango = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile index 6a9a4254b11..dd41b89ad43 100644 --- a/pkgs/tools/admin/oxidized/Gemfile +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'oxidized' -gem 'oxidized-web' -gem 'oxidized-script' +gem 'oxidized', '0.25.0' +gem 'oxidized-web', '0.12.0' +gem 'oxidized-script', '0.6.0' diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index e4bdf5ccf39..d0c808fd2cd 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -2,43 +2,51 @@ GEM remote: https://rubygems.org/ specs: asetus (0.3.0) - backports (3.11.2) + backports (3.11.4) + charlock_holmes (0.7.6) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) - ffi (1.9.23) - haml (4.0.7) + ffi (1.9.25) + haml (5.0.4) + temple (>= 0.8.0) tilt htmlentities (4.3.4) + json (2.1.0) multi_json (1.13.1) net-ssh (4.1.0) - oxidized (0.21.0) + net-telnet (0.1.1) + oxidized (0.25.0) asetus (~> 0.1) net-ssh (~> 4.1.0) + net-telnet (~> 0.1.1) rugged (~> 0.21, >= 0.21.4) slop (~> 3.5) - oxidized-script (0.5.0) - oxidized (~> 0.21.0) + oxidized-script (0.6.0) + oxidized (~> 0.25) slop (~> 3.5) - oxidized-web (0.9.3) + oxidized-web (0.12.0) + charlock_holmes (~> 0.7.5) emk-sinatra-url-for (~> 0.2) - haml (~> 4.0) + haml (~> 5.0) htmlentities (~> 4.3) - oxidized (~> 0.21.0) - puma (~> 3) + json (>= 1.7.0) + oxidized (~> 0.25) + puma (~> 3.11.4) + rack-test (~> 0.7.0) sass (~> 3.3) sinatra (~> 1.4, >= 1.4.6) sinatra-contrib (~> 1.4, >= 1.4.6) - puma (3.11.3) + puma (3.11.4) rack (1.6.11) rack-protection (1.5.5) rack - rack-test (1.0.0) + rack-test (0.7.0) rack (>= 1.0, < 3) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rugged (0.27.0) - sass (3.5.6) + rb-inotify (0.10.0) + ffi (~> 1.0) + rugged (0.27.7) + sass (3.7.2) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -55,15 +63,16 @@ GEM sinatra (~> 1.4.0) tilt (>= 1.3, < 3) slop (3.6.0) - tilt (2.0.8) + temple (0.8.0) + tilt (2.0.9) PLATFORMS ruby DEPENDENCIES - oxidized - oxidized-script - oxidized-web + oxidized (= 0.25.0) + oxidized-script (= 0.6.0) + oxidized-web (= 0.12.0) BUNDLED WITH - 1.16.4 + 1.17.1 diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index 5a8b2ecefdc..e965e40530b 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -1,5 +1,7 @@ { asetus = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790"; @@ -8,15 +10,29 @@ version = "0.3.0"; }; backports = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw58rsz1hl821ia1jj3nnl3jr7xwfkcljgs56kpq3fakzcljcdz"; + sha256 = "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g"; type = "gem"; }; - version = "3.11.2"; + version = "3.11.4"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + type = "gem"; + }; + version = "0.7.6"; }; emk-sinatra-url-for = { dependencies = ["sinatra"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj"; @@ -25,23 +41,29 @@ version = "0.2.1"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; haml = { - dependencies = ["tilt"]; + dependencies = ["temple" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -49,7 +71,19 @@ }; version = "4.3.4"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -58,6 +92,8 @@ version = "1.13.1"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; @@ -65,42 +101,62 @@ }; version = "4.1.0"; }; - oxidized = { - dependencies = ["asetus" "net-ssh" "rugged" "slop"]; + net-telnet = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqx0iawj2cm6083a61y43d6a76xaypiw0nkyirx02lhynq07yz0"; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; type = "gem"; }; - version = "0.21.0"; + version = "0.1.1"; + }; + oxidized = { + dependencies = ["asetus" "net-ssh" "net-telnet" "rugged" "slop"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i8lbzjay60jpk6g86rpk59j4r0kyd1nnm79qdh64qvx6hy02ylq"; + type = "gem"; + }; + version = "0.25.0"; }; oxidized-script = { dependencies = ["oxidized" "slop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c15gksrrar9kradcv6mx2d4a8ixa4lykszb4pcapiw5mi35mxp"; + sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; oxidized-web = { - dependencies = ["emk-sinatra-url-for" "haml" "htmlentities" "oxidized" "puma" "sass" "sinatra" "sinatra-contrib"]; + dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "rack-test" "sass" "sinatra" "sinatra-contrib"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s10pr8qaq6g19zi753igngp02li46k3nm5ap537r3743v1l4f9"; + sha256 = "12ib7380sh9ca7qirw1yhs8di2vv38l09imqaamibdzgmk0rvs1r"; type = "gem"; }; - version = "0.9.3"; + version = "0.12.0"; }; puma = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03313mnx8n6g9qs9l5zafqq90grrhq2nqrmjs8lsffi28mgd3cfd"; + sha256 = "06qiqx1pcfwq4gi9pdrrq8r6hgh3rwl7nl51r67zpm5xmqlp0g10"; type = "gem"; }; - version = "3.11.3"; + version = "3.11.4"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -110,6 +166,8 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; @@ -119,14 +177,18 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l799s5qr2qrshvrggq5ch3v235y491zfww07b39w4pj4vpa65l1"; + sha256 = "0f50ljlbg38g21q242him0n12r0fz7r3rs9n6p8ppahzh7k22x11"; type = "gem"; }; - version = "1.0.0"; + version = "0.7.0"; }; rb-fsevent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; @@ -136,32 +198,40 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; + sha256 = "0znb9n1grdsqf22jqzwin58kyq7x7ml57h6pf48j219f8by21sj6"; type = "gem"; }; - version = "0.27.0"; + version = "0.27.7"; }; sass = { dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + sha256 = "1phs6hnd8b95m7n5wbh5bsclmwaajd1sqlgw9fmj72bfqldbmcqa"; type = "gem"; }; - version = "3.5.6"; + version = "3.7.2"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; @@ -171,6 +241,8 @@ }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -180,6 +252,8 @@ }; sinatra-contrib = { dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; @@ -188,6 +262,8 @@ version = "1.4.7"; }; slop = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; @@ -195,12 +271,24 @@ }; version = "3.6.0"; }; - tilt = { + temple = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; type = "gem"; }; - version = "2.0.8"; + version = "0.8.0"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch deleted file mode 100644 index bf7ee992db1..00000000000 --- a/pkgs/tools/admin/oxidized/temporary-x-series.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb -index f602a36..3bac2d1 100644 ---- a/lib/oxidized/model/powerconnect.rb -+++ b/lib/oxidized/model/powerconnect.rb -@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model - - comment '! ' - -- expect /^\s*--More--\s+.*$/ do |data, re| -+ expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re| - send ' ' - data.sub re, '' - end -@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model - skip_blocks = 0 - cfg.each_line do |line| - # If this is a stackable switch we should skip this block of information -- if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true) -+ if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) - skip_blocks = 1 - # Some switches have another empty line. This is identified by this line having a colon - skip_blocks = 2 if line.match /:/ From f500a83e93864a5b5641be49959932dd598b1a1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 15:49:02 -0800 Subject: [PATCH 75/81] qtbitcointrader: 1.40.23 -> 1.40.30 * qtbitcointrader: 1.40.23 -> 1.40.30 (#52077) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qtbitcointrader/versions * qtbitcointrader: cleanup use fetchzip on GitHub archive tarball --- .../misc/qtbitcointrader/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 4865ed7ee00..444c72602d3 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, qt5 }: +{ stdenv, fetchzip, qt5 }: let - version = "1.40.23"; + version = "1.40.30"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "11r2jzb09a62hf9fkg6aw8pg2js8c87k6lba9xz2q8n6d6jv44r1"; + sha256 = "0xbgdmwb8d3lrddcnx2amfsknd3g408f5gy5mdydcm3vqqfi9a0c"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; @@ -25,11 +25,11 @@ stdenv.mkDerivation { runHook postConfigure ''; - meta = with stdenv.lib; - { description = "Bitcoin trading client"; - homepage = https://centrabit.com/; - license = licenses.lgpl3; - platforms = qt5.qtbase.meta.platforms; - maintainers = [ maintainers.ehmry ]; - }; + meta = with stdenv.lib; { + description = "Bitcoin trading client"; + homepage = https://centrabit.com/; + license = licenses.gpl3; + platforms = qt5.qtbase.meta.platforms; + maintainers = [ maintainers.ehmry ]; + }; } From 0c06faef52a763821c7e586cad87c652656ad6a1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 18 Dec 2018 16:44:12 -0500 Subject: [PATCH 76/81] vscode: 1.30.0 -> 1.30.1 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 35fe273cdac..167a8fe7b70 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0bd2jdn67vnbhrsqy54bymz4di3fw3p18ni5j2wikqkl4d9h4jj1"; - "x86_64-linux" = "1zbnyff0q15xkvkrs14rfgyn6xb9v0xivcnbl8yckl71s45vb2l1"; - "x86_64-darwin" = "1qgzhpfzcwym1qyzx2v14336l106hzhs7ii84g356vxkm219x7kw"; + "i686-linux" = "1xadkgqfwsl53blm2f0kdvczwmag47585dswa1hpafzc8i86009b"; + "x86_64-linux" = "0h77kc6z9c5bkkb8svjxjabnbbv0lb835kzd1c2yypamkhag9j4a"; + "x86_64-darwin" = "1f8grgav5capd2mm1nx0416na8c6qjh91680cfvf1jh4pjihs6g4"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.30.0"; + version = "1.30.1"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; From a0d15a0c684f1e493237f014325fbf9de46c754e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 19 Dec 2018 01:19:08 +0000 Subject: [PATCH 77/81] mirrors.nix: remove bad cpan mirrors --- pkgs/build-support/fetchurl/mirrors.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 2d29728dd95..6ee9ceb5286 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,12 +159,8 @@ rec { # CPAN mirrors. cpan = [ - https://ftp.gwdg.de/pub/languages/perl/CPAN/ - https://download.xs4all.nl/mirror/CPAN/ https://cpan.metacpan.org/ https://cpan.perl.org/ - http://ftp.tuwien.ac.at/pub/CPAN/ - http://ftp.funet.fi/pub/CPAN/ http://backpan.perl.org/ # for old releases ]; From 946e6af857e84c723ad98e3882242c5e9968e0f2 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 1 Dec 2018 18:52:13 +0200 Subject: [PATCH 78/81] wine{Unstable,Staging}: 3.20 -> 4.0-rc2 Disabling the build of regression tests was proposed in #51341 but this change has been postponed until we reach a concensus. --- pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6ca22e261ee..5533c8d54a5 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.20"; - url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "063garmflbna3mhph8k0dv0bkzq8x75x5xrd0j8y0mjh10i13mik"; + version = "4.0-rc2"; + url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; + sha256 = "0apqavsk1y56b6c4zkjpi014xwgn6gjg6pzjx94qy4nfr1gz63n4"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "049cwllf4aybrhj4l2i3vd5jvagjz4d448404zkyy0lfxr08id3p"; + sha256 = "1vqvy44h9rwfx32pad831kdyhazn68s8r14w8765ly42rixc6dgj"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 825c7d7f402bf0cef7d518a12c575e649aed8518 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 07:58:59 -0800 Subject: [PATCH 79/81] brave: 0.56.15 -> 0.57.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brave/versions --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f167980f0bf..409196715d6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -74,11 +74,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.56.15"; + version = "0.57.18"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1d18fgnxcgl95bhkgfqjyv4p81q6fciqibd3ss4vwh1ljjy1fv76"; + sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7"; }; dontConfigure = true; From e3a931c41eca8ccb988ceba2395b973568d991fc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 18 Dec 2018 11:27:21 -0500 Subject: [PATCH 80/81] brave: add at-spi2-core Also correct the style. --- .../networking/browsers/brave/default.nix | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 409196715d6..ec5b34da0a6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,44 +1,46 @@ -{ stdenv, lib, fetchurl, - dpkg, - alsaLib, - at-spi2-atk, - atk, - cairo, - cups, - dbus, - expat, - fontconfig, - freetype, - gdk_pixbuf, - glib, - gnome2, - gnome3, - gtk3, - libuuid, - libX11, - libXcomposite, - libXcursor, - libXdamage, - libXext, - libXfixes, - libXi, - libXrandr, - libXrender, - libXScrnSaver, - libXtst, - nspr, - nss, - pango, - udev, - xorg, - zlib, - xdg_utils, - wrapGAppsHook +{ stdenv, lib, fetchurl +, dpkg +, alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, freetype +, gdk_pixbuf +, glib +, gnome2 +, gnome3 +, gtk3 +, libuuid +, libX11 +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXScrnSaver +, libXtst +, nspr +, nss +, pango +, udev +, xorg +, zlib +, xdg_utils +, wrapGAppsHook }: let rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk + at-spi2-core atk cairo cups @@ -50,8 +52,8 @@ let rpath = lib.makeLibraryPath [ glib gnome2.GConf gtk3 - libuuid libX11 + libXScrnSaver libXcomposite libXcursor libXdamage @@ -60,15 +62,15 @@ let rpath = lib.makeLibraryPath [ libXi libXrandr libXrender - libXScrnSaver libXtst + libuuid nspr nss pango udev + xdg_utils xorg.libxcb zlib - xdg_utils ]; From b9307eddd67e0e3f087dec608ccc84fec72deda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 18 Dec 2018 12:05:33 +0100 Subject: [PATCH 81/81] zeroad: fix build with spidermonkey-38.8.0 --- pkgs/games/0ad/game.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index d05f19d3171..ab9ffd0470b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -33,11 +33,15 @@ stdenv.mkDerivation rec { "-I${SDL2}/include/SDL2" ]; - patches = [ ./rootdir_env.patch ]; - - postPatch = '' - sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h - ''; + patches = [ + ./rootdir_env.patch + # Fixes build with spidermonkey-38.8.0, includes the minor version check: + # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b + (fetchurl { + url = https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch; + sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa"; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need.