commit 82c60fcf1acd2760cc0139448be449d8e9f4d5f0 · pyrox.dev/nixpkgs

+2

doc/release-notes/rl-2505.section.md

···

       18
       18
        
         - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.

     

       19
       19
        
         - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.

     

       20
       20
        
       

     

       21
       21
       +
       - The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs.

     

       22
       22
       +
       

     

       21
       23
        
       ### Deprecations {#sec-nixpkgs-release-25.05-lib-deprecations}

     

       22
       24
        
       

     

       23
       25
        
       `functor` is an implementation detail and should not be relied upon, but since its status wasn't clear and it has had some use cases without alternatives, changes are being handled as gracefully as possible. Deprecations within functor:

+7 -14

nixos/modules/virtualisation/hyperv-guest.nix

···

       6
       6
        
         cfg = config.virtualisation.hypervGuest;

     

       7
       7
        
       

     

       8
       8
        
       in {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRemovedOptionModule [ "virtualisation" "hypervGuest" "videoMode" ]

     

       11
       11
       +
             "The video mode can now be configured via standard tools, or in Hyper-V VM settings."

     

       12
       12
       +
           )

     

       13
       13
       +
         ];

     

       14
       14
       +
       

     

       9
       15
        
         options = {

     

       10
       16
        
           virtualisation.hypervGuest = {

     

       11
       17
        
             enable = mkEnableOption "Hyper-V Guest Support";

     

       12
       12
       -
       

     

       13
       13
       -
             videoMode = mkOption {

     

       14
       14
       -
               type = types.str;

     

       15
       15
       -
               default = "1152x864";

     

       16
       16
       -
               example = "1024x768";

     

       17
       17
       -
               description = ''

     

       18
       18
       -
                 Resolution at which to initialize the video adapter.

     

       19
       19
       -
       

     

       20
       20
       -
                 Supports screen resolution up to Full HD 1920x1080 with 32 bit color

     

       21
       21
       -
                 on Windows Server 2012, and 1600x1200 with 16 bit color on Windows

     

       22
       22
       -
                 Server 2008 R2 or earlier.

     

       23
       23
       -
               '';

     

       24
       24
       -
             };

     

       25
       18
        
           };

     

       26
       19
        
         };

     

       27
       20
        
       

     
···

       34
       27
        
             initrd.availableKernelModules = [ "hyperv_keyboard" ];

     

       35
       28
        
       

     

       36
       29
        
             kernelParams = [

     

       37
       37
       -
               "video=hyperv_fb:${cfg.videoMode}" "elevator=noop"

     

       30
       30
       +
               "elevator=noop"

     

       38
       31
        
             ];

     

       39
       32
        
           };

     

       40
       33

+26 -8

nixos/tests/binary-cache.nix

···

       9
       9
        
             { pkgs, ... }:

     

       10
       10
        
             {

     

       11
       11
        
               imports = [ ../modules/installer/cd-dvd/channel.nix ];

     

       12
       12
       -
               environment.systemPackages = [ pkgs.python3 ];

     

       13
       13
       -
               system.extraDependencies = [ pkgs.hello.inputDerivation ];

     

       12
       12
       +
               environment.systemPackages = with pkgs; [

     

       13
       13
       +
                 openssl

     

       14
       14
       +
                 python3

     

       15
       15
       +
               ];

     

       16
       16
       +
       

     

       17
       17
       +
               # We encrypt the binary cache before putting it on the machine so Nix

     

       18
       18
       +
               # doesn't bring any references along.

     

       19
       19
       +
               environment.etc."binary-cache.tar.gz.encrypted".source =

     

       20
       20
       +
                 with pkgs;

     

       21
       21
       +
                 runCommand "binary-cache.tar.gz.encrypted"

     

       22
       22
       +
                   {

     

       23
       23
       +
                     allowReferences = [ ];

     

       24
       24
       +
                     nativeBuildInputs = [ openssl ];

     

       25
       25
       +
                   }

     

       26
       26
       +
                   ''

     

       27
       27
       +
                     tar -czf tmp.tar.gz -C "${mkBinaryCache { rootPaths = [ hello ]; }}" .

     

       28
       28
       +
                     openssl enc -aes-256-cbc -salt -in tmp.tar.gz -out $out -k mysecretpassword

     

       29
       29
       +
                   '';

     

       30
       30
       +
       

     

       14
       31
        
               nix.extraOptions = ''

     

       15
       32
        
                 experimental-features = nix-command

     

       16
       33
        
               '';

     

       17
       34
        
             };

     

       18
       35
        
       

     

       19
       36
        
           testScript = ''

     

       20
       20
       -
             # Build the cache, then remove it from the store

     

       21
       21
       -
             cachePath = machine.succeed("nix-build --no-out-link -E 'with import <nixpkgs> {}; mkBinaryCache { rootPaths = [hello]; }'").strip()

     

       22
       22
       -
             machine.succeed("cp -r %s/. /tmp/cache" % cachePath)

     

       23
       23
       -
             machine.succeed("nix-store --delete " + cachePath)

     

       37
       37
       +
             # Decrypt the cache into /tmp/binary-cache.tar.gz

     

       38
       38
       +
             machine.succeed("openssl enc -d -aes-256-cbc -in /etc/binary-cache.tar.gz.encrypted -out /tmp/binary-cache.tar.gz -k mysecretpassword")

     

       39
       39
       +
       

     

       40
       40
       +
             # Untar the cache into /tmp/cache

     

       41
       41
       +
             machine.succeed("mkdir /tmp/cache")

     

       42
       42
       +
             machine.succeed("tar -C /tmp/cache -xf /tmp/binary-cache.tar.gz")

     

       24
       43
        
       

     

       25
       44
        
             # Sanity test of cache structure

     

       26
       45
        
             status, stdout = machine.execute("ls /tmp/cache")

     
···

       42
       61
        
             if not match: raise Exception("Couldn't find hello store path in cache")

     

       43
       62
        
             storePath = match[1]

     

       44
       63
        
       

     

       45
       45
       -
             # Delete the store path

     

       46
       46
       -
             machine.succeed("nix-store --delete " + storePath)

     

       64
       64
       +
             # Make sure the store path doesn't exist yet

     

       47
       65
        
             machine.succeed("[ ! -d %s ] || exit 1" % storePath)

     

       48
       66
        
       

     

       49
       67
        
             # Should be able to build hello using the cache

