From 21ddbe384e6d992b8d9f8f608410b2fe21cb80d8 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 13 Oct 2025 12:45:33 -0600 Subject: [PATCH] update nix flake --- .gitignore | 2 + flake.lock | 265 ++++++++++++++++++++++++++++++++++++----------------- flake.nix | 36 +++++--- 3 files changed, 206 insertions(+), 97 deletions(-) diff --git a/.gitignore b/.gitignore index c42eee2..20a7c51 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ man/* !man/index.txt !man/*.css !man/*.ronn +.direnv +.envrc diff --git a/flake.lock b/flake.lock index 78b3c65..2cee93a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -36,48 +52,128 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "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" + } + }, "freckle": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs-22-11": "nixpkgs-22-11", + "haskell-openapi-code-generator": "haskell-openapi-code-generator", + "nix-github-actions": "nix-github-actions", "nixpkgs-23-05": "nixpkgs-23-05", - "nixpkgs-master-2023-05-06": "nixpkgs-master-2023-05-06", - "nixpkgs-master-2023-07-18": "nixpkgs-master-2023-07-18", - "nixpkgs-master-2023-09-15": "nixpkgs-master-2023-09-15", - "nixpkgs-master-2024-01-27": "nixpkgs-master-2024-01-27", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-stable-2023-07-25": "nixpkgs-stable-2023-07-25", - "nixpkgs-unstable-2023-10-21": "nixpkgs-unstable-2023-10-21", - "nixpkgs-unstable-2024-02-20": "nixpkgs-unstable-2024-02-20" + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-24-05": "nixpkgs-24-05", + "nixpkgs-24-11": "nixpkgs-24-11", + "nixpkgs-25-05": "nixpkgs-25-05", + "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { "dir": "main", - "lastModified": 1708474311, - "narHash": "sha256-nO5JLvAshKODkumut9gnMrb9Uqh9PPNnWfXPM3P/kRw=", - "ref": "refs/heads/main", - "rev": "ace145f01993ddc109d86a4c47e37ffe06481df3", - "revCount": 29, - "type": "git", - "url": "ssh://git@github.com/freckle/flakes?dir=main" + "lastModified": 1760374014, + "narHash": "sha256-BoNvJ+VFtSPO8+wnyh1Qrn4XXKGxvUeb2xRNceVSFuo=", + "owner": "freckle", + "repo": "flakes", + "rev": "872341c9d85213db04b0ef7cad9e05b362af89c6", + "type": "github" }, "original": { "dir": "main", - "type": "git", - "url": "ssh://git@github.com/freckle/flakes?dir=main" + "owner": "freckle", + "repo": "flakes", + "type": "github" } }, - "nixpkgs-22-11": { + "gitignore": { + "inputs": { + "nixpkgs": [ + "freckle", + "haskell-openapi-code-generator", + "pre-commit-hooks", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "nixos", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "haskell-openapi-code-generator": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1752914035, + "narHash": "sha256-QghINu6JPxiUyK3XSBhjgT/CvFez4hL8hGwfNvr9vPI=", + "owner": "Haskell-OpenAPI-Code-Generator", + "repo": "Haskell-OpenAPI-Client-Code-Generator", + "rev": "08fa0eb1d2baef4e3f328ae155bd0ff4ad08efcf", + "type": "github" + }, + "original": { + "owner": "Haskell-OpenAPI-Code-Generator", + "repo": "Haskell-OpenAPI-Client-Code-Generator", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "freckle", + "nixpkgs-25-05" + ] + }, + "locked": { + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-22.11", + "owner": "NixOS", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -98,131 +194,135 @@ "type": "github" } }, - "nixpkgs-master-2023-05-06": { + "nixpkgs-23-11": { "locked": { - "lastModified": 1683392273, - "narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-23.11", "repo": "nixpkgs", - "rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60", "type": "github" } }, - "nixpkgs-master-2023-07-18": { + "nixpkgs-24-05": { "locked": { - "lastModified": 1689680872, - "narHash": "sha256-brNix2+ihJSzCiKwLafbyejrHJZUP0Fy6z5+xMOC27M=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08700de174bc6235043cb4263b643b721d936bdb", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-24.05", "repo": "nixpkgs", - "rev": "08700de174bc6235043cb4263b643b721d936bdb", "type": "github" } }, - "nixpkgs-master-2023-09-15": { + "nixpkgs-24-11": { "locked": { - "lastModified": 1694760568, - "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-24.11", "repo": "nixpkgs", - "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", "type": "github" } }, - "nixpkgs-master-2024-01-27": { + "nixpkgs-25-05": { "locked": { - "lastModified": 1706367331, - "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-25.05", "repo": "nixpkgs", - "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1708294118, - "narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e0da498ad77ac8909a980f07eff060862417ccf7", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable-2023-07-25": { + "nixpkgs_2": { "locked": { - "lastModified": 1690271650, - "narHash": "sha256-qwdsW8DBY1qH+9luliIH7VzgwvL+ZGI3LZWC0LTiDMI=", - "owner": "nixos", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dc93f0daec55ee2f441da385aaf143863e3d671", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "6dc93f0daec55ee2f441da385aaf143863e3d671", "type": "github" } }, - "nixpkgs-unstable-2023-10-21": { + "nixpkgs_3": { "locked": { - "lastModified": 1697793076, - "narHash": "sha256-02e7sCuqLtkyRgrZmdOyvAcQTQdcXj+vpyp9bca6cY4=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "038b2922be3fc096e1d456f93f7d0f4090628729", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-25.05", "repo": "nixpkgs", - "rev": "038b2922be3fc096e1d456f93f7d0f4090628729", "type": "github" } }, - "nixpkgs-unstable-2024-02-20": { + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -230,26 +330,25 @@ "inputs": { "flake-utils": "flake-utils", "freckle": "freckle", - "stable": "stable" + "nixpkgs": "nixpkgs_3" } }, - "stable": { + "systems": { "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "systems": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -264,7 +363,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 74312be..7ff838f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,12 @@ { inputs = { - stable.url = "github:nixos/nixpkgs/nixos-23.11"; - freckle.url = "git+ssh://git@github.com/freckle/flakes?dir=main"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + freckle.url = "github:freckle/flakes?dir=main"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = inputs: inputs.flake-utils.lib.eachDefaultSystem (system: let - nixpkgsArgs = { inherit system; config = { }; }; - nixpkgs = { - stable = import inputs.stable nixpkgsArgs; - }; + nixpkgs = inputs.nixpkgs.legacyPackages.${system}; freckle = inputs.freckle.packages.${system}; freckleLib = inputs.freckle.lib.${system}; in @@ -17,31 +14,31 @@ packages = { awscli = freckle.aws-cli-2-11-x; - cabal = nixpkgs.stable.cabal-install; + cabal = nixpkgs.cabal-install; fourmolu = freckle.fourmolu-0-13-x; ghc = freckleLib.haskellBundle { - ghcVersion = "ghc-9-6-3"; + ghcVersion = "ghc-9-8-4"; packageSelection = p: [ ]; enableHLS = true; }; hlint = - nixpkgs.stable.haskell.lib.justStaticExecutables - nixpkgs.stable.hlint; + nixpkgs.haskell.lib.justStaticExecutables + nixpkgs.hlint; - stack = nixpkgs.stable.writeShellApplication { + stack = nixpkgs.writeShellApplication { name = "stack"; text = '' - ${nixpkgs.stable.stack}/bin/stack --system-ghc --no-nix "$@" + ${nixpkgs.stack}/bin/stack --system-ghc --no-nix "$@" ''; } ; }; - devShells.default = nixpkgs.stable.mkShell { - buildInputs = with (nixpkgs.stable); [ + devShells.default = nixpkgs.mkShell { + buildInputs = with (nixpkgs); [ pcre pcre.dev zlib @@ -62,4 +59,15 @@ ''; }; }); + + nixConfig = { + extra-substituters = [ + "https://freckle.cachix.org" + "https://freckle-private.cachix.org" + ]; + extra-trusted-public-keys = [ + "freckle.cachix.org-1:WnI1pZdwLf2vnP9Fx7OGbVSREqqi4HM2OhNjYmZ7odo=" + "freckle-private.cachix.org-1:zbTfpeeq5YBCPOjheu0gLyVPVeM6K2dc1e8ei8fE0AI=" + ]; + }; }