commit 15d7e7d5456e7fb55c56ec2ad31947567c5044cf · pyrox.dev/nixpkgs

+8 -8

nixos/doc/manual/installation/upgrading.xml

···

       14
       14
        
           <para>

     

       15
       15
        
            <emphasis>Stable channels</emphasis>, such as

     

       16
       16
        
            <literal

     

       17
       17
       -
           xlink:href="https://nixos.org/channels/nixos-20.09">nixos-20.09</literal>.

     

       17
       17
       +
           xlink:href="https://nixos.org/channels/nixos-21.05">nixos-21.05</literal>.

     

       18
       18
        
            These only get conservative bug fixes and package upgrades. For instance,

     

       19
       19
        
            a channel update may cause the Linux kernel on your system to be upgraded

     

       20
       20
        
            from 4.19.34 to 4.19.38 (a minor bug fix), but not from

     
···

       38
       38
        
           <para>

     

       39
       39
        
            <emphasis>Small channels</emphasis>, such as

     

       40
       40
        
            <literal

     

       41
       41
       -
           xlink:href="https://nixos.org/channels/nixos-20.09-small">nixos-20.09-small</literal>

     

       41
       41
       +
           xlink:href="https://nixos.org/channels/nixos-21.05-small">nixos-21.05-small</literal>

     

       42
       42
        
            or

     

       43
       43
        
            <literal

     

       44
       44
        
           xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.

     
···

       63
       63
        
        <para>

     

       64
       64
        
         When you first install NixOS, you’re automatically subscribed to the NixOS

     

       65
       65
        
         channel that corresponds to your installation source. For instance, if you

     

       66
       66
       -
         installed from a 20.09 ISO, you will be subscribed to the

     

       67
       67
       -
         <literal>nixos-20.09</literal> channel. To see which NixOS channel you’re

     

       66
       66
       +
         installed from a 21.05 ISO, you will be subscribed to the

     

       67
       67
       +
         <literal>nixos-21.05</literal> channel. To see which NixOS channel you’re

     

       68
       68
        
         subscribed to, run the following as root:

     

       69
       69
        
       <screen>

     

       70
       70
        
       <prompt># </prompt>nix-channel --list | grep nixos

     
···

       75
       75
        
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos

     

       76
       76
        
       </screen>

     

       77
       77
        
         (Be sure to include the <literal>nixos</literal> parameter at the end.) For

     

       78
       78
       -
         instance, to use the NixOS 20.09 stable channel:

     

       78
       78
       +
         instance, to use the NixOS 21.05 stable channel:

     

       79
       79
        
       <screen>

     

       80
       80
       -
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09 nixos

     

       80
       80
       +
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-21.05 nixos

     

       81
       81
        
       </screen>

     

       82
       82
        
         If you have a server, you may want to use the “small” channel instead:

     

       83
       83
        
       <screen>

     

       84
       84
       -
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos

     

       84
       84
       +
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos

     

       85
       85
        
       </screen>

     

       86
       86
        
         And if you want to live on the bleeding edge:

     

       87
       87
        
       <screen>

     
···

       132
       132
        
          kernel, initrd or kernel modules.

     

       133
       133
        
          You can also specify a channel explicitly, e.g.

     

       134
       134
        
       <programlisting>

     

       135
       135
       -
       <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-20.09;

     

       135
       135
       +
       <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-21.05;

     

       136
       136
        
       </programlisting>

     

       137
       137
        
         </para>

     

       138
       138
        
        </section>

+1 -1

nixos/doc/manual/release-notes/rl-2105.xml

···

       3
       3
        
                xmlns:xi="http://www.w3.org/2001/XInclude"

     

       4
       4
        
                version="5.0"

     

       5
       5
        
                xml:id="sec-release-21.05">

     

       6
       6
       -
        <title>Release 21.05 (“Okapi”, 2021.05/??)</title>

     

       6
       6
       +
        <title>Release 21.05 (“Okapi”, 2021.05/31)</title>

     

       7
       7
        
       

     

       8
       8
        
        <para>

     

       9
       9
        
         Support is planned until the end of December 2021, handing over to 21.11.

+3 -5

nixos/lib/make-ext4-fs.nix

···

       74
       74
        
               return 1

     

       75
       75
        
             fi

     

       76
       76
        
       

     

       77
       77
       -
             echo "Resizing to minimum allowed size"

     

       78
       78
       -
             resize2fs -M $img

     

       79
       79
       -
       

     

       80
       80
       -
             # And a final fsck, because of the previous truncating.

     

       81
       81
       -
             fsck.ext4 -n -f $img

     

       77
       77
       +
             # We may want to shrink the file system and resize the image to

     

       78
       78
       +
             # get rid of the unnecessary slack here--but see

     

       79
       79
       +
             # https://github.com/NixOS/nixpkgs/issues/125121 for caveats.

     

       82
       80
        
       

     

       83
       81
        
             if [ ${builtins.toString compressImage} ]; then

     

       84
       82
        
               echo "Compressing image"