+16 -16

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       9
       9
        
         versions =

     

       10
       10
        
           if stdenv.hostPlatform.isLinux then

     

       11
       11
        
             {

     

       12
       12
       -
               stable = "0.0.79";

     

       13
       13
       -
               ptb = "0.0.124";

     

       14
       14
       -
               canary = "0.0.556";

     

       15
       15
       -
               development = "0.0.61";

     

       12
       12
       +
               stable = "0.0.80";

     

       13
       13
       +
               ptb = "0.0.126";

     

       14
       14
       +
               canary = "0.0.569";

     

       15
       15
       +
               development = "0.0.67";

     

       16
       16
        
             }

     

       17
       17
        
           else

     

       18
       18
        
             {

     

       19
       19
       -
               stable = "0.0.331";

     

       20
       20
       -
               ptb = "0.0.154";

     

       21
       21
       -
               canary = "0.0.668";

     

       22
       22
       -
               development = "0.0.70";

     

       19
       19
       +
               stable = "0.0.332";

     

       20
       20
       +
               ptb = "0.0.156";

     

       21
       21
       +
               canary = "0.0.681";

     

       22
       22
       +
               development = "0.0.76";

     

       23
       23
        
             };

     

       24
       24
        
         version = versions.${branch};

     

       25
       25
        
         srcs = rec {

     

       26
       26
        
           x86_64-linux = {

     

       27
       27
        
             stable = fetchurl {

     

       28
       28
        
               url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";

     

       29
       29
       -
               hash = "sha256-gQVx+PueGDofUjKSvyorCu73myNujcKz9gugMKB9koY=";

     

       29
       29
       +
               hash = "sha256-oamuF2LcdBC2HUzB08lTlxvrXjE6YFBXwLJDrmYKRXM=";

     

       30
       30
        
             };

     

       31
       31
        
             ptb = fetchurl {

     

       32
       32
        
               url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

     

       33
       33
       -
               hash = "sha256-jJncDqX2vCWFIpgruX1SknZBrCvMM5HSy6je9xxnxqM=";

     

       33
       33
       +
               hash = "sha256-4OvGEeOP4i4j7WwMjnnSvaNQ2e5RZ0EMF797xoIsWMY=";

     

       34
       34
        
             };

     

       35
       35
        
             canary = fetchurl {

     

       36
       36
        
               url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       37
       37
       -
               hash = "sha256-5qn0YL0+1uE6kmQO3Fh2DD0gNjk6MT+yAdIoMK7Y8Tw=";

     

       37
       37
       +
               hash = "sha256-akbcAPuxF1pl4u2Cw/I7rlv8WVDsIZDPPpGRUt1qQvA=";

     

       38
       38
        
             };

     

       39
       39
        
             development = fetchurl {

     

       40
       40
        
               url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

     

       41
       41
       -
               hash = "sha256-9ssgue3Y8StyKnc1dvr6b0Z3hjPYtJCNuVsruqFx8ug=";

     

       41
       41
       +
               hash = "sha256-YwOhdNM6l+E/X6JX5ttyJsJmf3Pa+BN7N0mG7923xI4=";

     

       42
       42
        
             };

     

       43
       43
        
           };

     

       44
       44
        
           x86_64-darwin = {

     

       45
       45
        
             stable = fetchurl {

     

       46
       46
        
               url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";

     

       47
       47
       -
               hash = "sha256-U37JyZwPmsk6ArD8Lz0xAiy/I78H+wHSig3+1BpD9iA=";

     

       47
       47
       +
               hash = "sha256-ZIAFYbC4rRjb9Lz3E50TfR0Lgdmg0MZllxy+vk36Eg8=";

     

       48
       48
        
             };

     

       49
       49
        
             ptb = fetchurl {

     

       50
       50
        
               url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";

     

       51
       51
       -
               hash = "sha256-BVKhyLoz/EoaZ6LgCaJuZZ37u9ProXOPddrfg171Eu4=";

     

       51
       51
       +
               hash = "sha256-Uluw2l/yAFzy4uMzp9ugFri8Psl7hy50H7QHag+St10=";

     

       52
       52
        
             };

     

       53
       53
        
             canary = fetchurl {

     

       54
       54
        
               url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

     

       55
       55
       -
               hash = "sha256-1eCHufW68AuYuYWzfq6Tt+YylFgCLT88DrvrNZvQG8A=";

     

       55
       55
       +
               hash = "sha256-OmN8g5Skg/KmdO8sv8iOhbZOFU/XUyUqvSthEam6RNE=";

     

       56
       56
        
             };

     

       57
       57
        
             development = fetchurl {

     

       58
       58
        
               url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

     

       59
       59
       -
               hash = "sha256-UdHwa/ALOOt/bNA6UmVJB8GNe+yHJ1xFoyF0nT1Zn3g=";

     

       59
       59
       +
               hash = "sha256-GyHOJcxWoKdFJ5/oca5JFwu5OdGGykR4OXGMaa3XfiY=";

     

       60
       60
        
             };

     

       61
       61
        
           };

     

       62
       62
        
           aarch64-darwin = x86_64-darwin;

+1

pkgs/applications/science/logic/coq/default.nix

···

       59
       59
        
          "8.19.1".sha256   = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94=";

     

       60
       60
        
          "8.19.2".sha256   = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0=";

     

       61
       61
        
          "8.20.0".sha256   = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";

     

       62
       62
       +
          "8.20.1".sha256   = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";

     

       62
       63
        
         };

     

       63
       64
        
         releaseRev = v: "V${v}";

     

       64
       65
        
         fetched = import ../../../../build-support/coq/meta-fetch/default.nix

+1 -1

pkgs/build-support/binary-cache/make-binary-cache.py

···

       23
       23
        
         with open(xzFile, "w") as f:

     

       24
       24
        
           subprocess.run("nix-store --dump %s | xz -c" % item["path"], stdout=f, shell=True)

     

       25
       25
        
       

     

       26
       26
       -
         fileHash = subprocess.run(["nix-hash", "--base32", "--type", "sha256", item["path"]], capture_output=True).stdout.decode().strip()

     

       26
       26
       +
         fileHash = subprocess.run(["nix-hash", "--base32", "--type", "sha256", "--flat", xzFile], capture_output=True).stdout.decode().strip()

     

       27
       27
        
         fileSize = os.path.getsize(xzFile)

     

       28
       28
        
       

     

       29
       29
        
         # Rename the .nar.xz file to its own hash to match "nix copy" behavior

+3 -3

pkgs/by-name/co/containerlab/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "containerlab";

     

       10
       10
       -
         version = "0.61.0";

     

       10
       10
       +
         version = "0.62.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "srl-labs";

     

       14
       14
        
           repo = "containerlab";

     

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

     

       16
       16
       -
           hash = "sha256-VEN2JjgLukE8YQ2nq+qFS2Yq0TdiTyRm2RUm32mJzBM=";

     

       16
       16
       +
           hash = "sha256-6WDmjVRLvh8FBydaN41Vj4B5BIkIF9VnvhRcJR3k9Ec=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-PwPih5LuXPBznSvn4L4h8zCiuWP2+u90PdN5+2Il6j0=";

     

       19
       19
       +
         vendorHash = "sha256-G9W4iC04R5Rvl3hAJtMlUKJKo7AAIE33Y2c+0HedXU8=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ installShellFiles ];

     

       22
       22

+2 -2

