commit 455cabf21c6cc3fc866b2d73090666eea0a00025 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #317552 from djacu/bump-fix-nixfmt-rfc-style

nixfmt-rfc-style: 2024-03-01 -> 2024-05-28

authored by tomberek and committed by GitHub 2 years ago 455cabf2 6c50c9f8

+12 -18

4 changed files

expand all

unified split

pkgs

by-name

nixfmt-rfc-style

date.txt

generated-package.nix

package.nix

update.sh

+1 -1

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

··· 1 - 2024-03-01

··· 1 + 2024-05-28

+8 -7

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

··· 1 # This file has been autogenerate with cabal2nix. 2 # Update via ./update.sh 3 { mkDerivation, base, cmdargs, directory, fetchzip, filepath, lib 4 - , megaparsec, mtl, parser-combinators, safe-exceptions, scientific 5 - , text, transformers, unix 6 }: 7 mkDerivation { 8 pname = "nixfmt"; 9 - version = "0.5.0"; 10 src = fetchzip { 11 - url = "https://github.com/piegamesde/nixfmt/archive/2b5ee820690bae64cb4003e46917ae43541e3e0b.tar.gz"; 12 - sha256 = "1i1jbc1q4gd7fpilwy6s3a583yl5l8d8rlmipygj61mpclg9ihqg"; 13 }; 14 isLibrary = true; 15 isExecutable = true; 16 libraryHaskellDepends = [ 17 - base megaparsec mtl parser-combinators scientific text transformers 18 ]; 19 executableHaskellDepends = [ 20 base cmdargs directory filepath safe-exceptions text unix 21 ]; 22 jailbreak = true; 23 - homepage = "https://github.com/serokell/nixfmt"; 24 description = "An opinionated formatter for Nix"; 25 license = lib.licenses.mpl20; 26 mainProgram = "nixfmt";

··· 1 # This file has been autogenerate with cabal2nix. 2 # Update via ./update.sh 3 { mkDerivation, base, cmdargs, directory, fetchzip, filepath, lib 4 + , megaparsec, mtl, parser-combinators, pretty-simple 5 + , safe-exceptions, scientific, text, transformers, unix 6 }: 7 mkDerivation { 8 pname = "nixfmt"; 9 + version = "0.6.0"; 10 src = fetchzip { 11 + url = "https://github.com/nixos/nixfmt/archive/c67a7b65906bd2432730929bd0e4957659c95b8e.tar.gz"; 12 + sha256 = "03f00vwlla6i3m125389h3xjsl5xm07630ahm4w5gqwq1007y3r2"; 13 }; 14 isLibrary = true; 15 isExecutable = true; 16 libraryHaskellDepends = [ 17 + base megaparsec mtl parser-combinators pretty-simple scientific 18 + text transformers 19 ]; 20 executableHaskellDepends = [ 21 base cmdargs directory filepath safe-exceptions text unix 22 ]; 23 jailbreak = true; 24 + homepage = "https://github.com/NixOS/nixfmt"; 25 description = "An opinionated formatter for Nix"; 26 license = lib.licenses.mpl20; 27 mainProgram = "nixfmt";

-7

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

··· 14 15 passthru.updateScript = ./update.sh; 16 17 - patches = [ 18 - (fetchpatch { 19 - url = "https://github.com/serokell/nixfmt/commit/ca9c8975ed671112fdfce94f2e9e2ad3de480c9a.patch"; 20 - hash = "sha256-UOSAYahSKBsqPMVcQJ3H26Eg2xpPAsNOjYMI6g+WTYU="; 21 - }) 22 - ]; 23 - 24 maintainers = lib.teams.formatter.members; 25 26 # These tests can be run with the following command.

··· 14 15 passthru.updateScript = ./update.sh; 16 17 maintainers = lib.teams.formatter.members; 18 19 # These tests can be run with the following command.

+3 -3

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

··· 13 date_file="${script_dir}/date.txt" 14 15 # This is the latest version of nixfmt-rfc-style branch on GitHub. 16 - new_version=$(curl --silent https://api.github.com/repos/piegamesde/nixfmt/git/refs/heads/rfc101-style | jq '.object.sha' --raw-output) 17 - new_date=$(curl --silent https://api.github.com/repos/piegamesde/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output) 18 19 echo "Updating nixfmt-rfc-style to version $new_date." 20 echo "Running cabal2nix and outputting to ${derivation_file}..." ··· 25 EOF 26 27 cabal2nix --jailbreak \ 28 - "https://github.com/piegamesde/nixfmt/archive/${new_version}.tar.gz" \ 29 >> "$derivation_file" 30 31 date --date="$new_date" -I > "$date_file"

··· 13 date_file="${script_dir}/date.txt" 14 15 # This is the latest version of nixfmt-rfc-style branch on GitHub. 16 + new_version=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/refs/heads/master | jq '.object.sha' --raw-output) 17 + new_date=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output) 18 19 echo "Updating nixfmt-rfc-style to version $new_date." 20 echo "Running cabal2nix and outputting to ${derivation_file}..." ··· 25 EOF 26 27 cabal2nix --jailbreak \ 28 + "https://github.com/nixos/nixfmt/archive/${new_version}.tar.gz" \ 29 >> "$derivation_file" 30 31 date --date="$new_date" -I > "$date_file"