+1 -2

nixos/modules/services/continuous-integration/buildkite-agents.nix

···

       238
       238
        
               in

     

       239
       239
        
                 optionalString (cfg.privateSshKeyPath != null) ''

     

       240
       240
        
                   mkdir -m 0700 -p "${sshDir}"

     

       241
       241
       -
                   cp -f "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa"

     

       242
       242
       -
                   chmod 600 "${sshDir}"/id_rsa

     

       241
       241
       +
                   install -m600 "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa"

     

       243
       242
        
                 '' + ''

     

       244
       243
        
                   cat > "${cfg.dataDir}/buildkite-agent.cfg" <<EOF

     

       245
       244
        
                   token="$(cat ${toString cfg.tokenPath})"

+2 -2

pkgs/applications/graphics/ImageMagick/6.x.nix

···

       11
       11
        
           else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"

     

       12
       12
        
           else if stdenv.hostPlatform.system == "aarch64-linux"  || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64"

     

       13
       13
        
           else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"

     

       14
       14
       -
           else throw "ImageMagick is not supported on this platform.";

     

       14
       14
       +
           else null;

     

       15
       15
        
       in

     

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     
···

       32
       32
        
       

     

       33
       33
        
         configureFlags =

     

       34
       34
        
           [ "--with-frozenpaths" ]

     

       35
       35
       -
           ++ [ "--with-gcc-arch=${arch}" ]

     

       35
       35
       +
           ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ])

     

       36
       36
        
           ++ lib.optional (librsvg != null) "--with-rsvg"

     

       37
       37
        
           ++ lib.optionals (ghostscript != null)

     

       38
       38
        
             [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"

+2 -2

pkgs/applications/graphics/ImageMagick/7.0.nix

···

       13
       13
        
           else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"

     

       14
       14
        
           else if stdenv.hostPlatform.system == "aarch64-linux"  || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64"

     

       15
       15
        
           else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"

     

       16
       16
       -
           else throw "ImageMagick is not supported on this platform.";

     

       16
       16
       +
           else null;

     

       17
       17
        
       in

     

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     
···

       34
       34
        
       

     

       35
       35
        
         configureFlags =

     

       36
       36
        
           [ "--with-frozenpaths" ]

     

       37
       37
       -
           ++ [ "--with-gcc-arch=${arch}" ]

     

       37
       37
       +
           ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ])

     

       38
       38
        
           ++ lib.optional (librsvg != null) "--with-rsvg"

     

       39
       39
        
           ++ lib.optionals (ghostscript != null)

     

       40
       40
        
             [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"

+1 -1

pkgs/development/compilers/llvm/11/llvm/default.nix

···

       177
       177
        
           cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native

     

       178
       178
        
         '';

     

       179
       179
        
       

     

       180
       180
       -
         doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl);

     

       180
       180
       +
         doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) && (!stdenv.hostPlatform.isRiscV);

     

       181
       181
        
       

     

       182
       182
        
         checkTarget = "check-all";

     

       183
       183

+1 -1

pkgs/development/compilers/llvm/9/llvm/default.nix

···

       177
       177
        
           cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native

     

       178
       178
        
         '';

     

       179
       179
        
       

     

       180
       180
       -
         doCheck = stdenv.isLinux && (!stdenv.isx86_32);

     

       180
       180
       +
         doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isRiscV);

     

       181
       181
        
       

     

       182
       182
        
         checkTarget = "check-all";

     

       183
       183

+1

pkgs/development/compilers/rust/1_52.nix

···

       48
       48
        
           x86_64-apple-darwin = "765212098a415996b767d1e372ce266caf94027402b269fec33291fffc085ca4";

     

       49
       49
        
           aarch64-apple-darwin = "95d0410bbd20b05f8b7d5adf70e8737873995bc86611a90e643d7081ca35147f";

     

       50
       50
        
           powerpc64le-unknown-linux-gnu = "7362f561104d7be4836507d3a53cd39444efcdf065813d559beb1f54ce9f7680";

     

       51
       51
       +
           riscv64gc-unknown-linux-gnu = "9d0c2c4ab2397e78758de8b6b57051482bcf20b6748e0e16d9d5bd23ce73d72a";

     

       51
       52
        
         };

     

       52
       53
        
       

     

       53
       54
        
         selectRustPackage = pkgs: pkgs.rust_1_52;