pkgs/by-name/cr/crowdin-cli/package.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         pname = "crowdin-cli";

     

       17
       17
       -
         version = "4.5.0";

     

       17
       17
       +
         version = "4.5.1";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchurl {

     

       20
       20
        
           url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";

     

       21
       21
       -
           hash = "sha256-Qcw1935ENMftohZrwqRZRrXoXYThogfBXNzf/6jJxaM=";

     

       21
       21
       +
           hash = "sha256-wmW6RBVMdpcawCEgLaZwOLStdUIWumsgc39Y0Kv8uEE=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/ku/kube-bench/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "kube-bench";

     

       10
       10
       -
         version = "0.9.4";

     

       10
       10
       +
         version = "0.10.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "aquasecurity";

     

       14
       14
        
           repo = pname;

     

       15
       15
        
           tag = "v${version}";

     

       16
       16
       -
           hash = "sha256-SkXf8zZif1l+yOSUjYpW474gYOmxifaLtj/DNK+ZNfg=";

     

       16
       16
       +
           hash = "sha256-+2WoQJtH5uuVSOi70WQ+DYnUNlXoThXPJvz2jckn2cw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-6ApPEt9SkPI5yu3ejzR1AU1ZCHmltp8Cxso6j//pEAk=";

     

       19
       19
       +
         vendorHash = "sha256-2jlYDpUJr4y4Ahzw9xDwVlQ/XPADMbAc5qYf+6N7Ado=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ installShellFiles ];

     

       22
       22

+3 -3

pkgs/by-name/me/metacubexd/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "metacubexd";

     

       11
       11
       -
         version = "1.173.3";

     

       11
       11
       +
         version = "1.176.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "MetaCubeX";

     

       15
       15
        
           repo = "metacubexd";

     

       16
       16
        
           rev = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-K/E3EetvpJKnLvFNkWtf95D/+oQtu27JLO3il7dpN2c=";

     

       17
       17
       +
           hash = "sha256-96mWjODfgIoJM/c/2c+KdPDxWCEGszglkRqjabW8auk=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     
···

       24
       24
        
       

     

       25
       25
        
         pnpmDeps = pnpm_9.fetchDeps {

     

       26
       26
        
           inherit (finalAttrs) pname version src;

     

       27
       27
       -
           hash = "sha256-aw8Sh4BecQ09rC0OLWebdWc7D/LE8vPs9uqh6w5G/FM=";

     

       27
       27
       +
           hash = "sha256-xDcqGvM8J6miDwiwNQODnPVq63flitva6/nPLYa9cgY=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         buildPhase = ''

+4 -4

pkgs/by-name/mo/mollysocket/package.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage rec {

     

       14
       14
        
         pname = "mollysocket";

     

       15
       15
       -
         version = "1.5.5";

     

       15
       15
       +
         version = "1.6.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "mollyim";

     

       19
       19
        
           repo = "mollysocket";

     

       20
       20
       -
           rev = version;

     

       21
       21
       -
           hash = "sha256-IJaWCawA1vM+3qdHbPZCn4laM7DAL19k1P1MjghtGv8=";

     

       20
       20
       +
           tag = version;

     

       21
       21
       +
           hash = "sha256-F80XRQn3h1Y6dE8PVLGMTY29yZomrwqFAsm7h8euHw8=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoHash = "sha256-FNFTPjj9TQeIG7K/+qpOav/TcNsmt+G6EhBftHqNbB4=";

     

       24
       24
       +
         cargoHash = "sha256-ZHS/EJBhT1H5MvuqdPtmf95ctuLft4qVsZzPVeJBR5k=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     

       27
       27
        
           pkg-config

+2 -2

pkgs/by-name/mu/mutter46/package.nix

···

       67
       67
        
       

     

       68
       68
        
       stdenv.mkDerivation (finalAttrs: {

     

       69
       69
        
         pname = "mutter";

     

       70
       70
       -
         version = "46.7";

     

       70
       70
       +
         version = "46.8";

     

       71
       71
        
       

     

       72
       72
        
         outputs = [

     

       73
       73
        
           "out"

     
···

       78
       78
        
       

     

       79
       79
        
         src = fetchurl {

     

       80
       80
        
           url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";

     

       81
       81
       -
           hash = "sha256-+7wVwLB2CS0WwB1cbwxvVNIR84Miy4wjseF9xW1MUl0=";

     

       81
       81
       +
           hash = "sha256-+8CDVEr7O4Vn18pobCF/g3sG+UeNbiV0FZ/5ocjhyWI=";

     

       82
       82
        
         };

     

       83
       83
        
       

     

       84
       84
        
         mesonFlags = [

+4 -4

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py

···

       27
       27
        
               default=0,

     

       28
       28
        
               help="Enable verbose logging (includes nix)",

     

       29
       29
        
           )

     

       30
       30
       +
           common_flags.add_argument("--quiet", action="count", default=0)

     

       30
       31
        
           common_flags.add_argument("--max-jobs", "-j")

     

       31
       32
        
           common_flags.add_argument("--cores")

     

       32
       33
        
           common_flags.add_argument("--log-format")

     
···

       34
       35
        
           common_flags.add_argument("--keep-failed", "-K", action="store_true")

     

       35
       36
        
           common_flags.add_argument("--fallback", action="store_true")

     

       36
       37
        
           common_flags.add_argument("--repair", action="store_true")

     

       37
       37
       -
           common_flags.add_argument("--option", nargs=2)

     

       38
       38
       +
           common_flags.add_argument("--option", nargs=2, action="append")

     

       38
       39
        
       

     

       39
       40
        
           common_build_flags = argparse.ArgumentParser(add_help=False)

     

       40
       41
        
           common_build_flags.add_argument("--builders")

     

       41
       42
        
           common_build_flags.add_argument("--include", "-I", action="append")

     

       42
       42
       -
           common_build_flags.add_argument("--quiet", action="store_true")

     

       43
       43
        
           common_build_flags.add_argument("--print-build-logs", "-L", action="store_true")

     

       44
       44
        
           common_build_flags.add_argument("--show-trace", action="store_true")

     

       45
       45
        
       

     
···

       54
       54
        
           flake_common_flags.add_argument("--no-write-lock-file", action="store_true")

     

       55
       55
        
           flake_common_flags.add_argument("--no-registries", action="store_true")

     

       56
       56
        
           flake_common_flags.add_argument("--commit-lock-file", action="store_true")

     

       57
       57
       -
           flake_common_flags.add_argument("--update-input")

     

       58
       58
       -
           flake_common_flags.add_argument("--override-input", nargs=2)

     

       57
       57
       +
           flake_common_flags.add_argument("--update-input", action="append")

     

       58
       58
       +
           flake_common_flags.add_argument("--override-input", nargs=2, action="append")

     

       59
       59
        
       

     

       60
       60
        
           classic_build_flags = argparse.ArgumentParser(add_help=False)

     

       61
       61
        
           classic_build_flags.add_argument("--no-build-output", "-Q", action="store_true")

+3 -3

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py

···

       52
       52
        
           attr: str | None

     

       53
       53
        
       

     

       54
       54
        
           def to_attr(self, *attrs: str) -> str:

     

       55
       55
       -
               return f"{self.attr + '.' if self.attr else ''}{".".join(attrs)}"

     

       55
       55
       +
               return f"{self.attr + '.' if self.attr else ''}{'.'.join(attrs)}"

     

       56
       56
        
       

     

       57
       57
        
           @classmethod

     

       58
       58
        
           def from_arg(cls, attr: str | None, file: str | None) -> Self:

     
···

       68
       68
        
           _re: ClassVar = re.compile(r"^(?P<path>[^\#]*)\#?(?P<attr>[^\#\"]*)$")

     

       69
       69
        
       

     

       70
       70
        
           def to_attr(self, *attrs: str) -> str:

     

       71
       71
       -
               return f"{self}.{".".join(attrs)}"

     

       71
       71
       +
               return f"{self}.{'.'.join(attrs)}"

     

       72
       72
        
       

     

       73
       73
        
           @override

     

       74
       74
        
           def __str__(self) -> str:

     
···

       83
       83
        
               m = cls._re.match(flake_str)

     

       84
       84
        
               assert m is not None, f"got no matches for {flake_str}"

     

       85
       85
        
               attr = m.group("attr")

     

       86
       86
       -
               nixos_attr = f"nixosConfigurations.{attr or hostname_fn() or "default"}"

     

       86
       86
       +
               nixos_attr = f"nixosConfigurations.{attr or hostname_fn() or 'default'}"

     

       87
       87
        
               path = m.group("path")

     

       88
       88
        
               if ":" in path:

     

       89
       89
        
                   return cls(path, nixos_attr)

+1 -1

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py

···

       15
       15
        
           "-o",

     

       16
       16
        
           "ControlMaster=auto",

     

       17
       17
        
           "-o",

     

       18
       18
       -
           f"ControlPath={tmpdir.TMPDIR_PATH / "ssh-%n"}",

     

       18
       18
       +
           f"ControlPath={tmpdir.TMPDIR_PATH / 'ssh-%n'}",

     

       19
       19
        
           "-o",

     

       20
       20
        
           "ControlPersist=60",

     

       21
       21
        
       ]

+7 -3

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py

···

       2
       2
        
       from collections.abc import Mapping, Sequence

     

       3
       3
        
       from typing import Any, assert_never, override

     

       4
       4
        
       

     

       5
       5
       -
       type Arg = bool | str | list[str] | int | None

     

       5
       5
       +
       type Arg = bool | str | list[str] | list[list[str]] | int | None

     

       6
       6
        
       type Args = dict[str, Arg]

     

       7
       7
        
       

     

       8
       8
        
       

     
···

       43
       43
        
                       flags.append(flag)

     

       44
       44
        
                       flags.append(value)

     

       45
       45
        
                   case list():

     

       46
       46
       -
                       for v in value:

     

       46
       46
       +
                       for vs in value:

     

       47
       47
        
                           flags.append(flag)

     

       48
       48
       -
                           flags.append(v)

     

       48
       48
       +
                           if isinstance(vs, list):

     

       49
       49
       +
                               for v in vs:

     

       50
       50
       +
                                   flags.append(v)

     

       51
       51
       +
                           else:

     

       52
       52
       +
                               flags.append(vs)

     

       49
       53
        
                   case _:

     

       50
       54
        
                       assert_never(value)

     

       51
       55
        
           return flags

+61 -5

pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py

···

       40
       40
        
                   "--flake",

     

       41
       41
        
                   "/etc/nixos",

     

       42
       42
        
                   "--option",

     

       43
       43
       -
                   "foo",

     

       44
       44
       -
                   "bar",

     

       43
       43
       +
                   "foo1",

     

       44
       44
       +
                   "bar1",

     

       45
       45
       +
                   "--option",

     

       46
       46
       +
                   "foo2",

     

       47
       47
       +
                   "bar2",

     

       48
       48
       +
                   "--override-input",

     

       49
       49
       +
                   "override1",

     

       50
       50
       +
                   "input1",

     

       51
       51
       +
                   "--override-input",

     

       52
       52
       +
                   "override2",

     

       53
       53
       +
                   "input2",

     

       54
       54
       +
                   "--update-input",

     

       55
       55
       +
                   "input1",

     

       56
       56
       +
                   "--update-input",

     

       57
       57
       +
                   "input2",

     

       45
       58
        
               ]

     

       46
       59
        
           )

     

       47
       60
        
           assert nr.logger.level == logging.INFO

     
···

       50
       63
        
           assert r1.install_grub is True

     

       51
       64
        
           assert r1.profile_name == "system"

     

       52
       65
        
           assert r1.action == "switch"

     

       53
       53
       -
           assert r1.option == ["foo", "bar"]

     

       54
       54
       -
           assert g1["common_flags"].option == ["foo", "bar"]

     

       66
       66
       +
           # round-trip test (ensure that we have the same flags as parsed)

     

       67
       67
       +
           assert nr.utils.dict_to_flags(vars(g1["common_flags"])) == [

     

       68
       68
       +
               "--option",

     

       69
       69
       +
               "foo1",

     

       70
       70
       +
               "bar1",

     

       71
       71
       +
               "--option",

     

       72
       72
       +
               "foo2",

     

       73
       73
       +
               "bar2",

     

       74
       74
       +
           ]

     

       75
       75
       +
           assert nr.utils.dict_to_flags(vars(g1["flake_common_flags"])) == [

     

       76
       76
       +
               "--update-input",

     

       77
       77
       +
               "input1",

     

       78
       78
       +
               "--update-input",

     

       79
       79
       +
               "input2",

     

       80
       80
       +
               "--override-input",

     

       81
       81
       +
               "override1",

     

       82
       82
       +
               "input1",

     

       83
       83
       +
               "--override-input",

     

       84
       84
       +
               "override2",

     

       85
       85
       +
               "input2",

     

       86
       86
       +
           ]

     

       55
       87
        
       

     

       56
       88
        
           r2, g2 = nr.parse_args(

     

       57
       89
        
               [

     
···

       63
       95
        
                   "foo",

     

       64
       96
        
                   "--attr",

     

       65
       97
        
                   "bar",

     

       98
       98
       +
                   "-I",

     

       99
       99
       +
                   "include1",

     

       100
       100
       +
                   "-I",

     

       101
       101
       +
                   "include2",

     

       66
       102
        
                   "-vvv",

     

       103
       103
       +
                   "--quiet",

     

       104
       104
       +
                   "--quiet",

     

       67
       105
        
               ]

     

       68
       106
        
           )

     

       69
       107
        
           assert nr.logger.level == logging.DEBUG

     
···

       72
       110
        
           assert r2.action == "dry-build"

     

       73
       111
        
           assert r2.file == "foo"

     

       74
       112
        
           assert r2.attr == "bar"

     

       75
       75
       -
           assert g2["common_flags"].v == 3

     

       113
       113
       +
           # round-trip test (ensure that we have the same flags as parsed)

     

       114
       114
       +
           assert nr.utils.dict_to_flags(vars(g2["common_flags"])) == [

     

       115
       115
       +
               "-vvv",

     

       116
       116
       +
               "--quiet",

     

       117
       117
       +
               "--quiet",

     

       118
       118
       +
           ]

     

       119
       119
       +
           assert nr.utils.dict_to_flags(vars(g2["common_build_flags"])) == [

     

       120
       120
       +
               "--include",

     

       121
       121
       +
               "include1",

     

       122
       122
       +
               "--include",

     

       123
       123
       +
               "include2",

     

       124
       124
       +
           ]

     

       76
       125
        
       

     

       77
       126
        
       

     

       78
       127
        
       @patch.dict(nr.process.os.environ, {}, clear=True)

     
···

       292
       341
        
                   "--sudo",

     

       293
       342
        
                   "--verbose",

     

       294
       343
        
                   "--fast",

     

       344
       344
       +
                   # https://github.com/NixOS/nixpkgs/issues/374050

     

       345
       345
       +
                   "--option",

     

       346
       346
       +
                   "narinfo-cache-negative-ttl",

     

       347
       347
       +
                   "1200",

     

       295
       348
        
               ]

     

       296
       349
        
           )

     

       297
       350
        
       

     
···

       307
       360
        
                           "--print-out-paths",

     

       308
       361
        
                           "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel",

     

       309
       362
        
                           "-v",

     

       363
       363
       +
                           "--option",

     

       364
       364
       +
                           "narinfo-cache-negative-ttl",

     

       365
       365
       +
                           "1200",

     

       310
       366
        
                           "--no-link",

     

       311
       367
        
                       ],

     

       312
       368
        
                       check=True,

