From 1b9fbe0e12ba3e5e6c6d031a2edcdf1568756333 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 14 Mar 2019 16:22:27 -0500 Subject: [PATCH 01/11] libseccomp: 2.3.3 -> 2.4.0 https://github.com/seccomp/libseccomp/releases/tag/v2.4.0 (cherry picked from commit 862ea070aa9091c96c5755aeef59680ea8c231f4) PR #57669 --- pkgs/development/libraries/libseccomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 1f188f98f038..0571cc5b3ac5 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz"; + sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; }; outputs = [ "out" "lib" "dev" "man" ]; From 1db195108806df379493b07e063780e8210bd5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 21 Mar 2019 06:23:40 +0000 Subject: [PATCH 02/11] glibcLocales: also build C.UTF-8 Previously we only build C.UTF-8 as part of the locale-archive that comes with the glibc core package. However for consistent use of LANG=C.UTF-8 we also want support in our glibcLocales as well. fixes https://github.com/NixOS/nixpkgs/issues/57974 (cherry picked from commit 467f0f9f3ace58ef8ee01c75aaeadf6927012190) --- pkgs/development/libraries/glibc/locales.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 2b20c17d4500..0dc191974155 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -26,6 +26,8 @@ callPackage ./common.nix { inherit stdenv; } { '' mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" + echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED + # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile '' From 37c8939b00e64c4ca382f85a2f1529debdc250e6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 15 Mar 2019 11:57:32 +0100 Subject: [PATCH 03/11] japser: 2.0.14 -> 2.0.16 (cherry picked from commit 96e93d6fa0d5c2a1fdb269e705c5f1791c3ebb3d) --- pkgs/development/libraries/jasper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index eb9282274328..946bc17e7643 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jasper-${version}"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { repo = "jasper"; owner = "mdadams"; rev = "version-${version}"; - sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; + sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"; }; patches = [ From a9c581ab02b89df15cfb76eb9a702b9aedcefa73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Mar 2019 09:36:24 +0100 Subject: [PATCH 04/11] python.pkgs.hypothesis: 3.88.3 -> 4.7.3 (#58169) It looks like in 89f91cf06b64e278d8b019bf4238baabfcbbe13a the hash from 4.7.3 was used and the wrong version specified. (cherry picked from commit f1c7bb9d29bf25e67e472576101da534d973f961) --- pkgs/development/python-modules/hypothesis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 3575ee039633..d1fadad00d0f 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.88.3"; + version = "4.7.3"; pname = "hypothesis"; # Use github tarballs that includes tests From 3e0d25ec9154392f55602045b44719fa71c146d8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Mar 2019 16:24:04 +0100 Subject: [PATCH 05/11] python3: 3.7.2 -> 3.7.3 (cherry picked from commit 0ddae82e6a6388466a825000139f9fb986b50418) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5e5877032fe0..93c63ca7be71 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -89,10 +89,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "2"; + patch = "3"; suffix = ""; }; - sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + sha256 = "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s"; inherit (darwin) CF configd; inherit passthruFun; }; From 2b1ee54b873e3e5777ed92cdefbffa86f044ffe2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 13:15:24 -0400 Subject: [PATCH 06/11] modemmanager: 1.7.990 -> 1.10.0 * Add flags for systemd [0] * Enable tests Though I actually didn't look to see how they're performed, only effort done was to get a success- ful build. * Enable vala bindings [0]: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.8.0/NEWS#L21 (cherry picked from commit cb962e829cc91b3ad04c837cd4a4e71b4713475e) --- .../networking/modem-manager/default.nix | 42 +++++++------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 15ec2ef41cd7..cb63b2be1525 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,52 +1,40 @@ { stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd, fetchpatch }: +, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { - name = "modem-manager-${version}"; - version = "1.7.990"; + pname = "modem-manager"; + version = "1.10.0"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; + sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; - patches = [ - # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) - (fetchpatch { - url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; - sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; - }) - ]; - configureFlags = [ "--with-polkit" - "--with-udev-base-dir=$(out)/lib/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" - "--with-suspend-resume=systemd" + "--with-systemd-suspend-resume" + "--with-systemd-journal" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - preInstall = '' - mkdir -p $out/etc/systemd/system + preCheck = '' + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; + doCheck = true; + postInstall = '' # rename to modem-manager to be in style - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service - rm -rf $out/$out/etc - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done + mv $out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. From 4cec8a5fcb9b2802c3cad03101b221778994c091 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 07:28:12 -0400 Subject: [PATCH 07/11] libqmi: 1.20.2 -> 1.22.2 Drop --enable-mbim-qmux because we have libmbim >= 1.14.0 [0] [0]: https://gitlab.freedesktop.org/mobile-broadband/libqmi/blob/1.16.0/NEWS#L5 (cherry picked from commit fd5c74c25c7cf7f1ac0a898c95940db3e29c7f2e) --- pkgs/development/libraries/libqmi/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 99383fe6450c..083b5c8bc851 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: +{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.2"; + pname = "libqmi"; + version = "1.22.2"; src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"; }; outputs = [ "out" "dev" "devdoc" ]; - preBuild = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib python libgudev libmbim ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; - configureFlags = ["--enable-mbim-qmux" ]; + buildInputs = [ + glib + libgudev + libmbim + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/libqmi/; + homepage = https://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; From 65028ce1c91613dab293b1a9cf7a02bc97b3956c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 07:20:27 -0400 Subject: [PATCH 08/11] libmbim: 1.16.2 -> 1.18.0 (cherry picked from commit 005c3cffc15c1f15bb72d9bef25002f8027ca1c8) --- .../development/libraries/libmbim/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 17632c678c46..021cfbb1bb48 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,24 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: +{ stdenv, fetchurl, pkgconfig, glib, python3, systemd, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.2"; + pname = "libmbim"; + version = "1.18.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; + url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; + sha256 = "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"; }; outputs = [ "out" "dev" "man" ]; - preConfigure = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib udev libgudev python ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; + + buildInputs = [ + glib + libgudev + systemd + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/software/libmbim/; + homepage = https://www.freedesktop.org/wiki/Software/libmbim/; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; From 0000a86d7cd47005096a292a797d2e02ce29e8d8 Mon Sep 17 00:00:00 2001 From: Tom F Date: Wed, 27 Mar 2019 13:03:18 +1000 Subject: [PATCH 09/11] adoptopenjdk: Remove libfreetype.so from adoptopenjdk's derivation. (#58412) This caused some reverse dependencies of adoptopenjdk to depend on adoptopenjdk's libfreetype, rather than the NixOS libfreetype. For example: https://github.com/NixOS/nixpkgs/issues/57733 Now the derivation does not contain libfreetype.so . The JRE links to nixpkg's freetype: $ ldd /nix/store/9iyxm1nkn35xhjgri041r980z4p5ls5g-adoptopenjdk-hotspot-bin-11.0.2/lib/libfontmanager.so | grep -i freetype libfreetype.so => /nix/store/ycbkq39cngzx19j829qzgdnw3mx3z78g-freetype-2.9.1/lib/libfreetype.so (0x0000795e30702000) (cherry picked from commit 6bae07337e038a1b2b874de1ea3f7a121b9d89b8) --- .../development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 6e3fe6c4ebf1..8e8b157aa229 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -72,6 +72,10 @@ let result = stdenv.mkDerivation rec { # Remove some broken manpages. rm -rf $out/man/ja* + # Remove embedded freetype to avoid problems like + # https://github.com/NixOS/nixpkgs/issues/57733 + rm $out/lib/libfreetype.so + # for backward compatibility ln -s $out $out/jre From ff18b89a9158d311f9538c31e00bb1d466d065af Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 26 Mar 2019 10:57:27 +0100 Subject: [PATCH 10/11] tzdata: 2018g -> 2019a (cherry picked from commit 32538ff51f15c2a416949a6f75ef41a505d530f8) --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 59079b28efc2..0d19d8c9dcab 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2018g"; + version = "2019a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"; + sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"; + sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"; }) ]; From f10bc3c630b59ce2d53255b0c62e187d837a3723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 Mar 2019 18:02:56 +0200 Subject: [PATCH 11/11] notary: disable tests (for now) I don't really know anything about the package; I just noticed the regression on hydra.nixos.org. (cherry picked from commit ba18b47c2a89f3bf5a5b34a4c514b0bf2f598a39) --- pkgs/tools/security/notary/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 071bfdaea005..221817b004df 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { runHook postInstall ''; - doCheck = true; + #doCheck = true; # broken by tzdata: 2018g -> 2019a checkPhase = '' make test PKGS=github.com/theupdateframework/notary/cmd/notary '';