+1

pkgs/development/compilers/rust/default.nix

···

       36
       36
        
             "armv7l" = "armv7";

     

       37
       37
        
             "armv6l" = "arm";

     

       38
       38
        
             "armv5tel" = "armv5te";

     

       39
       39
       +
             "riscv64" = "riscv64gc";

     

       39
       40
        
           }.${cpu.name} or cpu.name;

     

       40
       41
        
         in platform.rustc.config

     

       41
       42
        
           or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";

+1

pkgs/development/compilers/rust/print-hashes.sh

···

       18
       18
        
         x86_64-apple-darwin

     

       19
       19
        
         aarch64-apple-darwin

     

       20
       20
        
         powerpc64le-unknown-linux-gnu

     

       21
       21
       +
         riscv64gc-unknown-linux-gnu

     

       21
       22
        
       )

     

       22
       23
        
       BASEURL=https://static.rust-lang.org/dist

     

       23
       24
        
       VERSION=${1:-}

+2 -16

pkgs/development/tools/analysis/radare2/default.nix

···

       20
       20
        
       , ruby

     

       21
       21
        
       , lua

     

       22
       22
        
       , capstone

     

       23
       23
       -
       , fetchpatch

     

       24
       23
        
       , useX11 ? false

     

       25
       24
        
       , rubyBindings ? false

     

       26
       25
        
       , pythonBindings ? false

     
···

       29
       28
        
       

     

       30
       29
        
       stdenv.mkDerivation rec {

     

       31
       30
        
         pname = "radare2";

     

       32
       32
       -
         version = "5.2.1";

     

       31
       31
       +
         version = "5.3.0";

     

       33
       32
        
       

     

       34
       33
        
         src = fetchFromGitHub {

     

       35
       34
        
           owner = "radare";

     

       36
       35
        
           repo = "radare2";

     

       37
       36
        
           rev = version;

     

       38
       38
       -
           sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc";

     

       37
       37
       +
           sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng=";

     

       39
       38
        
         };

     

       40
       40
       -
       

     

       41
       41
       -
         patches = [

     

       42
       42
       -
           # fix for CVE-2021-32613

     

       43
       43
       -
           (fetchpatch {

     

       44
       44
       -
             url = "https://github.com/radareorg/radare2/commit/5e16e2d1c9fe245e4c17005d779fde91ec0b9c05.patch";

     

       45
       45
       -
             sha256 = "sha256-zCFNn968buLuSqfUT5E+72qz0l1tA3fEUQIxJl2nd3I=";

     

       46
       46
       -
           })

     

       47
       47
       -
           (fetchpatch {

     

       48
       48
       -
             name = "CVE-2021-32613.patch";

     

       49
       49
       -
             url = "https://github.com/radareorg/radare2/commit/049de62730f4954ef9a642f2eeebbca30a8eccdc.patch";

     

       50
       50
       -
             sha256 = "sha256-s8SWGuSQ6fxDCybtjO2ZW8w7H6mr+AuzVLL6dw+XKDw=";

     

       51
       51
       -
           })

     

       52
       52
       -
         ];

     

       53
       39
        
       

     

       54
       40
        
         postInstall = ''

     

       55
       41
        
           install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm

+38 -4

pkgs/development/tools/build-managers/bmake/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl

     

       2
       2
       -
       , getopt

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch

     

       2
       2
       +
       , getopt, tzdata

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "bmake";

     

       7
       7
       -
         version = "20200902";

     

       7
       7
       +
         version = "20210420";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url    = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "1v1v81llsiy8qbpy38nml1x08dhrihwh040pqgwbwb9zy1108b08";

     

       11
       11
       +
           sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         # Make tests work with musl

     

       15
       15
       +
         # * Disable deptgt-delete_on_error test (alpine does this too)

     

       16
       16
       +
         # * Fix test failing due to different strerror(3) output for musl and glibc

     

       17
       17
       +
         postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''

     

       18
       18
       +
           sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d'

     

       19
       19
       +
           substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename"

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       14
       22
        
         nativeBuildInputs = [ getopt ];

     

       15
       23
        
       

     

       16
       24
        
         patches = [

     

       25
       25
       +
           # make bootstrap script aware of the prefix in /nix/store

     

       17
       26
        
           ./bootstrap-fix.patch

     

       27
       27
       +
           # preserve PATH from build env in unit tests

     

       18
       28
        
           ./fix-unexport-env-test.patch

     

       29
       29
       +
           # Fix localtime tests without global /etc/zoneinfo directory

     

       30
       30
       +
           ./fix-localtime-test.patch

     

       31
       31
       +
           # decouple tests from build phase

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             name = "separate-tests.patch";

     

       34
       34
       +
             url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch";

     

       35
       35
       +
             sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a";

     

       36
       36
       +
           })

     

       37
       37
       +
           # add a shebang to bmake's install(1) replacement

     

       38
       38
       +
           (fetchpatch {

     

       39
       39
       +
             name = "install-sh.patch";

     

       40
       40
       +
             url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch";

     

       41
       41
       +
             sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6";

     

       42
       42
       +
           })

     

       19
       43
        
         ];

     

       20
       44
        
       

     

       21
       45
        
         # The generated makefile is a small wrapper for calling ./boot-strap

     
