From 4943deba5c4138c8e0a42ee23ecc5310089e304b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Fri, 5 Sep 2025 20:04:52 +0100 Subject: [PATCH] temp --- .../{non-flake => nixpkg}/tempwork/flake.lock | 17 ----------------- .../{non-flake => nixpkg}/tempwork/flake.nix | 11 ++--------- 2 files changed, 2 insertions(+), 26 deletions(-) rename source/recipes/devshell/{non-flake => nixpkg}/tempwork/flake.lock (73%) rename source/recipes/devshell/{non-flake => nixpkg}/tempwork/flake.nix (56%) diff --git a/source/recipes/devshell/non-flake/tempwork/flake.lock b/source/recipes/devshell/nixpkg/tempwork/flake.lock similarity index 73% rename from source/recipes/devshell/non-flake/tempwork/flake.lock rename to source/recipes/devshell/nixpkg/tempwork/flake.lock index 25e25ef..36f8dcd 100644 --- a/source/recipes/devshell/non-flake/tempwork/flake.lock +++ b/source/recipes/devshell/nixpkg/tempwork/flake.lock @@ -18,22 +18,6 @@ "type": "github" } }, - "hello-nix": { - "flake": false, - "locked": { - "lastModified": 1676213208, - "narHash": "sha256-Zds5C+f5sA3w+j85EsAQjte0zeHqubMVPGYn5lGwATo=", - "ref": "refs/heads/main", - "rev": "aa2c87f8b89578b069b09fdb2be30a0c9d8a77d8", - "revCount": 4, - "type": "git", - "url": "https://codeberg.org/mhwombat/hello-nix" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/mhwombat/hello-nix" - } - }, "nixpkgs": { "locked": { "lastModified": 1757096966, @@ -52,7 +36,6 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "hello-nix": "hello-nix", "nixpkgs": "nixpkgs" } }, diff --git a/source/recipes/devshell/non-flake/tempwork/flake.nix b/source/recipes/devshell/nixpkg/tempwork/flake.nix similarity index 56% rename from source/recipes/devshell/non-flake/tempwork/flake.nix rename to source/recipes/devshell/nixpkg/tempwork/flake.nix index 560bc6e..83db46c 100644 --- a/source/recipes/devshell/non-flake/tempwork/flake.nix +++ b/source/recipes/devshell/nixpkg/tempwork/flake.nix @@ -2,13 +2,9 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; - hello-nix = { - url = "git+https://codeberg.org/mhwombat/hello-nix"; - flake = false; - }; }; - outputs = { self, nixpkgs, flake-utils, hello-nix }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -16,10 +12,7 @@ { devShells = rec { default = pkgs.mkShell { - shellHook = - '' - PATH=${hello-nix}:$PATH - ''; + packages = [ pkgs.cowsay ]; }; }; }