From c25a0c2650f05778faaee297fe4c154f5948cb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Mon, 15 Sep 2025 14:48:18 +0100 Subject: [PATCH] temp --- .../devshell/haskell-pkg/tempwork/Main.hs | 6 + .../devshell/haskell-pkg/tempwork/flake.lock | 142 ++++++++++++++++++ .../tempwork/flake.nix | 6 +- .../devshell/nixpkg/tempwork/flake.lock | 60 -------- 4 files changed, 152 insertions(+), 62 deletions(-) create mode 100644 source/recipes/devshell/haskell-pkg/tempwork/Main.hs create mode 100644 source/recipes/devshell/haskell-pkg/tempwork/flake.lock rename source/recipes/devshell/{nixpkg => haskell-pkg}/tempwork/flake.nix (57%) delete mode 100644 source/recipes/devshell/nixpkg/tempwork/flake.lock diff --git a/source/recipes/devshell/haskell-pkg/tempwork/Main.hs b/source/recipes/devshell/haskell-pkg/tempwork/Main.hs new file mode 100644 index 0000000..96349a1 --- /dev/null +++ b/source/recipes/devshell/haskell-pkg/tempwork/Main.hs @@ -0,0 +1,6 @@ +import Text.Pandoc.Filters.Columns + +main :: IO () +main = do + putStrLn "Prove we have access to the pandoc-columns package" + print $ defaultColSpec diff --git a/source/recipes/devshell/haskell-pkg/tempwork/flake.lock b/source/recipes/devshell/haskell-pkg/tempwork/flake.lock new file mode 100644 index 0000000..e3c998d --- /dev/null +++ b/source/recipes/devshell/haskell-pkg/tempwork/flake.lock @@ -0,0 +1,142 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "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" + } + }, + "haskell-flake": { + "locked": { + "lastModified": 1756607542, + "narHash": "sha256-+99fEAk0HwjYgIW2tEOs7ayBDxnU9NAM5E29ZxgyX40=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "73e3891fb135c679a1c30fae4b101e5b41b8ca61", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "haskell-flake", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1757942231, + "narHash": "sha256-yM1FFsRiyESij/lzbdBMCUoFOKMoShHu0CAexnBWzTM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dd16e0b60390586a261a4e28fc180a91212fe010", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1756911493, + "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pandoc-columns": { + "inputs": { + "flake-parts": "flake-parts", + "haskell-flake": "haskell-flake", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1757244346, + "narHash": "sha256-Ewpv8f+CvF0du1egjRJoeOZhKsdoqPkb2ecrwTPI+os=", + "path": "/home/amy/github/pandoc-columns", + "type": "path" + }, + "original": { + "path": "/home/amy/github/pandoc-columns", + "type": "path" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "pandoc-columns": "pandoc-columns" + } + }, + "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/nixpkg/tempwork/flake.nix b/source/recipes/devshell/haskell-pkg/tempwork/flake.nix similarity index 57% rename from source/recipes/devshell/nixpkg/tempwork/flake.nix rename to source/recipes/devshell/haskell-pkg/tempwork/flake.nix index 83db46c..35cc9c0 100644 --- a/source/recipes/devshell/nixpkg/tempwork/flake.nix +++ b/source/recipes/devshell/haskell-pkg/tempwork/flake.nix @@ -2,17 +2,19 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; + pandoc-columns.url = "/home/amy/github/pandoc-columns"; }; - 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; [ pandoc-columns ]); in { devShells = rec { default = pkgs.mkShell { - packages = [ pkgs.cowsay ]; + buildInputs = [ customGhc ]; }; }; } diff --git a/source/recipes/devshell/nixpkg/tempwork/flake.lock b/source/recipes/devshell/nixpkg/tempwork/flake.lock deleted file mode 100644 index 7091eb7..0000000 --- a/source/recipes/devshell/nixpkg/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": 1757942231, - "narHash": "sha256-yM1FFsRiyESij/lzbdBMCUoFOKMoShHu0CAexnBWzTM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dd16e0b60390586a261a4e28fc180a91212fe010", - "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 -}