···

       41
       65
        
           ./boot-strap --prefix=$out -o . op=install

     

       42
       66
        
       

     

       43
       67
        
           runHook postInstall

     

       68
       68
       +
         '';

     

       69
       69
       +
       

     

       70
       70
       +
         doCheck = true;

     

       71
       71
       +
         checkInputs = [ tzdata ];

     

       72
       72
       +
         checkPhase = ''

     

       73
       73
       +
           runHook preCheck

     

       74
       74
       +
       

     

       75
       75
       +
           ./boot-strap -o . op=test

     

       76
       76
       +
       

     

       77
       77
       +
           runHook postCheck

     

       44
       78
        
         '';

     

       45
       79
        
       

     

       46
       80
        
         setupHook = ./setup-hook.sh;

+23

pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch

···

       1
       1
       +
       --- bmake/unit-tests/Makefile.orig	2021-05-30 14:24:38.822484317 +0200

     

       2
       2
       +
       +++ bmake/unit-tests/Makefile	2021-05-31 13:25:21.645751428 +0200

     

       3
       3
       +
       @@ -455,7 +455,8 @@

     

       4
       4
       +
        ENV.varmisc=		FROM_ENV=env

     

       5
       5
       +
        ENV.varmisc+=		FROM_ENV_BEFORE=env

     

       6
       6
       +
        ENV.varmisc+=		FROM_ENV_AFTER=env

     

       7
       7
       +
       -ENV.varmod-localtime+=	TZ=Europe/Berlin

     

       8
       8
       +
       +# Set absolute path to tz file since musl doesn't support TZDIR

     

       9
       9
       +
       +ENV.varmod-localtime+=	TZDIR=${TZDIR} TZ=:${TZDIR}/Europe/Berlin

     

       10
       10
       +
        ENV.varname-vpath+=	VPATH=varname-vpath.dir:varname-vpath.dir2

     

       11
       11
       +
        

     

       12
       12
       +
        # Override make flags for some of the tests; default is -k.

     

       13
       13
       +
       --- bmake/unit-tests/varmod-localtime.mk.orig	2021-05-30 14:30:34.397986246 +0200

     

       14
       14
       +
       +++ bmake/unit-tests/varmod-localtime.mk	2021-05-31 13:24:41.430906606 +0200

     

       15
       15
       +
       @@ -3,7 +3,7 @@

     

       16
       16
       +
        # Tests for the :localtime variable modifier, which formats a timestamp

     

       17
       17
       +
        # using strftime(3) in local time.

     

       18
       18
       +
        

     

       19
       19
       +
       -.if ${TZ} != "Europe/Berlin"	# see unit-tests/Makefile

     

       20
       20
       +
       +.if ${TZ} != ":${TZDIR}/Europe/Berlin"	# see unit-tests/Makefile

     

       21
       21
       +
        .  error

     

       22
       22
       +
        .endif

     

       23
       23
       +

+7 -7

pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch

···

       1
       1
       -
       --- bmake/unit-tests/unexport-env.mk.orig       2019-02-19 10:24:14.356713136 -0800

     

       2
       2
       -
       +++ bmake/unit-tests/unexport-env.mk    2019-02-19 10:25:43.838775388 -0800

     

       3
       3
       -
       @@ -3,8 +3,8 @@

     

       4
       4
       -
        # pick up a bunch of exported vars

     

       1
       1
       +
       --- bmake/unit-tests/unexport-env.mk.orig	2021-05-27 14:44:45.263392298 +0200

     

       2
       2
       +
       +++ bmake/unit-tests/unexport-env.mk	2021-05-27 14:46:46.188881996 +0200

     

       3
       3
       +
       @@ -4,8 +4,8 @@

     

       4
       4
       +
        FILTER_CMD=	grep ^UT_

     

       5
       5
        
        .include "export.mk"

     

       6
       6
        
        

     

       7
       7
        
       -# an example of setting up a minimal environment.

     

       8
       8
       -
       -PATH = /bin:/usr/bin:/sbin:/usr/sbin

     

       8
       8
       +
       -PATH=	/bin:/usr/bin:/sbin:/usr/sbin

     

       9
       9
        
       +# preserve PATH so commands used in the "all" target are still available

     

       10
       10
       -
       +PATH := ${PATH}

     

       10
       10
       +
       +PATH :=	${PATH}

     

       11
       11
        
        

     

       12
       12
        
        # now clobber the environment to just PATH and UT_TEST

     

       13
       13
       -
        UT_TEST = unexport-env

     

       13
       13
       +
        UT_TEST=	unexport-env

