From 73fc406c3c5382304e83aacad74d3136bf1df0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Tue, 14 Oct 2025 11:50:52 +0100 Subject: [PATCH] temp --- .../devshell/env-var/tempwork/flake.lock | 60 ------------------- .../tempwork/flake.nix | 7 +-- 2 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 source/recipes/devshell/env-var/tempwork/flake.lock rename source/recipes/devshell/{env-var => haskell-flake}/tempwork/flake.nix (65%) diff --git a/source/recipes/devshell/env-var/tempwork/flake.lock b/source/recipes/devshell/env-var/tempwork/flake.lock deleted file mode 100644 index b4ba0e0..0000000 --- a/source/recipes/devshell/env-var/tempwork/flake.lock +++ /dev/null @@ -1,60 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1760435515, - "narHash": "sha256-E9D5sWHmPCmWsrCB3Jogvr/7ODiVaKynDrOpG4ba2tI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "db25466bd95abdbe3012be2900a5562fcfb95d51", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/source/recipes/devshell/env-var/tempwork/flake.nix b/source/recipes/devshell/haskell-flake/tempwork/flake.nix similarity index 65% rename from source/recipes/devshell/env-var/tempwork/flake.nix rename to source/recipes/devshell/haskell-flake/tempwork/flake.nix index 7d462f8..331af5e 100644 --- a/source/recipes/devshell/env-var/tempwork/flake.nix +++ b/source/recipes/devshell/haskell-flake/tempwork/flake.nix @@ -4,17 +4,16 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils, pandoc-columns }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; + customGhc = pkgs.haskellPackages.ghcWithPackages (p: with p; [ extra ]); in { devShells = rec { default = pkgs.mkShell { - shellHook = '' - export FOO="bar" - ''; + buildInputs = [ customGhc ]; }; }; }