Skip to content

Commit

Permalink
nixfmt-rfc-style: 2024-07-12 -> 2024-08-08
Browse files Browse the repository at this point in the history
- nixfmt --version shows the actual version, closes NixOS/nixfmt#229
- Support for pipe operators
- Fix for an infinite recursion
  • Loading branch information
dasJ committed Aug 8, 2024
1 parent 3c02efe commit 4b30e1a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pkgs/by-name/ni/nixfmt-rfc-style/date.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-07-12
2024-08-08
14 changes: 8 additions & 6 deletions pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# This file has been autogenerate with cabal2nix.
# Update via ./update.sh
{ mkDerivation, base, cmdargs, directory, fetchzip, filepath, lib
, megaparsec, mtl, parser-combinators, pretty-simple
, safe-exceptions, scientific, text, transformers, unix
{ mkDerivation, base, bytestring, cmdargs, directory, fetchzip
, file-embed, filepath, lib, megaparsec, mtl, parser-combinators
, pretty-simple, safe-exceptions, scientific, text, transformers
, unix
}:
mkDerivation {
pname = "nixfmt";
version = "0.6.0";
src = fetchzip {
url = "https://github.com/nixos/nixfmt/archive/83de1eceaae8a891ae52a3a2b82226540207309e.tar.gz";
sha256 = "0lnl9vlbyrfplmq3hpmpjlmhjdwwbgk900wgi25ib27v0mlgpnxp";
url = "https://github.com/nixos/nixfmt/archive/a707c70ab6fed71032ac55bb1029306a50a80d34.tar.gz";
sha256 = "1v5hch8j1w1bvn2r4xz4ym60ykgsc074y28vpin9qraagv06x8sm";
};
isLibrary = true;
isExecutable = true;
Expand All @@ -18,7 +19,8 @@ mkDerivation {
text transformers
];
executableHaskellDepends = [
base cmdargs directory filepath safe-exceptions text unix
base bytestring cmdargs directory file-embed filepath
safe-exceptions text unix
];
jailbreak = true;
homepage = "https://github.com/NixOS/nixfmt";
Expand Down
6 changes: 5 additions & 1 deletion pkgs/by-name/ni/nixfmt-rfc-style/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@
let
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;

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

passthru.updateScript = ./update.sh;

maintainers = lib.teams.formatter.members;

preBuild = ''
echo -n 'nixpkgs-${version}' > .version
'';

# These tests can be run with the following command.
#
# $ nix-build -A nixfmt-rfc-style.tests
Expand Down

0 comments on commit 4b30e1a

Please sign in to comment.