+11 -1

pkgs/development/tools/delve/default.nix

···

       1
       1
       -
       { lib, buildGoPackage, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildGoPackage, fetchFromGitHub, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "delve";

     
···

       13
       13
        
           rev = "v${version}";

     

       14
       14
        
           sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw=";

     

       15
       15
        
         };

     

       16
       16
       +
       

     

       17
       17
       +
         subPackages = [ "cmd/dlv" ];

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
       

     

       21
       21
       +
         postInstall = ''

     

       22
       22
       +
           # fortify source breaks build since delve compiles with -O0

     

       23
       23
       +
           wrapProgram $out/bin/dlv \

     

       24
       24
       +
             --prefix disableHardening " " fortify

     

       25
       25
       +
         '';

     

       16
       26
        
       

     

       17
       27
        
         meta = with lib; {

     

       18
       28
        
           description = "debugger for the Go programming language";

+2 -2

pkgs/shells/zsh/zsh-completions/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "zsh-completions";

     

       5
       5
       -
         version = "0.32.0";

     

       5
       5
       +
         version = "0.33.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "zsh-users";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "12l9wrx0aysyj62kgp5limglz0nq73w8c415wcshxnxmhyk6sw6d";

     

       11
       11
       +
           sha256 = "0vs14n29wvkai84fvz3dz2kqznwsq2i5fzbwpv8nsfk1126ql13i";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase= ''

+2 -2

pkgs/tools/networking/kea/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "kea";

     

       15
       15
       -
         version = "1.9.7";

     

       15
       15
       +
         version = "1.9.8";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";

     

       19
       19
       -
           sha256 = "sha256-3/A0cG9AiyiWMk0GUjeUAHm0uRw5Q9PsEA2S6WZ8clo=";

     

       19
       19
       +
           sha256 = "sha256-EAi1Ic3YEF0or37At48saKwmAczTwf5GtbEsQNopbl0=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         patches = [ ./dont-create-var.patch ];

+4 -4

pkgs/top-level/all-packages.nix

···

       11390
       11390
        
             /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7)

     

       11391
       11391
        
             else if platform.isFreeBSD then 7

     

       11392
       11392
        
             else if platform.isAndroid then 12

     

       11393
       11393
       -
             else if platform.isLinux then 7

     

       11393
       11393
       +
             else if platform.isLinux then (if platform.isRiscV then 9 else 7)

     

       11394
       11394
        
             else if platform.isWasm then 8

     

       11395
       11395
        
             else 11; # latest

     

       11396
       11396
        
           # We take the "max of the mins". Why? Since those are lower bounds of the

     
···

       19277
       19277
        
           zlib = zlib-ng.override { withZlibCompat = true; };

     

       19278
       19278
        
           withPerl = false;

     

       19279
       19279
        
           # We don't use `with` statement here on purpose!

     

       19280
       19280
       -
           # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334

     

       19280
       19280
       +
           # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334

     

       19281
       19281
        
           modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];

     

       19282
       19282
        
           # Use latest boringssl to allow http3 support

     

       19283
       19283
        
           openssl = boringssl;

     
···

       19287
       19287
        
           zlib = zlib-ng.override { withZlibCompat = true; };

     

       19288
       19288
        
           withPerl = false;

     

       19289
       19289
        
           # We don't use `with` statement here on purpose!

     

       19290
       19290
       -
           # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334

     

       19290
       19290
       +
           # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334

     

       19291
       19291
        
           modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];

     

       19292
       19292
        
         };

     

       19293
       19293
        
       

     
···

       19295
       19295
        
           zlib = zlib-ng.override { withZlibCompat = true; };

     

       19296
       19296
        
           withPerl = false;

     

       19297
       19297
        
           # We don't use `with` statement here on purpose!

     

       19298
       19298
       -
           # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334

     

       19298
       19298
       +
           # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334

     

       19299
       19299
        
           modules = [ nginxModules.dav nginxModules.moreheaders ];

     

       19300
       19300
        
         };

     

       19301
       19301