commit b3bc1e31d0fc920cc11a79ed4f4bd202961addfb · pyrox.dev/nixpkgs

+1

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

···

       8
       8
        
         this release sets the default march level to `la64v1.0`, covering the desktop and server processors of 3X5000

     

       9
       9
        
         and newer series. However, embedded chips without LSX (Loongson SIMD eXtension), such as 2K0300 SoC, are not

     

       10
       10
        
         supported. `pkgsCross.loongarch64-linux-embedded` can be used to build software and systems for these platforms.

     

       11
       11
       +
       - The official Nix formatter `nixfmt` is now stable and available as `pkgs.nixfmt`, deprecating the temporary `pkgs.nixfmt-rfc-style` attribute. The classic `nixfmt` will stay available for some more time as `pkgs.nixfmt-classic`.

     

       11
       12
        
       

     

       12
       13
        
       ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities}

     

       13
       14

-1

pkgs/by-name/ni/nixfmt-rfc-style/date.txt

+3 -3

pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix pkgs/by-name/ni/nixfmt/generated-package.nix

···

       23
       23
        
       }:

     

       24
       24
        
       mkDerivation {

     

       25
       25
        
         pname = "nixfmt";

     

       26
       26
       -
         version = "0.6.0";

     

       26
       26
       +
         version = "1.0.0";

     

       27
       27
        
         src = fetchzip {

     

       28
       28
       -
           url = "https://github.com/nixos/nixfmt/archive/65af4b69133d19f534d97746c97c2d5b464f43b4.tar.gz";

     

       29
       29
       -
           sha256 = "0l0w3janvss1n1j7qkcml97zndm2jm2gbrzzs9d8l0ixnrw0cd5r";

     

       28
       28
       +
           url = "https://github.com/nixos/nixfmt/archive/v1.0.0.tar.gz";

     

       29
       29
       +
           sha256 = "0iy2p893b2b5y4mvhy0d62675a7nd8fc6jm9mr32v9h2baj9ii3p";

     

       30
       30
        
         };

     

       31
       31
        
         isLibrary = true;

     

       32
       32
        
         isExecutable = true;

-36

pkgs/by-name/ni/nixfmt-rfc-style/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         haskell,

     

       3
       3
       -
         haskellPackages,

     

       4
       4
       -
         lib,

     

       5
       5
       -
         runCommand,

     

       6
       6
       -
         nixfmt-rfc-style,

     

       7
       7
       -
       }:

     

       8
       8
       -
       let

     

       9
       9
       -
         inherit (haskell.lib.compose) overrideCabal justStaticExecutables;

     

       10
       10
       -
       

     

       11
       11
       -
         overrides = rec {

     

       12
       12
       -
           version = "unstable-${lib.fileContents ./date.txt}";

     

       13
       13
       -
       

     

       14
       14
       -
           passthru.updateScript = ./update.sh;

     

       15
       15
       -
       

     

       16
       16
       -
           teams = [ lib.teams.formatter ];

     

       17
       17
       -
       

     

       18
       18
       -
           preBuild = ''

     

       19
       19
       -
             echo -n 'nixpkgs-${version}' > .version

     

       20
       20
       -
           '';

     

       21
       21
       -
       

     

       22
       22
       -
           # These tests can be run with the following command.

     

       23
       23
       -
           #

     

       24
       24
       -
           # $ nix-build -A nixfmt-rfc-style.tests

     

       25
       25
       -
           passthru.tests =

     

       26
       26
       -
             runCommand "nixfmt-rfc-style-tests" { nativeBuildInputs = [ nixfmt-rfc-style ]; }

     

       27
       27
       -
               ''

     

       28
       28
       -
                 nixfmt --version > $out

     

       29
       29
       -
               '';

     

       30
       30
       -
         };

     

       31
       31
       -
         raw-pkg = haskellPackages.callPackage ./generated-package.nix { };

     

       32
       32
       -
       in

     

       33
       33
       -
       lib.pipe raw-pkg [

     

       34
       34
       -
         (overrideCabal overrides)

     

       35
       35
       -
         justStaticExecutables

     

       36
       36
       -
       ]

-33

pkgs/by-name/ni/nixfmt-rfc-style/update.sh