+11 -4

pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py

···

       11
       11
        
                   "test_flag_2": False,

     

       12
       12
        
                   "test_flag_3": "value",

     

       13
       13
        
                   "test_flag_4": ["v1", "v2"],

     

       14
       14
       -
                   "test_flag_5": None,

     

       14
       14
       +
                   "test_flag_5": [["o1", "v1"], ["o2", "v2"]],

     

       15
       15
       +
                   "test_flag_6": None,

     

       15
       16
        
                   "t": True,

     

       16
       17
        
                   "v": 5,

     

       17
       17
       -
                   "verbose": 2,

     

       18
       18
       +
                   "quiet": 2,

     

       18
       19
        
               }

     

       19
       20
        
           )

     

       20
       21
        
           assert r1 == [

     
···

       25
       26
        
               "v1",

     

       26
       27
        
               "--test-flag-4",

     

       27
       28
        
               "v2",

     

       29
       29
       +
               "--test-flag-5",

     

       30
       30
       +
               "o1",

     

       31
       31
       +
               "v1",

     

       32
       32
       +
               "--test-flag-5",

     

       33
       33
       +
               "o2",

     

       34
       34
       +
               "v2",

     

       28
       35
        
               "-t",

     

       29
       36
        
               "-vvvvv",

     

       30
       30
       -
               "--verbose",

     

       31
       31
       -
               "--verbose",

     

       37
       37
       +
               "--quiet",

     

       38
       38
       +
               "--quiet",

     

       32
       39
        
           ]

     

       33
       40
        
           r2 = u.dict_to_flags({"verbose": 0, "empty_list": []})

     

       34
       41
        
           assert r2 == []

+3 -3

pkgs/by-name/qd/qdrant-web-ui/package.nix

