diff --git a/pkgs/tools/nix/devour-flake/default.nix b/pkgs/tools/nix/devour-flake/default.nix deleted file mode 100644 index a42483653550..000000000000 --- a/pkgs/tools/nix/devour-flake/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ writeShellApplication -, fetchFromGitHub -, nix -}: - -let - devour-flake = fetchFromGitHub { - owner = "srid"; - repo = "devour-flake"; - rev = "v2"; - hash = "sha256-CZedJtbZlWAbv/b/aYgOEFd9vcTBn/oJNI3p29UitLk="; - }; -in -writeShellApplication { - name = "devour-flake"; - runtimeInputs = [ nix ]; - text = '' - FLAKE="$1" - shift 1 || true - - nix build ${devour-flake}#default \ - "$@" \ - -L --no-link --print-out-paths \ - --override-input flake "$FLAKE" \ - | xargs cat - ''; -} diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index 0d881d6976ed..bc78b3aab59a 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -1,32 +1,37 @@ { lib, stdenv , rustPlatform , fetchCrate +, fetchFromGitHub , libiconv , openssl , pkg-config , Security -, devour-flake }: rustPlatform.buildRustPackage rec { pname = "nixci"; - version = "0.1.3"; + version = "0.2.0"; src = fetchCrate { inherit version; pname = "nixci"; - hash = "sha256-sM/1G1mf+msWbG4CX/pZNt4FmSKR2hWXdcq5h7W1AM0="; + hash = "sha256-Q3V/JL64xkIj0X0NSMRTjRAP3PJC9ouj3CmEscVWdns="; }; - cargoHash = "sha256-PKBNQKuWV4PE7iSKr+LugayroFjDBT4/vyyjJiw/E+I="; + cargoHash = "sha256-tjk91AaPsMLfXYB2o1HTTxb6Qr3l8BABPStrKEGvbtM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; # The rust program expects an environment (at build time) that points to the - # devour-flake executable. - DEVOUR_FLAKE = lib.getExe devour-flake; + # devour-flake flake. + env.DEVOUR_FLAKE = fetchFromGitHub { + owner = "srid"; + repo = "devour-flake"; + rev = "v3"; + hash = "sha256-O51F4YFOzlaQAc9b6xjkAqpvrvCtw/Os2M7TU0y4SKQ="; + }; meta = with lib; { description = "Define and build CI for Nix projects anywhere"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 301a4bdb9574..2c8b406ef327 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -597,8 +597,6 @@ with pkgs; dec-decode = callPackage ../development/tools/dec-decode { }; - devour-flake = callPackage ../tools/nix/devour-flake { }; - dnf5 = callPackage ../tools/package-management/dnf5 { }; documenso = callPackage ../applications/office/documenso { };