From f3c4ea0cf1517d3acb9296d5e4d00d0ef4dead3e Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Wed, 19 Jul 2023 20:47:59 +0000 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dream2nix': 'github:nix-community/dream2nix/c9c8689f09aa95212e75f3108788862583a1cf5a' (2023-07-18) → 'github:nix-community/dream2nix/e68bff6dbd5aa2b9ffae1e12f60c71bf0bee0143' (2023-07-19) • Removed input 'dream2nix/all-cabal-json' • Removed input 'dream2nix/crane' • Removed input 'dream2nix/flake-utils-pre-commit' • Removed input 'dream2nix/ghc-utils' • Removed input 'dream2nix/gomod2nix' • Removed input 'dream2nix/mach-nix' • Removed input 'dream2nix/nix-pypi-fetcher' • Removed input 'dream2nix/nixpkgsV1' • Removed input 'dream2nix/poetry2nix' • Removed input 'dream2nix/pruned-racket-catalog' • Updated input 'mission-control': 'github:Platonic-Systems/mission-control/a0c93bd764a3c25e6999397e9f5f119c1b124e38' (2023-05-09) → 'github:Platonic-Systems/mission-control/95642d995a829da070def35c4a53f0d163273e0a' (2023-07-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222' (2023-07-16) → 'github:NixOS/nixpkgs/684c17c429c42515bafb3ad775d2a710947f3d67' (2023-07-18) --- flake.lock | 195 ++++------------------------------------------------- 1 file changed, 12 insertions(+), 183 deletions(-) diff --git a/flake.lock b/flake.lock index e9e8038..07a1093 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "all-cabal-json": { - "flake": false, - "locked": { - "lastModified": 1665552503, - "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", - "owner": "nix-community", - "repo": "all-cabal-json", - "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "hackage", - "repo": "all-cabal-json", - "type": "github" - } - }, "blank": { "locked": { "lastModified": 1625557891, @@ -79,23 +62,6 @@ "type": "github" } }, - "crane_2": { - "flake": false, - "locked": { - "lastModified": 1681175776, - "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "445a3d222947632b5593112bb817850e8a9cf737", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.12.1", - "repo": "crane", - "type": "github" - } - }, "devenv": { "inputs": { "flake-compat": "flake-compat", @@ -188,33 +154,23 @@ }, "dream2nix": { "inputs": { - "all-cabal-json": "all-cabal-json", - "crane": "crane", "devshell": "devshell_2", "drv-parts": "drv-parts", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils-pre-commit": "flake-utils-pre-commit", - "ghc-utils": "ghc-utils", - "gomod2nix": "gomod2nix", - "mach-nix": "mach-nix", - "nix-pypi-fetcher": "nix-pypi-fetcher", "nixpkgs": [ "nixpkgs" ], - "nixpkgsV1": "nixpkgsV1", - "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "pre-commit-hooks-nix" - ], - "pruned-racket-catalog": "pruned-racket-catalog" + ] }, "locked": { - "lastModified": 1689701105, - "narHash": "sha256-LbqkAkLlKvdh/Xb9FvyKAGJbBRuTXOAq6unco/RifD4=", + "lastModified": 1689775563, + "narHash": "sha256-U7SqBj7KCPMvZ2ZoJZGXomVLqOFbeGRY6+E/Efo72bc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "c9c8689f09aa95212e75f3108788862583a1cf5a", + "rev": "e68bff6dbd5aa2b9ffae1e12f60c71bf0bee0143", "type": "github" }, "original": { @@ -228,7 +184,7 @@ "all-cabal-json": [ "nix-cargo-integration" ], - "crane": "crane_2", + "crane": "crane", "devshell": [ "nix-cargo-integration" ], @@ -257,7 +213,7 @@ "nix-cargo-integration", "nixpkgs" ], - "nixpkgsV1": "nixpkgsV1_2", + "nixpkgsV1": "nixpkgsV1", "poetry2nix": [ "nix-cargo-integration" ], @@ -596,21 +552,6 @@ "type": "github" } }, - "flake-utils-pre-commit": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_3" @@ -629,22 +570,6 @@ "type": "github" } }, - "ghc-utils": { - "flake": false, - "locked": { - "lastModified": 1662774800, - "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=", - "ref": "refs/heads/master", - "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea", - "revCount": 1072, - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - }, - "original": { - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -688,22 +613,6 @@ "type": "github" } }, - "gomod2nix": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "haskell-flake": { "locked": { "lastModified": 1689107492, @@ -846,28 +755,13 @@ "type": "github" } }, - "mach-nix": { - "flake": false, - "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" - }, - "original": { - "id": "mach-nix", - "type": "indirect" - } - }, "mission-control": { "locked": { - "lastModified": 1683658484, - "narHash": "sha256-JkGnWyYZxOnyOhztrxLSqaod6+O/3rRypq0dAqA/zn0=", + "lastModified": 1689798863, + "narHash": "sha256-RE0+IbivIeYhvQyikqQkSO9z4ptD4WNH602WBQFrvlg=", "owner": "Platonic-Systems", "repo": "mission-control", - "rev": "a0c93bd764a3c25e6999397e9f5f119c1b124e38", + "rev": "95642d995a829da070def35c4a53f0d163273e0a", "type": "github" }, "original": { @@ -940,22 +834,6 @@ "type": "github" } }, - "nix-pypi-fetcher": { - "flake": false, - "locked": { - "lastModified": 1669065297, - "narHash": "sha256-UStjXjNIuIm7SzMOWvuYWIHBkPUKQ8Id63BMJjnIDoA=", - "owner": "DavHau", - "repo": "nix-pypi-fetcher", - "rev": "a9885ac6a091576b5195d547ac743d45a2a615ac", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "nix-pypi-fetcher", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1678875422, @@ -1089,21 +967,6 @@ "type": "indirect" } }, - "nixpkgsV1_2": { - "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1688322751, @@ -1137,11 +1000,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1689534811, - "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", + "lastModified": 1689679375, + "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", + "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", "type": "github" }, "original": { @@ -1278,23 +1141,6 @@ "type": "github" } }, - "poetry2nix": { - "flake": false, - "locked": { - "lastModified": 1666918719, - "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "289efb187123656a116b915206e66852f038720e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "1.36.0", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -1378,23 +1224,6 @@ "type": "github" } }, - "pruned-racket-catalog": { - "flake": false, - "locked": { - "lastModified": 1672537287, - "narHash": "sha256-SuOvXVcLfakw18oJB/PuRMyvGyGG1+CQD3R+TGHIv44=", - "owner": "nix-community", - "repo": "pruned-racket-catalog", - "rev": "c8b89557fb53b36efa2ee48a769c7364df0f6262", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "catalog", - "repo": "pruned-racket-catalog", - "type": "github" - } - }, "root": { "inputs": { "devenv": "devenv", From cedf144a9612f10e0c54b3a1603f2617bc388827 Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Thu, 20 Jul 2023 08:48:21 +0000 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'mission-control': 'github:Platonic-Systems/mission-control/95642d995a829da070def35c4a53f0d163273e0a' (2023-07-19) → 'github:Platonic-Systems/mission-control/b48d201323df0ed2d4f05283139eaa6580ee7c39' (2023-07-19) • Updated input 'nix-cargo-integration': 'github:yusdacra/nix-cargo-integration/162955307d9762a4ce082c0296cf8ec3609ae4d6' (2023-07-19) → 'github:yusdacra/nix-cargo-integration/f6e9315f646ad9e39969d2a70a66a723fc37ee1d' (2023-07-20) • Updated input 'nix-cargo-integration/dream2nix': 'github:nix-community/dream2nix/c9c8689f09aa95212e75f3108788862583a1cf5a' (2023-07-18) → 'github:nix-community/dream2nix/e68bff6dbd5aa2b9ffae1e12f60c71bf0bee0143' (2023-07-19) • Removed input 'nix-cargo-integration/dream2nix/all-cabal-json' • Removed input 'nix-cargo-integration/dream2nix/crane' • Removed input 'nix-cargo-integration/dream2nix/flake-utils-pre-commit' • Removed input 'nix-cargo-integration/dream2nix/ghc-utils' • Removed input 'nix-cargo-integration/dream2nix/gomod2nix' • Removed input 'nix-cargo-integration/dream2nix/mach-nix' • Removed input 'nix-cargo-integration/dream2nix/nix-pypi-fetcher' • Removed input 'nix-cargo-integration/dream2nix/nixpkgsV1' • Removed input 'nix-cargo-integration/dream2nix/poetry2nix' • Removed input 'nix-cargo-integration/dream2nix/pruned-racket-catalog' • Updated input 'nix-cargo-integration/rust-overlay': 'github:oxalica/rust-overlay/31d08cf9f5c3a49475e723c75c6f645171364a74' (2023-07-19) → 'github:oxalica/rust-overlay/587d457313ed6c163be839c03a7eb4db0f52735b' (2023-07-20) --- flake.lock | 82 ++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 07a1093..8b67bb3 100644 --- a/flake.lock +++ b/flake.lock @@ -45,23 +45,6 @@ "type": "github" } }, - "crane": { - "flake": false, - "locked": { - "lastModified": 1681175776, - "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "445a3d222947632b5593112bb817850e8a9cf737", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.12.1", - "repo": "crane", - "type": "github" - } - }, "devenv": { "inputs": { "flake-compat": "flake-compat", @@ -181,10 +164,6 @@ }, "dream2nix_2": { "inputs": { - "all-cabal-json": [ - "nix-cargo-integration" - ], - "crane": "crane", "devshell": [ "nix-cargo-integration" ], @@ -194,42 +173,20 @@ "nix-cargo-integration", "parts" ], - "flake-utils-pre-commit": [ - "nix-cargo-integration" - ], - "ghc-utils": [ - "nix-cargo-integration" - ], - "gomod2nix": [ - "nix-cargo-integration" - ], - "mach-nix": [ - "nix-cargo-integration" - ], - "nix-pypi-fetcher": [ - "nix-cargo-integration" - ], "nixpkgs": [ "nix-cargo-integration", "nixpkgs" ], - "nixpkgsV1": "nixpkgsV1", - "poetry2nix": [ - "nix-cargo-integration" - ], "pre-commit-hooks": [ "nix-cargo-integration" - ], - "pruned-racket-catalog": [ - "nix-cargo-integration" ] }, "locked": { - "lastModified": 1689701105, - "narHash": "sha256-LbqkAkLlKvdh/Xb9FvyKAGJbBRuTXOAq6unco/RifD4=", + "lastModified": 1689775563, + "narHash": "sha256-U7SqBj7KCPMvZ2ZoJZGXomVLqOFbeGRY6+E/Efo72bc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "c9c8689f09aa95212e75f3108788862583a1cf5a", + "rev": "e68bff6dbd5aa2b9ffae1e12f60c71bf0bee0143", "type": "github" }, "original": { @@ -757,11 +714,11 @@ }, "mission-control": { "locked": { - "lastModified": 1689798863, - "narHash": "sha256-RE0+IbivIeYhvQyikqQkSO9z4ptD4WNH602WBQFrvlg=", + "lastModified": 1689802645, + "narHash": "sha256-USdf0MXZlllulmqhcqcLFQTt5FK1Lx3lQ7gxyZkz7Pk=", "owner": "Platonic-Systems", "repo": "mission-control", - "rev": "95642d995a829da070def35c4a53f0d163273e0a", + "rev": "b48d201323df0ed2d4f05283139eaa6580ee7c39", "type": "github" }, "original": { @@ -821,11 +778,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1689747082, - "narHash": "sha256-d345Q6+uklS/oYeMofF9ctvHTsRuSFbCdKSvzRwMEws=", + "lastModified": 1689833481, + "narHash": "sha256-TRvCaUi2AMBfTBY3fFqYUOcUDm202rj+Iv+pakLSP4g=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "162955307d9762a4ce082c0296cf8ec3609ae4d6", + "rev": "f6e9315f646ad9e39969d2a70a66a723fc37ee1d", "type": "github" }, "original": { @@ -952,21 +909,6 @@ "type": "github" } }, - "nixpkgsV1": { - "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1688322751, @@ -1246,11 +1188,11 @@ "rust-overlay": { "flake": false, "locked": { - "lastModified": 1689735719, - "narHash": "sha256-HOEDWJLm+f6HSD4j7n4xc8J4FcqjJ+U7ZnMLQQrZKYg=", + "lastModified": 1689819615, + "narHash": "sha256-0227tapuw1bPhqQfCblxRo3nJd2qLepQsdV0Jg6qsb4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "31d08cf9f5c3a49475e723c75c6f645171364a74", + "rev": "587d457313ed6c163be839c03a7eb4db0f52735b", "type": "github" }, "original": { From 4e6c3a7ef21a7bd48121bd8a060a70dc6d7d9837 Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Fri, 21 Jul 2023 08:48:28 +0000 Subject: [PATCH 3/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-cargo-integration': 'github:yusdacra/nix-cargo-integration/f6e9315f646ad9e39969d2a70a66a723fc37ee1d' (2023-07-20) → 'github:yusdacra/nix-cargo-integration/3353c14f9c57c4f533ff29f61c2892b41400cbc4' (2023-07-21) • Updated input 'nix-cargo-integration/rust-overlay': 'github:oxalica/rust-overlay/587d457313ed6c163be839c03a7eb4db0f52735b' (2023-07-20) → 'github:oxalica/rust-overlay/c88b28944129eeff5e819bdc21248dc07eb0625d' (2023-07-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/684c17c429c42515bafb3ad775d2a710947f3d67' (2023-07-18) → 'github:NixOS/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8b67bb3..b7db642 100644 --- a/flake.lock +++ b/flake.lock @@ -778,11 +778,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1689833481, - "narHash": "sha256-TRvCaUi2AMBfTBY3fFqYUOcUDm202rj+Iv+pakLSP4g=", + "lastModified": 1689919877, + "narHash": "sha256-IV9Nf8HrJmKxEvUgQ6QOpkigRXHEuy8ailMtxS3HoJ4=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "f6e9315f646ad9e39969d2a70a66a723fc37ee1d", + "rev": "3353c14f9c57c4f533ff29f61c2892b41400cbc4", "type": "github" }, "original": { @@ -942,11 +942,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1689679375, - "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=", + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "684c17c429c42515bafb3ad775d2a710947f3d67", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", "type": "github" }, "original": { @@ -1188,11 +1188,11 @@ "rust-overlay": { "flake": false, "locked": { - "lastModified": 1689819615, - "narHash": "sha256-0227tapuw1bPhqQfCblxRo3nJd2qLepQsdV0Jg6qsb4=", + "lastModified": 1689906077, + "narHash": "sha256-2tjLXKoSK7O0LYHlA6GCWL0gy2kZZno4krg+KZpDh6U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "587d457313ed6c163be839c03a7eb4db0f52735b", + "rev": "c88b28944129eeff5e819bdc21248dc07eb0625d", "type": "github" }, "original": { From 7196e8bf7478b32adf988707c21fb037d381002e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 21 Jul 2023 15:15:07 +0200 Subject: [PATCH 4/4] Work around the unclear dream2nix upgrade See also https://github.com/hercules-ci/flake.parts-website/pull/439 --- flake.lock | 299 ++++++++++++++++++++++++++++++-------------- flake.nix | 27 +++- site/src/SUMMARY.md | 3 +- 3 files changed, 229 insertions(+), 100 deletions(-) diff --git a/flake.lock b/flake.lock index b7db642..3957741 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,22 @@ { "nodes": { + "all-cabal-json": { + "flake": false, + "locked": { + "lastModified": 1689913295, + "narHash": "sha256-39AnmIW2bHERaCL0UUXC9t+TmEmGu73pwRNk1Eqj/x8=", + "owner": "nix-community", + "repo": "all-cabal-json", + "rev": "dfa07e5da143cd09984c341b6729c27d24464fd3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "hackage", + "repo": "all-cabal-json", + "type": "github" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -45,6 +62,23 @@ "type": "github" } }, + "crane": { + "flake": false, + "locked": { + "lastModified": 1681175776, + "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", + "owner": "ipetkov", + "repo": "crane", + "rev": "445a3d222947632b5593112bb817850e8a9cf737", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "v0.12.1", + "repo": "crane", + "type": "github" + } + }, "devenv": { "inputs": { "flake-compat": "flake-compat", @@ -135,110 +169,56 @@ "type": "github" } }, - "dream2nix": { + "dream2nix_legacy": { "inputs": { + "all-cabal-json": "all-cabal-json", + "crane": "crane", "devshell": "devshell_2", "drv-parts": "drv-parts", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", + "flake-utils-pre-commit": "flake-utils-pre-commit", + "ghc-utils": "ghc-utils", + "gomod2nix": "gomod2nix", + "mach-nix": "mach-nix", + "nix-pypi-fetcher": "nix-pypi-fetcher", "nixpkgs": [ "nixpkgs" ], + "nixpkgsV1": "nixpkgsV1", + "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "pre-commit-hooks-nix" - ] - }, - "locked": { - "lastModified": 1689775563, - "narHash": "sha256-U7SqBj7KCPMvZ2ZoJZGXomVLqOFbeGRY6+E/Efo72bc=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "e68bff6dbd5aa2b9ffae1e12f60c71bf0bee0143", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "dream2nix_2": { - "inputs": { - "devshell": [ - "nix-cargo-integration" - ], - "drv-parts": "drv-parts_2", - "flake-compat": "flake-compat_3", - "flake-parts": [ - "nix-cargo-integration", - "parts" ], - "nixpkgs": [ - "nix-cargo-integration", - "nixpkgs" - ], - "pre-commit-hooks": [ - "nix-cargo-integration" - ] + "pruned-racket-catalog": "pruned-racket-catalog" }, "locked": { - "lastModified": 1689775563, - "narHash": "sha256-U7SqBj7KCPMvZ2ZoJZGXomVLqOFbeGRY6+E/Efo72bc=", + "lastModified": 1689701105, + "narHash": "sha256-LbqkAkLlKvdh/Xb9FvyKAGJbBRuTXOAq6unco/RifD4=", "owner": "nix-community", "repo": "dream2nix", - "rev": "e68bff6dbd5aa2b9ffae1e12f60c71bf0bee0143", + "rev": "c9c8689f09aa95212e75f3108788862583a1cf5a", "type": "github" }, "original": { "owner": "nix-community", "repo": "dream2nix", + "rev": "c9c8689f09aa95212e75f3108788862583a1cf5a", "type": "github" } }, "drv-parts": { "inputs": { "flake-compat": [ - "dream2nix", + "dream2nix_legacy", "flake-compat" ], "flake-parts": [ - "dream2nix", + "dream2nix_legacy", "flake-parts" ], "nixpkgs": [ - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1680698112, - "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", - "owner": "davhau", - "repo": "drv-parts", - "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", - "type": "github" - }, - "original": { - "owner": "davhau", - "repo": "drv-parts", - "type": "github" - } - }, - "drv-parts_2": { - "inputs": { - "flake-compat": [ - "nix-cargo-integration", - "dream2nix", - "flake-compat" - ], - "flake-parts": [ - "nix-cargo-integration", - "dream2nix", - "flake-parts" - ], - "nixpkgs": [ - "nix-cargo-integration", - "dream2nix", + "dream2nix_legacy", "nixpkgs" ] }, @@ -303,7 +283,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -368,26 +348,10 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ - "dream2nix", + "dream2nix_legacy", "nixpkgs" ] }, @@ -509,9 +473,27 @@ "type": "github" } }, + "flake-utils-pre-commit": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -527,6 +509,22 @@ "type": "github" } }, + "ghc-utils": { + "flake": false, + "locked": { + "lastModified": 1689871480, + "narHash": "sha256-xe+Akox/PcloOu//iZbwh/1z6AF3Ies1kN7cPKvtWo4=", + "ref": "refs/heads/master", + "rev": "73aa97d07549e274ce13bf2bbb047ecd2ca8674c", + "revCount": 1144, + "type": "git", + "url": "https://gitlab.haskell.org/bgamari/ghc-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.haskell.org/bgamari/ghc-utils" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -570,6 +568,22 @@ "type": "github" } }, + "gomod2nix": { + "flake": false, + "locked": { + "lastModified": 1677459247, + "narHash": "sha256-JbakfAiPYmCCV224yAMq/XO0udN5coWv/oazblMKdoY=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "3cbf3a51fe32e2f57af4c52744e7228bab22983d", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, "haskell-flake": { "locked": { "lastModified": 1689107492, @@ -712,6 +726,21 @@ "type": "github" } }, + "mach-nix": { + "flake": false, + "locked": { + "lastModified": 1689108475, + "narHash": "sha256-Tg8mLKfgIigFSA6IodqSaxjfYVZ0xELqUDtGJhsdN6g=", + "owner": "DavHau", + "repo": "mach-nix", + "rev": "725aab8d52eb2f5b8ff67bea61049011ef31597c", + "type": "github" + }, + "original": { + "id": "mach-nix", + "type": "indirect" + } + }, "mission-control": { "locked": { "lastModified": 1689802645, @@ -769,7 +798,9 @@ }, "nix-cargo-integration": { "inputs": { - "dream2nix": "dream2nix_2", + "dream2nix": [ + "dream2nix_legacy" + ], "mk-naked-shell": "mk-naked-shell", "nixpkgs": [ "nixpkgs" @@ -791,6 +822,22 @@ "type": "github" } }, + "nix-pypi-fetcher": { + "flake": false, + "locked": { + "lastModified": 1669568973, + "narHash": "sha256-DGzSjoKAFsgZdOlFcFlnqzxPkxCAKXNvB25BsrehMn8=", + "owner": "DavHau", + "repo": "nix-pypi-fetcher", + "rev": "17f523a15e819fae41ab8a55b5f2851872e4c20b", + "type": "github" + }, + "original": { + "owner": "DavHau", + "repo": "nix-pypi-fetcher", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1678875422, @@ -909,6 +956,21 @@ "type": "github" } }, + "nixpkgsV1": { + "locked": { + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1688322751, @@ -1083,6 +1145,23 @@ "type": "github" } }, + "poetry2nix": { + "flake": false, + "locked": { + "lastModified": 1666918719, + "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "289efb187123656a116b915206e66852f038720e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "1.36.0", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -1113,7 +1192,7 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "gitignore": "gitignore_2", "nixpkgs": [ @@ -1166,11 +1245,28 @@ "type": "github" } }, + "pruned-racket-catalog": { + "flake": false, + "locked": { + "lastModified": 1688719339, + "narHash": "sha256-eTIClikA8Gj1RW0yNCLM4gnmSi6FZRlnLUQwj7h8i38=", + "owner": "nix-community", + "repo": "pruned-racket-catalog", + "rev": "1000f8cf82c9da0e92210e9bf6b54793c03b1a3f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "catalog", + "repo": "pruned-racket-catalog", + "type": "github" + } + }, "root": { "inputs": { "devenv": "devenv", "devshell": "devshell", - "dream2nix": "dream2nix", + "dream2nix_legacy": "dream2nix_legacy", "emanote": "emanote", "flake-parts": "flake-parts_3", "haskell-flake": "haskell-flake_2", @@ -1299,6 +1395,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index edf61d7..3025d59 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,9 @@ devenv.url = "github:hercules-ci/devenv/flake-module"; devshell.url = "github:numtide/devshell"; devshell.inputs.nixpkgs.follows = "nixpkgs"; # https://github.com/NixOS/nix/issues/7730 - dream2nix.inputs.pre-commit-hooks.follows = "pre-commit-hooks-nix"; - dream2nix.inputs.nixpkgs.follows = "nixpkgs"; - dream2nix.url = "github:nix-community/dream2nix"; + dream2nix_legacy.inputs.pre-commit-hooks.follows = "pre-commit-hooks-nix"; + dream2nix_legacy.inputs.nixpkgs.follows = "nixpkgs"; + dream2nix_legacy.url = "github:nix-community/dream2nix/c9c8689f09aa95212e75f3108788862583a1cf5a"; emanote.url = "github:srid/emanote"; emanote.inputs.nixpkgs.follows = "nixpkgs"; haskell-flake.url = "github:srid/haskell-flake"; @@ -17,6 +17,7 @@ mission-control.url = "github:Platonic-Systems/mission-control"; nix-cargo-integration.url = "github:yusdacra/nix-cargo-integration"; nix-cargo-integration.inputs.nixpkgs.follows = "nixpkgs"; + nix-cargo-integration.inputs.dream2nix.follows = "dream2nix_legacy"; pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks-nix.inputs.nixpkgs.follows = "nixpkgs"; proc-flake.url = "github:srid/proc-flake"; @@ -77,11 +78,27 @@ }; dream2nix = { - title = "dream2nix beta"; - baseUrl = "https://github.com/nix-community/dream2nix/blob/master"; + title = "dream2nix"; + baseUrl = "https://github.com/nix-community/dream2nix/blob/main"; + flakeRef = "github:nix-community/dream2nix"; + intro = '' + This page is a placeholder while dream2nix v1 is in the works. + See [dream2nix_legacy](./dream2nix_legacy.html) for the previous API. + ''; + installation = ""; + attributePath = [ "modules" "flake-parts" "all-modules" ]; + flake = { modules.flake-parts.all-modules = { }; outPath = "/x"; }; + }; + + dream2nix_legacy = { + title = "dream2nix legacy"; + baseUrl = "https://github.com/nix-community/dream2nix/blob/c9c8689f09aa95212e75f3108788862583a1cf5a"; + flakeRef = "github:nix-community/dream2nix/c9c8689f09aa95212e75f3108788862583a1cf5a"; attributePath = [ "flakeModuleBeta" ]; intro = '' [`dream2nix`](https://github.com/nix-community/dream2nix#readme) scans your flake files and turns them into packages. + + NOTE: a new version of dream2nix, v1, is in the works, and we're figuring out how best to use it. ''; }; diff --git a/site/src/SUMMARY.md b/site/src/SUMMARY.md index 01dd284..745c130 100644 --- a/site/src/SUMMARY.md +++ b/site/src/SUMMARY.md @@ -21,7 +21,8 @@ - [`easyOverlay` (warning)](./options/flake-parts-easyOverlay.md) - [`devenv`](./options/devenv.md) - [`devshell`](./options/devshell.md) - - [`dream2nix beta`](./options/dream2nix.md) + - [`dream2nix`](./options/dream2nix.md) + - [`dream2nix legacy`](./options/dream2nix_legacy.md) - [`emanote`](./options/emanote.md) - [`haskell-flake`](./options/haskell-flake.md) - [`hercules-ci-effects`](./options/hercules-ci-effects.md)