···

       5
       5
        
       }:

     

       6
       6
        
       buildNpmPackage rec {

     

       7
       7
        
         pname = "qdrant-web-ui";

     

       8
       8
       -
         version = "0.1.34";

     

       8
       8
       +
         version = "0.1.35";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "qdrant";

     

       12
       12
        
           repo = "qdrant-web-ui";

     

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

     

       14
       14
       -
           hash = "sha256-hLjoN0GxRKkEPRw5+ga597QNeuCxl9aZawezfQqBD7I=";

     

       14
       14
       +
           hash = "sha256-kTXN+uouEf/szksu+rLAXW+As2YyrFF4i8AluFEPRUs=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         npmDepsHash = "sha256-ccykE9W6koZ8BDtOZicou264/qwVtEuDdiinGF7rp5I=";

     

       17
       17
       +
         npmDepsHash = "sha256-oZydAlmzNjjcuLtXfhBXrsuOBPyOsnRZZ7DzUVg0eas=";

     

       18
       18
        
       

     

       19
       19
        
         npmBuildScript = "build-qdrant";

     

       20
       20

+3 -3

pkgs/by-name/ri/river-luatile/package.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "river-luatile";

     

       11
       11
       -
         version = "0.1.3";

     

       11
       11
       +
         version = "0.1.4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "MaxVerevkin";

     

       15
       15
        
           repo = "river-luatile";

     

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

     

       17
       17
       -
           hash = "sha256-ZBytoj4L72TjxJ7vFivjcSO69AcdwKNbXh4rA/bn5iU=";

     

       17
       17
       +
           hash = "sha256-8/qHoNFoGH1nSdTwBkaQk+yyvJtrXADTA39gUAMeSv8=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoHash = "sha256-GcMSglLKuUD3nVj0/8Nbrk4qs5gl5PlCj7r1MYq/vQg=";

     

       20
       20
       +
         cargoHash = "sha256-bXPxj8bNI8ZqYFl8XEHdNLqe0meYrlY2ovP3DKLGaqM=";

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
        
           pkg-config

+2 -2

pkgs/by-name/sq/sqlitestudio/package.nix

···

       11
       11
        
       }:

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "sqlitestudio";

     

       14
       14
       -
         version = "3.4.13";

     

       14
       14
       +
         version = "3.4.14";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "pawelsalawa";

     

       18
       18
        
           repo = "sqlitestudio";

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           hash = "sha256-k7ZedSw4Y1WIUH5IflSrEv4h7zsx40tB8A4/qr9OW9E=";

     

       20
       20
       +
           hash = "sha256-eexXRgi/AuxM1mDSdgOsfrv7JDF8NWCXhyAerA9lcBo=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs =

+3 -3

pkgs/by-name/va/vals/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "vals";

     

       11
       11
       -
         version = "0.38.0";

     

       11
       11
       +
         version = "0.39.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

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

     

       15
       15
        
           owner = "helmfile";

     

       16
       16
        
           repo = pname;

     

       17
       17
       -
           sha256 = "sha256-dN4712rZ/nElYpthW+27WSFOeNmV2Bm7Zx/OEIrKwsQ=";

     

       17
       17
       +
           sha256 = "sha256-Og3klt2FvfSbgplHgO4waG41apu+EePaBxVbVxaTPB0=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-EihgFqD80YlFaEJfeS2C91ifk7yYhZQcgEUteIk3siM=";

     

       20
       20
       +
         vendorHash = "sha256-F+eEnYdsXCmFuhJT3qWIrYCOkuEZdz2XFSMIccgz/+o=";

     

       21
       21
        
       

     

       22
       22
        
         proxyVendor = true;

     

       23
       23

+2 -2

pkgs/by-name/zi/zimfw/package.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "zimfw";

     

       9
       9
       -
         version = "1.16.0";

     

       9
       9
       +
         version = "1.17.0";

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "zimfw";

     

       12
       12
        
           repo = "zimfw";

     

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

     

       14
       14
        
           ## zim only needs this one file to be installed.

     

       15
       15
        
           sparseCheckout = [ "zimfw.zsh" ];

     

       16
       16
       -
           hash = "sha256-kAy7wT7K1x9di1RRcXHk5e0johdDWtSzDD85chSkNZ0=";

     

       16
       16
       +
           hash = "sha256-h8VhnUxelnc67TngQzmKY/098uKgvopBA1YleTiJhWc=";

     

       17
       17
        
         };

     

       18
       18
        
         strictDeps = true;

     

       19
       19
        
         dontConfigure = true;

+4 -6

pkgs/development/compilers/tinycc/default.nix

···

       90
       90
        
             configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")

     

       91
       91
        
           '';

     

       92
       92
        
       

     

       93
       93
       -
         env.NIX_CFLAGS_COMPILE = toString (

     

       94
       94
       -
           lib.optionals stdenv.cc.isClang [

     

       95
       95
       -
             "-Wno-error=implicit-int"

     

       96
       96
       -
             "-Wno-error=int-conversion"

     

       97
       97
       -
           ]

     

       98
       98
       -
         );

     

       93
       93
       +
         env.NIX_CFLAGS_COMPILE = toString [

     

       94
       94
       +
           "-Wno-error=implicit-int"

     

       95
       95
       +
           "-Wno-error=int-conversion"

     

       96
       96
       +
         ];

     

       99
       97
        
       

     

       100
       98
        
         # Test segfault for static build

     

       101
       99
        
         doCheck = !stdenv.hostPlatform.isStatic;

+18

pkgs/development/coq-modules/compcert/default.nix

···

       278
       278
        
                       url = "https://github.com/AbsInt/CompCert/commit/20a5b48758bf8ac18e4c420df67017b371efc237.patch";

     

       279
       279
        
                       hash = "sha256-TJ87CvLiAv1absGnPsTXsD/HQwKgS82loUTcosulyso=";

     

       280
       280
        
                     })

     

       281
       281
       +
                     # Support for Coq 8.20.1

     

       282
       282
       +
                     (fetchpatch {

     

       283
       283
       +
                       url = "https://github.com/AbsInt/CompCert/commit/e6c9a2d068ae67923bbc7c6b7035b6afde6ece3c.patch";

     

       284
       284
       +
                       hash = "sha256-PtiEkG/aLRotIiqrmc6SQncQSi7IGSC5QX3e52xkOUQ=";

     

       285
       285
       +
                     })

     

       286
       286
       +
                   ];

     

       287
       287
       +
                 }

     

       288
       288
       +
                 {

     

       289
       289
       +
                   cases = [

     

       290
       290
       +
                     (isEq "8.20")

     

       291
       291
       +
                     (isEq "3.15")

     

       292
       292
       +
                   ];

     

       293
       293
       +
                   out = [

     

       294
       294
       +
                     # Support for Coq 8.20.1

     

       295
       295
       +
                     (fetchpatch {

     

       296
       296
       +
                       url = "https://github.com/AbsInt/CompCert/commit/e524b0a19ae5140f64047b1cba6ebbe1d16d5bbf.patch";

     

       297
       297
       +
                       hash = "sha256-24kt0hA75ooyXymH+kNS5VlsuXMHbkqTw4m+BzNUwrw=";

     

       298
       298
       +
                     })

     

       281
       299
        
                   ];

     

       282
       300
        
                 }

     

       283
       301
        
               ]

+47 -113

pkgs/development/coq-modules/coq-elpi/default.nix

