Commit 2c2f1d04 authored by Daniel Baker's avatar Daniel Baker
Browse files

Fix the update script so it points at the new nixos/nixfmt repo and bump to... 

Fix the update script so it points at the new nixos/nixfmt repo and bump to the lasest version on master.
parent 2c26a182

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

+1 −1
Original line number Diff line number Diff line 
2024-03-01
 
2024-05-28

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

+8 −7
Original line number Diff line number Diff line 
# 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";

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

+0 −7
Original line number Diff line number Diff line
@@ -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.

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

+3 −3
Original line number Diff line number Diff line
@@ -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"