···

       1
       1
       -
       #!/usr/bin/env nix-shell

     

       2
       2
       -
       #!nix-shell -i bash -p cabal2nix curl jq

     

       3
       3
       -
       #

     

       4
       4
       -
       # This script will update the nixfmt-rfc-style derivation to the latest version using

     

       5
       5
       -
       # cabal2nix.

     

       6
       6
       -
       

     

       7
       7
       -
       set -eo pipefail

     

       8
       8
       -
       

     

       9
       9
       -
       # This is the directory of this update.sh script.

     

       10
       10
       -
       script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

     

       11
       11
       -
       

     

       12
       12
       -
       derivation_file="${script_dir}/generated-package.nix"

     

       13
       13
       -
       date_file="${script_dir}/date.txt"

     

       14
       14
       -
       

     

       15
       15
       -
       # This is the latest version of nixfmt-rfc-style branch on GitHub.

     

       16
       16
       -
       new_version=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/refs/heads/master | jq '.object.sha' --raw-output)

     

       17
       17
       -
       new_date=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output)

     

       18
       18
       -
       

     

       19
       19
       -
       echo "Updating nixfmt-rfc-style to version $new_date."

     

       20
       20
       -
       echo "Running cabal2nix and outputting to ${derivation_file}..."

     

       21
       21
       -
       

     

       22
       22
       -
       cat > "$derivation_file" << EOF

     

       23
       23
       -
       # This file has been autogenerate with cabal2nix.

     

       24
       24
       -
       # Update via ./update.sh

     

       25
       25
       -
       EOF

     

       26
       26
       -
       

     

       27
       27
       -
       cabal2nix --jailbreak \

     

       28
       28
       -
         "https://github.com/nixos/nixfmt/archive/${new_version}.tar.gz" \

     

       29
       29
       -
         >> "$derivation_file"

     

       30
       30
       -
       

     

       31
       31
       -
       date --date="$new_date" -I > "$date_file"

     

       32
       32
       -
       

     

       33
       33
       -
       echo "Finished."

+28

pkgs/by-name/ni/nixfmt/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         haskell,

     

       3
       3
       +
         haskellPackages,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         runCommand,

     

       6
       6
       +
         nixfmt,

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         inherit (haskell.lib.compose) overrideCabal justStaticExecutables;

     

       10
       10
       +
       

     

       11
       11
       +
         overrides = {

     

       12
       12
       +
           passthru.updateScript = ./update.sh;

     

       13
       13
       +
       

     

       14
       14
       +
           teams = [ lib.teams.formatter ];

     

       15
       15
       +
       

     

       16
       16
       +
           # These tests can be run with the following command.

     

       17
       17
       +
           #

     

       18
       18
       +
           # $ nix-build -A nixfmt.tests

     

       19
       19
       +
           passthru.tests = runCommand "nixfmt-tests" { nativeBuildInputs = [ nixfmt ]; } ''

     

       20
       20
       +
             nixfmt --version > $out

     

       21
       21
       +
           '';

     

       22
       22
       +
         };

     

       23
       23
       +
         raw-pkg = haskellPackages.callPackage ./generated-package.nix { };

     

       24
       24
       +
       in

     

       25
       25
       +
       lib.pipe raw-pkg [

     

       26
       26
       +
         (overrideCabal overrides)

     

       27
       27
       +
         justStaticExecutables

     

       28
       28
       +
       ]

+27

pkgs/by-name/ni/nixfmt/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p cabal2nix curl jq

     

       3
       3
       +
       #

     

       4
       4
       +
       # This script will update the nixfmt derivation to the latest version using

     

       5
       5
       +
       # cabal2nix.

     

       6
       6
       +
       

     

       7
       7
       +
       set -eo pipefail

     

       8
       8
       +
       

     

       9
       9
       +
       # This is the directory of this update.sh script.

     

       10
       10
       +
       script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

     

       11
       11
       +
       derivation_file="${script_dir}/generated-package.nix"

     

       12
       12
       +
       

     

       13
       13
       +
       release_tag=$(curl --silent https://api.github.com/repos/NixOS/nixfmt/releases/latest | jq '.tag_name' --raw-output)

     

       14
       14
       +
       

     

       15
       15
       +
       echo "Updating nixfmt to version $release_tag."

     

       16
       16
       +
       echo "Running cabal2nix and outputting to ${derivation_file}..."

     

       17
       17
       +
       

     

       18
       18
       +
       cat > "$derivation_file" << EOF

     

       19
       19
       +
       # This file has been autogenerate with cabal2nix.

     

       20
       20
       +
       # Update via ./update.sh

     

       21
       21
       +
       EOF

     

       22
       22
       +
       

     

       23
       23
       +
       cabal2nix --jailbreak \

     

       24
       24
       +
         "https://github.com/nixos/nixfmt/archive/${release_tag}.tar.gz" \

     

       25
       25
       +
         >> "$derivation_file"

     

       26
       26
       +
       

     

       27
       27
       +
       echo "Finished."

+7 -1

pkgs/top-level/aliases.nix

···

       1412
       1412
        
         nixStable = nixVersions.stable; # Added 2022-01-24

     

       1413
       1413
        
         nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22

     

       1414
       1414
        
         nix_2_3 = nixVersions.nix_2_3;

     

       1415
       1415
       -
         nixfmt = lib.warnOnInstantiate "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31

     

       1415
       1415
       +
         nixfmt-rfc-style =

     

       1416
       1416
       +
           if lib.oldestSupportedReleaseIsAtLeast 2511 then

     

       1417
       1417
       +
             lib.warnOnInstantiate

     

       1418
       1418
       +
               "nixfmt-rfc-style is now the same as pkgs.nixfmt which should be used instead."

     

       1419
       1419
       +
               nixfmt # Added 2025-07-14

     

       1420
       1420
       +
           else

     

       1421
       1421
       +
             nixfmt;

     

       1416
       1422
        
       

     

       1417
       1423
        
         # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.

     

       1418
       1424