···

       5
       5
        
         coq,

     

       6
       6
        
         stdlib,

     

       7
       7
        
         version ? null,

     

       8
       8
       +
         elpi-version ? null,

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       let

     

       11
       11
       -
         elpi = coq.ocamlPackages.elpi.override (

     

       12
       12
       -
           lib.switch coq.coq-version [

     

       13
       13
       -
             {

     

       14
       14
       -
               case = "8.11";

     

       15
       15
       -
               out = {

     

       16
       16
       -
                 version = "1.11.4";

     

       17
       17
       -
               };

     

       18
       18
       -
             }

     

       19
       19
       -
             {

     

       20
       20
       -
               case = "8.12";

     

       21
       21
       -
               out = {

     

       22
       22
       -
                 version = "1.12.0";

     

       23
       23
       -
               };

     

       24
       24
       -
             }

     

       25
       25
       -
             {

     

       26
       26
       -
               case = "8.13";

     

       27
       27
       -
               out = {

     

       28
       28
       -
                 version = "1.13.7";

     

       29
       29
       -
               };

     

       30
       30
       -
             }

     

       31
       31
       -
             {

     

       32
       32
       -
               case = "8.14";

     

       33
       33
       -
               out = {

     

       34
       34
       -
                 version = "1.13.7";

     

       35
       35
       -
               };

     

       36
       36
       -
             }

     

       37
       37
       -
             {

     

       38
       38
       -
               case = "8.15";

     

       39
       39
       -
               out = {

     

       40
       40
       -
                 version = "1.15.0";

     

       41
       41
       -
               };

     

       42
       42
       -
             }

     

       43
       43
       -
             {

     

       44
       44
       -
               case = "8.16";

     

       45
       45
       -
               out = {

     

       46
       46
       -
                 version = "1.17.0";

     

       47
       47
       -
               };

     

       48
       48
       -
             }

     

       49
       49
       -
             {

     

       50
       50
       -
               case = "8.17";

     

       51
       51
       -
               out = {

     

       52
       52
       -
                 version = "1.17.0";

     

       53
       53
       -
               };

     

       54
       54
       -
             }

     

       55
       55
       -
             {

     

       56
       56
       -
               case = "8.18";

     

       57
       57
       -
               out = {

     

       58
       58
       -
                 version = "1.18.1";

     

       59
       59
       -
               };

     

       60
       60
       -
             }

     

       61
       61
       -
             {

     

       62
       62
       -
               case = "8.19";

     

       63
       63
       -
               out = {

     

       64
       64
       -
                 version = "1.18.1";

     

       65
       65
       -
               };

     

       66
       66
       -
             }

     

       67
       67
       -
             {

     

       68
       68
       -
               case = "8.20";

     

       69
       69
       -
               out = {

     

       70
       70
       -
                 version = "1.19.2";

     

       71
       71
       -
               };

     

       72
       72
       -
             }

     

       73
       73
       -
           ] { }

     

       74
       74
       -
         );

     

       75
       75
       -
       in

     

       76
       76
       -
       (mkCoqDerivation {

     

       12
       12
       +
       default-elpi-version = if elpi-version != null then elpi-version else (

     

       13
       13
       +
         lib.switch coq.coq-version [

     

       14
       14
       +
           { case = "8.11"; out = "1.11.4"; }

     

       15
       15
       +
           { case = "8.12"; out = "1.12.0"; }

     

       16
       16
       +
           { case = "8.13"; out = "1.13.7"; }

     

       17
       17
       +
           { case = "8.14"; out = "1.13.7"; }

     

       18
       18
       +
           { case = "8.15"; out = "1.15.0"; }

     

       19
       19
       +
           { case = "8.16"; out = "1.17.0"; }

     

       20
       20
       +
           { case = "8.17"; out = "1.17.0"; }

     

       21
       21
       +
           { case = "8.18"; out = "1.18.1"; }

     

       22
       22
       +
           { case = "8.19"; out = "1.18.1"; }

     

       23
       23
       +
           { case = "8.20"; out = "1.19.2"; }

     

       24
       24
       +
         ] { }

     

       25
       25
       +
       );

     

       26
       26
       +
       elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; };

     

       27
       27
       +
       propagatedBuildInputs_wo_elpi = [

     

       28
       28
       +
         coq.ocamlPackages.findlib

     

       29
       29
       +
         stdlib

     

       30
       30
       +
       ];

     

       31
       31
       +
       derivation = mkCoqDerivation {

     

       77
       32
        
         pname = "elpi";

     

       78
       33
        
         repo = "coq-elpi";

     

       79
       34
        
         owner = "LPCIC";

     

       80
       35
        
         inherit version;

     

       81
       36
        
         defaultVersion = lib.switch coq.coq-version [

     

       82
       82
       -
           {

     

       83
       83
       -
             case = "8.20";

     

       84
       84
       -
             out = "2.2.0";

     

       85
       85
       -
           }

     

       86
       86
       -
           {

     

       87
       87
       -
             case = "8.19";

     

       88
       88
       -
             out = "2.0.1";

     

       89
       89
       -
           }

     

       90
       90
       -
           {

     

       91
       91
       -
             case = "8.18";

     

       92
       92
       -
             out = "2.0.0";

     

       93
       93
       -
           }

     

       94
       94
       -
           {

     

       95
       95
       -
             case = "8.17";

     

       96
       96
       -
             out = "1.18.0";

     

       97
       97
       -
           }

     

       98
       98
       -
           {

     

       99
       99
       -
             case = "8.16";

     

       100
       100
       -
             out = "1.15.6";

     

       101
       101
       -
           }

     

       102
       102
       -
           {

     

       103
       103
       -
             case = "8.15";

     

       104
       104
       -
             out = "1.14.0";

     

       105
       105
       -
           }

     

       106
       106
       -
           {

     

       107
       107
       -
             case = "8.14";

     

       108
       108
       -
             out = "1.11.2";

     

       109
       109
       -
           }

     

       110
       110
       -
           {

     

       111
       111
       -
             case = "8.13";

     

       112
       112
       -
             out = "1.11.1";

     

       113
       113
       -
           }

     

       114
       114
       -
           {

     

       115
       115
       -
             case = "8.12";

     

       116
       116
       -
             out = "1.8.3_8.12";

     

       117
       117
       -
           }

     

       118
       118
       -
           {

     

       119
       119
       -
             case = "8.11";

     

       120
       120
       -
             out = "1.6.3_8.11";

     

       121
       121
       -
           }

     

       37
       37
       +
           { case = "8.20"; out = "2.2.0"; }

     

       38
       38
       +
           { case = "8.19"; out = "2.0.1"; }

     

       39
       39
       +
           { case = "8.18"; out = "2.0.0"; }

     

       40
       40
       +
           { case = "8.17"; out = "1.18.0"; }

     

       41
       41
       +
           { case = "8.16"; out = "1.15.6"; }

     

       42
       42
       +
           { case = "8.15"; out = "1.14.0"; }

     

       43
       43
       +
           { case = "8.14"; out = "1.11.2"; }

     

       44
       44
       +
           { case = "8.13"; out = "1.11.1"; }

     

       45
       45
       +
           { case = "8.12"; out = "1.8.3_8.12"; }

     

       46
       46
       +
           { case = "8.11"; out = "1.6.3_8.11"; }

     

       122
       47
        
         ] null;

     

       123
       48
        
         release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I=";

     

       124
       49
        
         release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc=";

     
···

       161
       86
        
       

     

       162
       87
        
         mlPlugin = true;

     

       163
       88
        
         useDuneifVersion = v: lib.versions.isGe "2.2.0" v || v == "dev";

     

       164
       164
       -
         propagatedBuildInputs = [

     

       165
       165
       -
           coq.ocamlPackages.findlib

     

       166
       166
       -
           elpi

     

       167
       167
       -
           stdlib

     

       168
       168
       -
         ];

     

       89
       89
       +
       

     

       90
       90
       +
         propagatedBuildInputs = propagatedBuildInputs_wo_elpi ++ [ elpi ];

     

       169
       91
        
       

     

       170
       92
        
         preConfigure = ''

     

       171
       93
        
           make elpi/dune || true

     
···

       176
       98
        
           maintainers = [ lib.maintainers.cohencyril ];

     

       177
       99
        
           license = lib.licenses.lgpl21Plus;

     

       178
       100
        
         };

     

       179
       179
       -
       }).overrideAttrs

     

       101
       101
       +
       };

     

       102
       102
       +
       patched-derivation1 = derivation.overrideAttrs

     

       103
       103
       +
         (

     

       104
       104
       +
           o:

     

       105
       105
       +
           lib.optionalAttrs (o ? elpi-version)

     

       106
       106
       +
             {

     

       107
       107
       +
               propagatedBuildInputs = propagatedBuildInputs_wo_elpi ++ [

     

       108
       108
       +
                 (coq.ocamlPackages.elpi.override { version = o.elpi-version; })

     

       109
       109
       +
               ];

     

       110
       110
       +
             }

     

       111
       111
       +
         );

     

       112
       112
       +
       patched-derivation2 = patched-derivation1.overrideAttrs

     

       180
       113
        
         (

     

       181
       114
        
           o:

     

       182
       115
        
           lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "2.2.0" o.version))

     

       183
       116
        
             {

     

       184
       117
        
               propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ];

     

       185
       118
        
             }

     

       186
       186
       -
         )

     

       119
       119
       +
         );

     

       120
       120
       +
       in patched-derivation2

+27 -17

pkgs/development/python-modules/keystoneauth1/default.nix

···

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchPypi,

     

       5
       5
        
         betamax,

     

       6
       6
       +
         fixtures,

     

       6
       7
        
         hacking,

     

       7
       8
        
         iso8601,

     

       8
       9
        
         lxml,

     
