jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
nixfmt-rfc-style: 2024-03-01 -> 2024-05-28
This commit is contained in:
tomberek 2024-06-05 21:40:02 -04:00 committed by GitHub
commit 455cabf21c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
2024-03-01
2024-05-28

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

@ -1,26 +1,27 @@
# This file has been autogenerate with cabal2nix.
# Update via ./update.sh
{ mkDerivation, base, cmdargs, directory, fetchzip, filepath, lib
, megaparsec, mtl, parser-combinators, safe-exceptions, scientific
, text, transformers, unix
, megaparsec, mtl, parser-combinators, pretty-simple
, safe-exceptions, scientific, text, transformers, unix
}:
mkDerivation {
pname = "nixfmt";
version = "0.5.0";
version = "0.6.0";
src = fetchzip {
url = "https://github.com/piegamesde/nixfmt/archive/2b5ee820690bae64cb4003e46917ae43541e3e0b.tar.gz";
sha256 = "1i1jbc1q4gd7fpilwy6s3a583yl5l8d8rlmipygj61mpclg9ihqg";
url = "https://github.com/nixos/nixfmt/archive/c67a7b65906bd2432730929bd0e4957659c95b8e.tar.gz";
sha256 = "03f00vwlla6i3m125389h3xjsl5xm07630ahm4w5gqwq1007y3r2";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base megaparsec mtl parser-combinators scientific text transformers
base megaparsec mtl parser-combinators pretty-simple scientific
text transformers
];
executableHaskellDepends = [
base cmdargs directory filepath safe-exceptions text unix
];
jailbreak = true;
homepage = "https://github.com/serokell/nixfmt";
homepage = "https://github.com/NixOS/nixfmt";
description = "An opinionated formatter for Nix";
license = lib.licenses.mpl20;
mainProgram = "nixfmt";

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

@ -14,13 +14,6 @@ let
passthru.updateScript = ./update.sh;
patches = [
(fetchpatch {
url = "https://github.com/serokell/nixfmt/commit/ca9c8975ed671112fdfce94f2e9e2ad3de480c9a.patch";
hash = "sha256-UOSAYahSKBsqPMVcQJ3H26Eg2xpPAsNOjYMI6g+WTYU=";
})
];
maintainers = lib.teams.formatter.members;
# These tests can be run with the following command.

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

@ -13,8 +13,8 @@ derivation_file="${script_dir}/generated-package.nix"
date_file="${script_dir}/date.txt"
# This is the latest version of nixfmt-rfc-style branch on GitHub.
new_version=$(curl --silent https://api.github.com/repos/piegamesde/nixfmt/git/refs/heads/rfc101-style | jq '.object.sha' --raw-output)
new_date=$(curl --silent https://api.github.com/repos/piegamesde/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output)
new_version=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/refs/heads/master | jq '.object.sha' --raw-output)
new_date=$(curl --silent https://api.github.com/repos/nixos/nixfmt/git/commits/"$new_version" | jq '.committer.date' --raw-output)
echo "Updating nixfmt-rfc-style to version $new_date."
echo "Running cabal2nix and outputting to ${derivation_file}..."
@ -25,7 +25,7 @@ cat > "$derivation_file" << EOF
EOF
cabal2nix --jailbreak \
"https://github.com/piegamesde/nixfmt/archive/${new_version}.tar.gz" \
"https://github.com/nixos/nixfmt/archive/${new_version}.tar.gz" \
>> "$derivation_file"
date --date="$new_date" -I > "$date_file"