From 64d7db829ed712c966df7985fceeadfd24d2f24f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 14 Mar 2024 19:04:52 +0100 Subject: [PATCH] Special `nixpkgsUnstableForSisko` nixpkgs input only for `sisko` --- flake.lock | 237 +++++++++++++++++++++++++++-------------------------- flake.nix | 7 +- 2 files changed, 122 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 631db0b..16cfe8d 100644 --- a/flake.lock +++ b/flake.lock @@ -33,20 +33,21 @@ "extra-package-notmuch-notify": "extra-package-notmuch-notify", "flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "ccrEmacs", + "emacs-overlay", + "nixpkgs" + ] }, "locked": { - "lastModified": 1707613302, - "narHash": "sha256-S91bf7DmP7vVdKyP5uLHBIp+j/1PSkc0bAIwlMaUS9o=", - "owner": "aciceri", - "repo": "emacs", - "rev": "e498a8d28573bfb1970448fa0b56b90e4dded2dc", - "type": "github" + "lastModified": 1710278059, + "narHash": "sha256-OMmXmA4sDBxxhZBdV0BUr7/x8lRZiSsmJ1YmIOb3k44=", + "path": "/home/ccr/.config/emacs", + "type": "path" }, "original": { - "owner": "aciceri", - "repo": "emacs", - "type": "github" + "id": "ccrEmacs", + "type": "indirect" } }, "darwin": { @@ -78,11 +79,11 @@ ] }, "locked": { - "lastModified": 1708305517, - "narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=", + "lastModified": 1710169806, + "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=", "owner": "nix-community", "repo": "disko", - "rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804", + "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498", "type": "github" }, "original": { @@ -93,16 +94,16 @@ }, "dream2nix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "purescript-overlay": "purescript-overlay", "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1708430034, - "narHash": "sha256-9L+ROZjYAbFTv30iupZOMQ0KWdNjUJ4W92I6Q+dA/dw=", + "lastModified": 1710268378, + "narHash": "sha256-O61PtxUHbmwI6Ltjn9jY3QY2hRPPz7pe3BHhIYK4QkU=", "owner": "nix-community", "repo": "dream2nix", - "rev": "3308e0580886d1c9d4b58086c4c888834bcc1fe0", + "rev": "cd782df677aad08f7193c97376d615943c3cd4c9", "type": "github" }, "original": { @@ -118,11 +119,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707469552, - "narHash": "sha256-CPHB05n2FKAcPtjLows1+cEOA3ivDeFHs5bkvTGSgR4=", + "lastModified": 1710061621, + "narHash": "sha256-C9+Yw5pxK1+0a5KxMoKocVZOfkj+V/6TSHasS2h6Zgg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "eda89e24ee4ceb6e4bfcd00dabb894d6301c36db", + "rev": "1cdd60ae31faea0bc68251429f64589978415b4b", "type": "github" }, "original": { @@ -166,11 +167,11 @@ "extra-package-combobulate": { "flake": false, "locked": { - "lastModified": 1695673560, - "narHash": "sha256-oLxJfHN50GWlXZYmZP7ZGqyvwEG3h0HreLAfBqoWfBg=", + "lastModified": 1709362419, + "narHash": "sha256-LDjwiDlEIpWVxLFi8Cay1P3LNh1pl4GC17lNKK7QTyo=", "owner": "mickeynp", "repo": "combobulate", - "rev": "c7e4670a3047c0b58dff3746577a5c8e5832cfba", + "rev": "abc2be2a47edd2d108ce0dbe1d11e0cd2fe6796d", "type": "github" }, "original": { @@ -182,11 +183,11 @@ "extra-package-copilot": { "flake": false, "locked": { - "lastModified": 1707055282, - "narHash": "sha256-Drx2bB/Uiq0Alm8d575eucQrK6erFy4Z0KXsL5RsFaY=", + "lastModified": 1709987182, + "narHash": "sha256-BLIyJ9z4yI2Iv5eqrmULJ5VXoGnlXSVJx+5lVQyIoO8=", "owner": "zerolfx", "repo": "copilot.el", - "rev": "22f0446a17753716456e0cb8ee33f47731fc4ec3", + "rev": "4e203efaa1f4047c800a026ba496d3bda8b67119", "type": "github" }, "original": { @@ -198,11 +199,11 @@ "extra-package-indent-bars": { "flake": false, "locked": { - "lastModified": 1706410940, - "narHash": "sha256-8qi7RVjQvOJnt1ziBVPK7vQhlx93nRkomu8rEcW3Pp0=", + "lastModified": 1710117442, + "narHash": "sha256-0p3PW2hbzGeUIVkUWow6OWpL3OspbId+yqEPV909g4k=", "owner": "jdtsmith", "repo": "indent-bars", - "rev": "269774df6d5030832d04c5cf067d7a3a2568a46f", + "rev": "4583e3e9f507143cd4241131b77fc5e8b1722bbf", "type": "github" }, "original": { @@ -281,11 +282,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -323,11 +324,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -436,11 +437,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -472,11 +473,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -526,14 +527,14 @@ "inputs": { "flake-parts": "flake-parts_3", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1708491404, - "narHash": "sha256-m9ypZgcIJpkaRShWxe2TJLXJBJZu7oTXwLq81ep4Y4k=", + "lastModified": 1709701475, + "narHash": "sha256-3hJ9jQD3hBlW0evtgPbafQs/lc2EKpknT3HpuRfIIqQ=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "7ba26a739c4ea5bdf79c4df95c1c1e4355f19708", + "rev": "5ac8a664284001c49bd5ab30c2df20d9c6672e31", "type": "github" }, "original": { @@ -548,11 +549,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1708547820, + "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "type": "github" }, "original": { @@ -564,19 +565,18 @@ "hercules-ci-effects_2": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1708539323, - "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", + "lastModified": 1710270110, + "narHash": "sha256-DSByMaY4UKPv7UhObH0GwJ2D0ay6CBqMWTRn4wcIb2s=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "1fd59930fdca500bf79ddc9488b346d45f7e9dbc", + "rev": "3e81b3a33980f6596aafbe308abd78daea0bfa7d", "type": "github" }, "original": { "owner": "hercules-ci", - "ref": "fix-darwin-ciSystems", "repo": "hercules-ci-effects", "type": "github" } @@ -584,7 +584,7 @@ "hercules-ci-effects_3": { "inputs": { "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1701009247, @@ -628,11 +628,11 @@ ] }, "locked": { - "lastModified": 1708451036, - "narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", + "lastModified": 1710273215, + "narHash": "sha256-AfVYEQIhOK6vaYVndgqFV4Vb5REXG9R0ylv83QInsT0=", "owner": "nix-community", "repo": "home-manager", - "rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", + "rev": "a500de54b2e3067201a40cefa5f210f719423ddf", "type": "github" }, "original": { @@ -709,11 +709,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1703607026, - "narHash": "sha256-Emh0BPoqlS4ntp2UJrwydXfIP4qIMF0VBB2FUE3/M/E=", + "lastModified": 1709911523, + "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "4376b8a33b217ee2f78ba3dcff01a3e464d13a46", + "rev": "692fe3e98f36b60c678d637235271b57910a7f80", "type": "github" }, "original": { @@ -729,11 +729,11 @@ ] }, "locked": { - "lastModified": 1708231718, - "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", + "lastModified": 1710255615, + "narHash": "sha256-DFooGP2D6cNfOj35qkptUgG0r+VxuI38QgNAoYxmVE0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", + "rev": "c7ae5dc969b93f3221f5c228f0ec3de3e2b8084e", "type": "github" }, "original": { @@ -768,11 +768,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1708091350, - "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", + "lastModified": 1710123225, + "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", + "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "type": "github" }, "original": { @@ -816,11 +816,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -834,11 +834,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -905,11 +905,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { @@ -921,11 +921,11 @@ }, "nixpkgsStable": { "locked": { - "lastModified": 1708440434, - "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", + "lastModified": 1710162809, + "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", + "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -951,13 +951,29 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgsUnstableForSisko": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -985,27 +1001,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1710252211, + "narHash": "sha256-hQChQpB4LDBaSrNlD6DPLhU9T+R6oyxMCg2V+S7Y1jg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "rev": "7eeacecff44e05a9fd61b9e03836b66ecde8a525", "type": "github" }, "original": { @@ -1015,13 +1015,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1708296515, - "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { @@ -1031,7 +1031,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1703637592, "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", @@ -1047,7 +1047,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -1063,7 +1063,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1678470307, "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", @@ -1081,11 +1081,11 @@ }, "nur": { "locked": { - "lastModified": 1708544649, - "narHash": "sha256-hMdUmMqVVPPixnXvkRe4ZxEzXT5h8NPzPYMGHuTqpzo=", + "lastModified": 1710276687, + "narHash": "sha256-S53VF0PA1pTz87oi3NKID7BnOqUFrKOflLXA/9DL46M=", "owner": "nix-community", "repo": "NUR", - "rev": "0f53fdedb89a2a062f8f10c5de534300277d2ca2", + "rev": "b221a8e8493458bf33a754d86970bc656fdc43cc", "type": "github" }, "original": { @@ -1196,7 +1196,7 @@ "fan-control": "fan-control", "flake-parts": "flake-parts_8", "kernel-src": "kernel-src", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-kernel": "nixpkgs-kernel", "panfork": "panfork", "tow-boot": "tow-boot", @@ -1234,6 +1234,7 @@ "nixosHardware": "nixosHardware", "nixpkgsStable": "nixpkgsStable", "nixpkgsUnstable": "nixpkgsUnstable", + "nixpkgsUnstableForSisko": "nixpkgsUnstableForSisko", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "rock5b": "rock5b", @@ -1373,11 +1374,11 @@ ] }, "locked": { - "lastModified": 1708335038, - "narHash": "sha256-ETLZNFBVCabo7lJrpjD6cAbnE11eDOjaQnznmg/6hAE=", + "lastModified": 1710278050, + "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e504621290a1fd896631ddbc5e9c16f4366c9f65", + "rev": "35791f76524086ab4b785a33e4abbedfda64bd22", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 91ff13a..aea7076 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { flakeParts.url = "github:hercules-ci/flake-parts"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgsUnstableForSisko.url = "github:NixOS/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260"; nixpkgsStable.url = "github:NixOS/nixpkgs/nixos-23.11"; nixosHardware.url = "github:NixOS/nixos-hardware"; homeManager = { @@ -34,14 +35,12 @@ nur.url = "github:nix-community/NUR"; agenix.url = "github:ryantm/agenix"; rock5b.url = "github:aciceri/rock5b-nixos"; - # ccrEmacs.url = "ccrEmacs"; - ccrEmacs.url = "github:aciceri/emacs"; - # ccrEmacs.url = "/home/ccr/.config/emacs"; + ccrEmacs.url = "ccrEmacs"; treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; - hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects/fix-darwin-ciSystems"; + hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects"; dream2nix.url = "github:nix-community/dream2nix"; hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent"; nix-fast-build = {