···

       17
       18
        
         requests-kerberos,

     

       18
       19
        
         requests-mock,

     

       19
       20
        
         setuptools,

     

       20
       20
       -
         six,

     

       21
       21
        
         stestr,

     

       22
       22
        
         stevedore,

     

       23
       23
        
         testresources,

     

       24
       24
        
         testtools,

     

       25
       25
       +
         typing-extensions,

     

       25
       26
        
       }:

     

       26
       27
        
       

     

       27
       28
        
       buildPythonPackage rec {

     

       28
       29
        
         pname = "keystoneauth1";

     

       29
       29
       -
         version = "5.8.0";

     

       30
       30
       +
         version = "5.9.1";

     

       30
       31
        
         pyproject = true;

     

       31
       32
        
       

     

       32
       33
        
         src = fetchPypi {

     

       33
       34
        
           inherit pname version;

     

       34
       34
       -
           hash = "sha256-MVfCEuEhFk3mTWPl734dqtK9NkmmjeHpcbdodwGe8cQ=";

     

       35
       35
       +
           hash = "sha256-+wxm2ELVuWR1ImT/8gs7Src2ENZtm40g0Nz3lroJ3EM=";

     

       35
       36
        
         };

     

       36
       37
        
       

     

       37
       38
        
         postPatch = ''

     
···

       42
       43
        
       

     

       43
       44
        
         build-system = [ setuptools ];

     

       44
       45
        
       

     

       45
       45
       -
         dependencies = [

     

       46
       46
       -
           betamax

     

       47
       47
       -
           iso8601

     

       48
       48
       -
           lxml

     

       49
       49
       -
           oauthlib

     

       50
       50
       -
           os-service-types

     

       51
       51
       -
           pbr

     

       52
       52
       -
           requests

     

       53
       53
       -
           requests-kerberos

     

       54
       54
       -
           six

     

       55
       55
       -
           stevedore

     

       56
       56
       -
         ];

     

       46
       46
       +
         dependencies =

     

       47
       47
       +
           [

     

       48
       48
       +
             iso8601

     

       49
       49
       +
             os-service-types

     

       50
       50
       +
             pbr

     

       51
       51
       +
             requests

     

       52
       52
       +
             stevedore

     

       53
       53
       +
             typing-extensions

     

       54
       54
       +
           ]

     

       55
       55
       +
           # TODO: remove this workaround and fix breakages

     

       56
       56
       +
           ++ lib.flatten (builtins.attrValues optional-dependencies);

     

       57
       57
       +
       

     

       58
       58
       +
         optional-dependencies = {

     

       59
       59
       +
           betamax = [

     

       60
       60
       +
             betamax

     

       61
       61
       +
             fixtures

     

       62
       62
       +
             pyyaml

     

       63
       63
       +
           ];

     

       64
       64
       +
           kerberos = [ requests-kerberos ];

     

       65
       65
       +
           oauth1 = [ oauthlib ];

     

       66
       66
       +
           saml2 = [ lxml ];

     

       67
       67
       +
         };

     

       57
       68
        
       

     

       58
       69
        
         nativeCheckInputs = [

     

       59
       70
        
           hacking

     

       60
       71
        
           oslo-config

     

       61
       72
        
           oslo-utils

     

       62
       73
        
           pycodestyle

     

       63
       63
       -
           pyyaml

     

       64
       74
        
           requests-mock

     

       65
       75
        
           stestr

     

       66
       76
        
           testresources

     

       67
       77
        
           testtools

     

       68
       68
       -
         ];

     

       78
       78
       +
         ] ++ lib.flatten (builtins.attrValues optional-dependencies);

     

       69
       79
        
       

     

       70
       80
        
         # test_keystoneauth_betamax_fixture is incompatible with urllib3 2.0.0

     

       71
       81
        
         # https://bugs.launchpad.net/keystoneauth/+bug/2020112

+2 -2

pkgs/development/python-modules/pyaml-env/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pyaml-env";

     

       12
       12
       -
         version = "1.2.1";

     

       12
       12
       +
         version = "1.2.2";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "mkaranasou";

     

       17
       17
        
           repo = "pyaml_env";

     

       18
       18
        
           tag = "v${version}";

     

       19
       19
       -
           hash = "sha256-xSu+dksSVugShJwOqedXBrXIKaH0G5JAsynauOuP3OA=";

     

       19
       19
       +
           hash = "sha256-Mp5Zn2JA6j/OTkPCRggNdqdWkrUYyYHMVK6hy/EI0I8=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         build-system = [ setuptools ];

+46

