From 7b16337335e79e78002d476f239f8599acda803c Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Thu, 18 Feb 2021 19:07:29 +0000 Subject: [PATCH 01/14] fwupd: comment about 1.5.6 release Signed-off-by: Arthur Gautier --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 2b35d609706..bfa7783b6b8 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -91,6 +91,12 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; + # A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654 + # released with 1.5.6. + # Fix for the regression: https://github.com/fwupd/fwupd/pull/2902 + # Maintainer says a new release is to be expected in a few days: + # https://twitter.com/hughsient/status/1362476792297185289 + # In the mean time, please do not release 1.5.6 and go strait to 1.5.7 version = "1.5.5"; # libfwupd goes to lib From 5027d9884bbd690d3a5554149b1abd2dddf787b0 Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Thu, 18 Feb 2021 18:54:46 -0600 Subject: [PATCH 02/14] koreader: 2021.01.1 -> 2021.02 --- pkgs/applications/misc/koreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index a903600b46d..d4156577066 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2021.01.1"; + version = "2021.02"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "0kignyia2xrg84bqzsp8rid4c79zg11lhw52z1854jw9v9324pja"; + sha256 = "0v7jx4a2kz1i1k9jqwcxbgdikflk28cnnp69sbhha8pkkbk8c5wh"; }; sourceRoot = "."; From e51d9973642d5fbd74020314bc80487d02be1a2f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 18 Feb 2021 18:50:26 -0800 Subject: [PATCH 03/14] openafs: Add upstream patches for Linux kernel 5.11 Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/module.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 97e20238a7c..1bb6ee32396 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -19,22 +19,36 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; patches = [ + # LINUX 5.8: Replace kernel_setsockopt with new funcs (fetchpatch { url = "https://github.com/openafs/openafs/commit/d7fc5bf9bf031089d80703c48daf30d5b15a80ca.patch"; sha256 = "0469ydzgvyvrl1b2s1qbl9cd8c5c1nb99c3z52z5i685da5z6pab"; }) + # LINUX 5.8: do not set name field in backing_dev_info (fetchpatch { url = "https://github.com/openafs/openafs/commit/335f37be13d2ff954e4aeea617ee66502170805e.patch"; sha256 = "0jr6cgplnip61cjlcd3fvgsc6n3jhfk93mm9m7ak04w1vc26dk9x"; }) + # LINUX 5.8: use lru_cache_add (fetchpatch { url = "https://github.com/openafs/openafs/commit/facff58b840a47853592510617ba7a1da2e3eaa9.patch"; sha256 = "0izafg6bi5iaigq3jjx0zlg1cxwaddz3238hk0s08fcb6nyhkvx1"; }) + # LINUX 5.9: Remove HAVE_UNLOCKED_IOCTL/COMPAT_IOCTL (fetchpatch { url = "https://github.com/openafs/openafs/commit/e7902252f15acfc28453c531f6fa3b29c9c91b92.patch"; sha256 = "1jy4v8yx8p6mhma6b3h3g94mb38bw7hg7q6lnyc8bijkbnl0d1rl"; }) + # Linux: Refactor test for 32bit compat + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/4ad1057ab8fd206c9fa8d5e3bdde4f1a8417afdb.patch"; + sha256 = "0v2537wkav78yi8lv6fkd1n6rf2g17igf44rpa3kd0kkidxv5lqr"; + }) + # Linux 5.11: Test 32bit compat with in_compat_syscall + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/ee53dd3bc087a05e22fc4111297a51ddb30013f0.patch"; + sha256 = "0dfab3zk0dmf6iksna5n09lf5dn4f8w43q4irl2yf5dgqm35shkr"; + }) ]; hardeningDisable = [ "pic" ]; From 2b28822d8dec38fd62ef17643ec71da3bb488619 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 19 Feb 2021 05:19:19 +0000 Subject: [PATCH 04/14] common-config: fixup compilation for linux 5.11 DRM_AMD_DC_DCN3_0 has been renamed DRM_AMD_DC_DCN in linux 5.11 see: https://github.com/torvalds/linux/commit/20f2ffe504728612d7b0c34e4f8280e34251e704 https://github.com/NixOS/nixpkgs/pull/113194#issuecomment-781766471 Signed-off-by: Arthur Gautier --- pkgs/os-specific/linux/kernel/common-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c71fdc32735..6aff72111a3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -251,7 +251,8 @@ let # (stable) amdgpu support for bonaire and newer chipsets DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; # amdgpu support for RX6000 series - DRM_AMD_DC_DCN3_0 = whenAtLeast "5.9.12" yes; + DRM_AMD_DC_DCN3_0 = whenBetween "5.9.12" "5.11" yes; + DRM_AMD_DC_DCN = whenAtLeast "5.11" yes; # Allow device firmware updates DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { From cb57f807324c8785e8785d0bea27055300dc9fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 19 Feb 2021 06:54:14 +0100 Subject: [PATCH 05/14] maturin: 0.9.3 -> 0.9.4 Changelog: https://github.com/PyO3/maturin/blob/v0.9.4/Changelog.md#094---2021-02-18 --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index a4a8870aa10..02b111567cc 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-3Tir9jvpSgjyF5tEn3xpPcpSATEnn9yaWIKE8hZIdsM="; + hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; }; - cargoHash = "sha256-o0+ZlGnnVUJiTqIdioj+geiP6PWz/AKCXhx+/TgKmqs="; + cargoHash = "sha256-poMMEj+zrlU+v5axJbZai2kv36stEKgaciF4zd9A6Qg="; nativeBuildInputs = [ pkg-config ]; From 9c4839fe86f32c0f389e0804872475f7a7772711 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Tue, 16 Feb 2021 21:10:44 -0500 Subject: [PATCH 06/14] docs: clarify staging Specify that the merges from master to staging-next to staging are performed by GitHub actions. This helps the reader understand the relationship between the branches. --- doc/contributing/submitting-changes.chapter.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 40fc5ea7892..44e981f12a5 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -174,10 +174,13 @@ digraph { "staging-next" -> master [color="#E85EB0"] [label="stabilization ends"] [fontcolor="#E85EB0"] "staging" -> "staging-next" [color="#E85EB0"] [label="stabilization starts"] [fontcolor="#E85EB0"] - master -> "staging-next" -> staging [color="#5F5EE8"] [label="every six hours/any time"] [fontcolor="#5F5EE8"] + master -> "staging-next" -> staging [color="#5F5EE8"] [label="every six hours (GitHub Action)"] [fontcolor="#5F5EE8"] } ``` +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/merge-staging.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours. + + ### Master branch {#submitting-changes-master-branch} The `master` branch is the main development branch. It should only see non-breaking commits that do not cause mass rebuilds. From 2f6523f96bbf62b3d18a6c24556199f986ad4a59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 10:35:04 +0000 Subject: [PATCH 07/14] ocamlPackages.utop: 2.6.0 -> 2.7.0 --- pkgs/development/tools/ocaml/utop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 622ac80306f..53dd4e9827f 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -8,13 +8,13 @@ else buildDunePackage rec { pname = "utop"; - version = "2.6.0"; + version = "2.7.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "17n9igl74xcvj0mzdh2ybda29f2m48a5lj4yf8lrdqr7vg0982jd"; + sha256 = "sha256-4GisU98mfDzA8vabvCBEBPA2LMTmRyofxUfjJqY8P90="; }; nativeBuildInputs = [ makeWrapper ]; From 82b8fe90f620b642b0c4bf676a55152b1654c286 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 20 Jan 2021 11:08:41 -0300 Subject: [PATCH 08/14] libgccjit: use current gcc version --- 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 c8322e5dbdf..610aa013e4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10016,7 +10016,7 @@ in profiledCompiler = false; }); - libgccjit = gcc9.cc.override { + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; langCC = false; From 1e47264608de0d8742a1c39feaa8e4f5637f9b18 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Feb 2021 09:45:09 +0100 Subject: [PATCH 09/14] python.tests: test overriding functions --- .../development/interpreters/python/tests.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index ff27ca8ec20..cfba04da938 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -101,6 +101,24 @@ let }; }; + # Tests to ensure overriding works as expected. + overrideTests = let + extension = self: super: { + foobar = super.numpy; + }; + in { + test-packageOverrides = let + myPython = let + self = python.override { + packageOverrides = extension; + inherit self; + }; + in self; + in assert myPython.pkgs.foobar == myPython.pkgs.numpy; myPython.withPackages(ps: with ps; [ foobar ]); + # overrideScope is broken currently + # test-overrideScope = let + # myPackages = python.pkgs.overrideScope extension; + # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); + }; - -in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests) +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests) From 16228356dd423370aa759b4ee7ea6dae71532560 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 19 Feb 2021 11:13:45 +0100 Subject: [PATCH 10/14] subsurface: 4.9.6 -> 4.9.10 --- pkgs/applications/misc/subsurface/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 98392ae27f2..bca838235dd 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite +, bluez }: let - version = "4.9.6"; + version = "4.9.10"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "1w1ak0fi6ljhg2jc4mjqyrbpax3iawrnsaqq6ls7qdzrhi37rggf"; + sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs"; fetchSubmodules = true; }); @@ -84,6 +85,7 @@ in stdenv.mkDerivation { libdc googlemaps curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit + bluez ]; nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; From 89433aacb7bc312bae31d00959e0fc7301e7cb17 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 19 Feb 2021 11:18:21 +0100 Subject: [PATCH 11/14] subsurface: Add adisbladis as maintainer --- pkgs/applications/misc/subsurface/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index bca838235dd..19fdd4640e4 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -107,7 +107,7 @@ in stdenv.mkDerivation { ''; homepage = "https://subsurface-divelog.org"; license = licenses.gpl2; - maintainers = with maintainers; [ mguentner ]; + maintainers = with maintainers; [ mguentner adisbladis ]; platforms = platforms.all; }; } From 2ff98c2f17b21ce71ae2faf59661b61f81cbce9d Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 17 Feb 2021 10:26:08 -0300 Subject: [PATCH 12/14] emacs: precompile all trampolines --- pkgs/applications/editors/emacs/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 9377d3ba89c..619bde59874 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -159,6 +159,10 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { '' + lib.optionalString (nativeComp && withNS) '' ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp '' + lib.optionalString nativeComp '' + $out/bin/emacs --batch \ + -l comp --eval "(mapatoms (lambda (s) \ + (when (subr-primitive-p (symbol-function s)) \ + (comp-trampoline-compile s))))" mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ From 16fed7f1ebaee6dac55eea0628a9eb8bd471201b Mon Sep 17 00:00:00 2001 From: Aaron Zeng Date: Fri, 19 Feb 2021 05:56:45 -0500 Subject: [PATCH 13/14] parallel: 20200922 -> 20210122 (#111499) --- pkgs/tools/misc/parallel/default.nix | 17 +++++------------ .../parallel/fix-max-line-length-allowed.diff | 17 ----------------- 2 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index aec80f0ede0..d5aef2f5ffe 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,21 +1,14 @@ { fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { - name = "parallel-20200922"; + pname = "parallel"; + version = "20210122"; src = fetchurl { - url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0wj19kwjk0hwm8bk9yfcf3rpr0314lmjy5xxlvvdqnbbc4ml2418"; + url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; + sha256 = "1wxkqz6ld1bp0ilvc04vhq99qjay1nl6pbk3qzvp3sjavv9vdwdl"; }; - patches = [ - ./fix-max-line-length-allowed.diff - ]; - - postPatch = '' - substituteInPlace src/parallel --subst-var-by coreutils ${coreutils} - ''; - outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${lib.makeBinPath [ procps perl ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff b/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff deleted file mode 100644 index c6d501ecb22..00000000000 --- a/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff +++ /dev/null @@ -1,17 +0,0 @@ -Correct path to coreutils echo to fix parallel --max-line-length-allowed. - -Author: Bjørn Forsman - -diff --git a/src/parallel b/src/parallel -index a047fd94..9fc5f671 100755 ---- a/src/parallel -+++ b/src/parallel -@@ -11580,7 +11580,7 @@ sub is_acceptable_command_line_length($$) { - $len += length $Global::parallel_env; - } - # Force using non-built-in command -- ::qqx("/bin/echo ".${string}x(($len-length "/bin/echo ")/length $string)); -+ ::qqx("@coreutils@/bin/echo ".${string}x(($len-length "@coreutils@/bin/echo ")/length $string)); - ::debug("init", "$len=$? "); - return not $?; - } From 349b8cfd36a18088c69b8256d78939a4a7ff3a7d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 19 Feb 2021 11:52:28 +0100 Subject: [PATCH 14/14] nix-direnv: Fix nix executable paths Match the upstream change in: https://github.com/nix-community/nix-direnv/commit/991ea66bb86f5f188f4d5292aa2283458436b5b1 --- pkgs/tools/misc/nix-direnv/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 6aaf8cc8a52..833f8313f61 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { # getting sourced, not executed: postPatch = '' substituteInPlace direnvrc \ - --replace "grep" "${gnugrep}/bin/grep" \ - --replace "nix-shell" "${nix}/bin/nix-shell" \ - --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + --replace "\''${NIX_BIN_PREFIX:-}" "\''${NIX_BIN_PREFIX:-${nix}/bin/}" \ + --replace "grep" "${gnugrep}/bin/grep" ''; installPhase = ''