pkgs/development/python-modules/pygeocodio/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
         requests,

     

       7
       7
       +
         pytestCheckHook,

     

       8
       8
       +
         httpretty,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "pygeocodio";

     

       13
       13
       +
         version = "1.4.0";

     

       14
       14
       +
         pyproject = true;

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "bennylope";

     

       18
       18
       +
           repo = "pygeocodio";

     

       19
       19
       +
           tag = "v${version}";

     

       20
       20
       +
           hash = "sha256-s6sY+iHuWv7+6ydxDWoN9eKiAXw0jeASWiMtz12TTHo=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         build-system = [

     

       24
       24
       +
           setuptools

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         dependencies = [

     

       28
       28
       +
           requests

     

       29
       29
       +
           httpretty

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         pythonImportsCheck = [ "geocodio" ];

     

       33
       33
       +
       

     

       34
       34
       +
         nativeCheckInputs = [

     

       35
       35
       +
           pytestCheckHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = {

     

       39
       39
       +
           description = "Python wrapper for the Geocodio geolocation service API";

     

       40
       40
       +
           downloadPage = "https://github.com/bennylope/pygeocodio/tree/master";

     

       41
       41
       +
           changelog = "https://github.com/bennylope/pygeocodio/blob/v${version}/HISTORY.rst";

     

       42
       42
       +
           homepage = "https://www.geocod.io/docs/#introduction";

     

       43
       43
       +
           license = with lib.licenses; [ bsd3 ];

     

       44
       44
       +
           maintainers = with lib.maintainers; [ ethancedwards8 ];

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+14 -1

pkgs/development/python-modules/python-cinderclient/default.nix

···

       63
       63
        
       

     

       64
       64
        
         checkPhase = ''

     

       65
       65
        
           runHook preCheck

     

       66
       66
       -
           stestr run

     

       66
       66
       +
       

     

       67
       67
       +
           #   File "/build/python-cinderclient-9.6.0/cinderclient/client.py", line 196, in request

     

       68
       68
       +
           # if raise_exc and resp.status_code >= 400:

     

       69
       69
       +
           #                  ^^^^^^^^^^^^^^^^^^^^^^^

     

       70
       70
       +
           #

     

       71
       71
       +
           # TypeError: '>=' not supported between instances of 'Mock' and 'int'

     

       72
       72
       +
           stestr run -e <(echo "

     

       73
       73
       +
             cinderclient.tests.unit.test_client.ClientTest.test_keystone_request_raises_auth_failure_exception

     

       74
       74
       +
             cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method

     

       75
       75
       +
             cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method_raises_badrequest

     

       76
       76
       +
             cinderclient.tests.unit.test_client.ClientTest.test_sessionclient_request_method_raises_overlimit

     

       77
       77
       +
             cinderclient.tests.unit.test_shell.ShellTest.test_password_prompted

     

       78
       78
       +
           ")

     

       79
       79
       +
       

     

       67
       80
        
           runHook postCheck

     

       68
       81
        
         '';

     

       69
       82

+2 -10

pkgs/development/python-modules/swift/default.nix

···

       11
       11
        
         libredirect,

     

       12
       12
        
         lxml,

     

       13
       13
        
         mock,

     

       14
       14
       -
         netifaces,

     

       15
       14
        
         pastedeploy,

     

       16
       15
        
         pbr,

     

       17
       16
        
         pyeclib,

     
···

       32
       31
        
           inherit pname version;

     

       33
       32
        
           hash = "sha256-ZvdWWvPUdZIEadxV0nhqgTXhgJJu+hD1LnYCAP+9gpM=";

     

       34
       33
        
         };

     

       35
       35
       -
       

     

       36
       36
       -
         postPatch = ''

     

       37
       37
       -
           # files requires boto which is incompatible with python 3.9

     

       38
       38
       -
           rm test/functional/s3api/{__init__.py,s3_test_client.py}

     

       39
       39
       -
         '';

     

       40
       34
        
       

     

       41
       35
        
         nativeBuildInputs = [ installShellFiles ];

     

       42
       36
        
       

     
···

       45
       39
        
           setuptools

     

       46
       40
        
         ];

     

       47
       41
        
       

     

       48
       48
       -
         propagatedBuildInputs = [

     

       42
       42
       +
         dependencies = [

     

       49
       43
        
           cryptography

     

       50
       44
        
           eventlet

     

       51
       45
        
           greenlet

     

       52
       46
        
           lxml

     

       53
       53
       -
           netifaces

     

       54
       47
        
           pastedeploy

     

       55
       48
        
           pyeclib

     

       56
       49
        
           requests

     

       57
       57
       -
           setuptools

     

       58
       50
        
           six

     

       59
       51
        
           xattr

     

       60
       52
        
         ];

     

       61
       53
        
       

     

       62
       62
       -
         dependencies = [

     

       54
       54
       +
         nativeCheckInputs = [

     

       63
       55
        
           boto3

     

       64
       56
        
           mock

     

       65
       57
        
           stestr

+2 -1

pkgs/development/python-modules/testtools/default.nix

···

       36
       36
        
       

     

       37
       37
        
         meta = {

     

       38
       38
        
           description = "Set of extensions to the Python standard library's unit testing framework";

     

       39
       39
       -
           homepage = "https://pypi.python.org/pypi/testtools";

     

       39
       39
       +
           homepage = "https://github.com/testing-cabal/testtools";

     

       40
       40
        
           license = lib.licenses.mit;

     

       41
       41
       +
           maintainers = [ ];

     

       41
       42
        
         };

     

       42
       43
        
       }

+2 -2

pkgs/development/python-modules/wirerope/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "wirerope";

     

       14
       14
       -
         version = "0.4.8";

     

       14
       14
       +
         version = "1.0.0";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "youknowone";

     

       19
       19
        
           repo = "wirerope";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           hash = "sha256-Qb0gTCtVWdvZnwS6+PHoBr0syHtpfRI8ugh7zO7k9rk=";

     

       21
       21
       +
           hash = "sha256-oojnv+2+nwL/TJhN+QZ5eiV6WGHC3SCxBQrCri0aHQc=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = [ setuptools ];

+3

pkgs/os-specific/linux/kernel/common-config.nix

···

       313
       313
        
               NET_L3_MASTER_DEV = option yes;

     

       314
       314
        
               NET_FOU_IP_TUNNELS = option yes;

     

       315
       315
        
               IP_NF_TARGET_REDIRECT = module;

     

       316
       316
       +
               NETKIT = whenAtLeast "6.7" yes;

     

       316
       317
        
       

     

       317
       318
        
               PPP_MULTILINK = yes; # PPP multilink support

     

       318
       319
        
               PPP_FILTER = yes;

     
···

       537
       538
        
               DRM_I915_GVT_KVMGT = module;

     

       538
       539
        
               # Enable Hyper-V Synthetic DRM Driver

     

       539
       540
        
               DRM_HYPERV = whenAtLeast "5.14" module;

     

       541
       541
       +
               # And disable the legacy framebuffer driver when we have the new one

     

       542
       542
       +
               FB_HYPERV = whenAtLeast "5.14" no;

     

       540
       543
        
             }

     

       541
       544
        
             // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {

     

       542
       545
        
               # enable HDMI-CEC on RPi boards

+8 -8

pkgs/os-specific/linux/kernel/kernels-org.json

···

       1
       1
        
       {

     

       2
       2
        
           "testing": {

     

       3
       3
       -
               "version": "6.13-rc6",

     

       4
       4
       -
               "hash": "sha256:0wqb6ci0l5np31vfk1kv86j0gl44692r0nwi1qwqshcs5cgism85"

     

       3
       3
       +
               "version": "6.13-rc7",

     

       4
       4
       +
               "hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120"

     

       5
       5
        
           },

     

       6
       6
        
           "6.1": {

     

       7
       7
       -
               "version": "6.1.124",

     

       8
       8
       -
               "hash": "sha256:09wqb2wqrbg62kqn1r4vj5694r701lkvb9vdzj0slvv2rkazckpz"

     

       7
       7
       +
               "version": "6.1.125",

     

       8
       8
       +
               "hash": "sha256:0g0b23dm8kzijh9j1g4rv7b3r2lzz53g26xmz4zgchkybxfkbwnr"

     

       9
       9
        
           },

     

       10
       10
        
           "5.15": {

     

       11
       11
        
               "version": "5.15.176",

     
···

       20
       20
        
               "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy"

     

       21
       21
        
           },

     

       22
       22
        
           "6.6": {

     

       23
       23
       -
               "version": "6.6.71",

     

       24
       24
       -
               "hash": "sha256:0kkj5v1hd6z8z1vhvdly303kabvp2a93zb89pagm79ng5nx1b5r1"

     

       23
       23
       +
               "version": "6.6.72",

     

       24
       24
       +
               "hash": "sha256:0fggpba886340xi8gkxc6hmzplcm69nliddql3d6hn8djcafbfgy"

     

       25
       25
        
           },

     

       26
       26
        
           "6.11": {

     

       27
       27
        
               "version": "6.11.11",

     

       28
       28
        
               "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"

     

       29
       29
        
           },

     

       30
       30
        
           "6.12": {

     

       31
       31
       -
               "version": "6.12.9",

     

       32
       32
       -
               "hash": "sha256:1d5f4rn6d5hyw94jqdcc7ay0y1s8lmhm3hxss90b6c89vxh07gl7"

     

       31
       31
       +
               "version": "6.12.10",

     

       32
       32
       +
               "hash": "sha256:15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa"

     

       33
       33
        
           }

     

       34
       34
        
       }

+3 -3

pkgs/servers/mautrix-signal/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildGoModule rec {

     

       18
       18
        
         pname = "mautrix-signal";

     

       19
       19
       -
         version = "0.7.4";

     

       19
       19
       +
         version = "0.7.5";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "mautrix";

     

       23
       23
        
           repo = "signal";

     

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

     

       25
       25
       -
           hash = "sha256-1UI2oYDnmwy9+URBMA2yTBMEoFsE8qnkhn7E0l/lOTs=";

     

       25
       25
       +
           hash = "sha256-iBZoVfHec9g+W7xaBAAew/aY9h/errwLdC05biFaZ78=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         buildInputs =

     
···

       38
       38
        
       

     

       39
       39
        
         CGO_LDFLAGS = lib.optional withGoolm [ "-lstdc++" ];

     

       40
       40
        
       

     

       41
       41
       -
         vendorHash = "sha256-ADuW6KMNUwJeGqFlQsJ8qSI0alPQpSAFx1zrhwsAmsI=";

     

       41
       41
       +
         vendorHash = "sha256-RKBewWc98+WpdpXF4QA/ULyZXDR0CKym8KdyeSMd0KA=";

     

       42
       42
        
       

     

       43
       43
        
         doCheck = true;

     

       44
       44
        
         preCheck =

+2

pkgs/top-level/python-packages.nix

···

       11800
       11800
        
       

     

       11801
       11801
        
         pygdbmi = callPackage ../development/python-modules/pygdbmi { };

     

       11802
       11802
        
       

     

       11803
       11803
       +
         pygeocodio = callPackage ../development/python-modules/pygeocodio { };

     

       11804
       11804
       +
       

     

       11803
       11805
        
         pygetwindow = callPackage ../development/python-modules/pygetwindow { };

     

       11804
       11806
        
       

     

       11805
       11807
        
         pygit2 = callPackage ../development/python-modules/pygit2 { };