Commit 3cf1e9cd796b
Changed files (2)
flake.lock
@@ -42,72 +42,6 @@
"type": "github"
}
},
- "cachix": {
- "inputs": {
- "devenv": "devenv_2",
- "flake-compat": [
- "devenv",
- "flake-compat"
- ],
- "git-hooks": [
- "devenv",
- "pre-commit-hooks"
- ],
- "nixpkgs": [
- "devenv",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1726520618,
- "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=",
- "owner": "cachix",
- "repo": "cachix",
- "rev": "695525f9086542dfb09fde0871dbf4174abbf634",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "cachix",
- "type": "github"
- }
- },
- "cachix_2": {
- "inputs": {
- "devenv": "devenv_3",
- "flake-compat": [
- "devenv",
- "cachix",
- "devenv",
- "flake-compat"
- ],
- "nixpkgs": [
- "devenv",
- "cachix",
- "devenv",
- "nixpkgs"
- ],
- "pre-commit-hooks": [
- "devenv",
- "cachix",
- "devenv",
- "pre-commit-hooks"
- ]
- },
- "locked": {
- "lastModified": 1712055811,
- "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=",
- "owner": "cachix",
- "repo": "cachix",
- "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "cachix",
- "type": "github"
- }
- },
"chapeau-rouge": {
"inputs": {
"flake-parts": "flake-parts",
@@ -196,100 +130,6 @@
"type": "github"
}
},
- "devenv": {
- "inputs": {
- "cachix": "cachix",
- "flake-compat": "flake-compat_4",
- "nix": "nix_3",
- "nixpkgs": [
- "nixpkgs"
- ],
- "pre-commit-hooks": "pre-commit-hooks_4"
- },
- "locked": {
- "lastModified": 1729190222,
- "narHash": "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "e6464200390e502e3cff45f82b6dbe8c6760fab5",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "latest",
- "repo": "devenv",
- "type": "github"
- }
- },
- "devenv_2": {
- "inputs": {
- "cachix": "cachix_2",
- "flake-compat": [
- "devenv",
- "cachix",
- "flake-compat"
- ],
- "nix": "nix_2",
- "nixpkgs": [
- "devenv",
- "cachix",
- "nixpkgs"
- ],
- "pre-commit-hooks": [
- "devenv",
- "cachix",
- "git-hooks"
- ]
- },
- "locked": {
- "lastModified": 1723156315,
- "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "devenv",
- "type": "github"
- }
- },
- "devenv_3": {
- "inputs": {
- "flake-compat": [
- "devenv",
- "cachix",
- "devenv",
- "cachix",
- "flake-compat"
- ],
- "nix": "nix",
- "nixpkgs": "nixpkgs_3",
- "poetry2nix": "poetry2nix",
- "pre-commit-hooks": [
- "devenv",
- "cachix",
- "devenv",
- "cachix",
- "pre-commit-hooks"
- ]
- },
- "locked": {
- "lastModified": 1708704632,
- "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=",
- "owner": "cachix",
- "repo": "devenv",
- "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "ref": "python-rewrite",
- "repo": "devenv",
- "type": "github"
- }
- },
"emacs-overlay": {
"inputs": {
"nixpkgs": [
@@ -346,38 +186,6 @@
}
},
"flake-compat_3": {
- "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-compat_4": {
- "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-compat_5": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@@ -393,7 +201,7 @@
"type": "github"
}
},
- "flake-compat_6": {
+ "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@@ -451,61 +259,6 @@
"type": "github"
}
},
- "flake-parts_3": {
- "inputs": {
- "nixpkgs-lib": [
- "devenv",
- "nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1712014858,
- "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-utils": {
- "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": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -550,28 +303,6 @@
"type": "github"
}
},
- "gitignore_3": {
- "inputs": {
- "nixpkgs": [
- "devenv",
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -670,50 +401,6 @@
"type": "github"
}
},
- "libgit2": {
- "flake": false,
- "locked": {
- "lastModified": 1697646580,
- "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
- "owner": "libgit2",
- "repo": "libgit2",
- "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
- "type": "github"
- },
- "original": {
- "owner": "libgit2",
- "repo": "libgit2",
- "type": "github"
- }
- },
- "nix": {
- "inputs": {
- "flake-compat": "flake-compat_3",
- "nixpkgs": [
- "devenv",
- "cachix",
- "devenv",
- "cachix",
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-regression": "nixpkgs-regression"
- },
- "locked": {
- "lastModified": 1712911606,
- "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "devenv-2.21",
- "repo": "nix",
- "type": "github"
- }
- },
"nix-github-actions": {
"inputs": {
"nixpkgs": [
@@ -777,91 +464,6 @@
"type": "github"
}
},
- "nix-github-actions_4": {
- "inputs": {
- "nixpkgs": [
- "devenv",
- "cachix",
- "devenv",
- "cachix",
- "devenv",
- "poetry2nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1688870561,
- "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
- "owner": "nix-community",
- "repo": "nix-github-actions",
- "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nix-github-actions",
- "type": "github"
- }
- },
- "nix_2": {
- "inputs": {
- "flake-compat": [
- "devenv",
- "cachix",
- "devenv",
- "flake-compat"
- ],
- "nixpkgs": [
- "devenv",
- "cachix",
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-regression": "nixpkgs-regression_2"
- },
- "locked": {
- "lastModified": 1712911606,
- "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "devenv-2.21",
- "repo": "nix",
- "type": "github"
- }
- },
- "nix_3": {
- "inputs": {
- "flake-compat": [
- "devenv",
- "flake-compat"
- ],
- "flake-parts": "flake-parts_3",
- "libgit2": "libgit2",
- "nixpkgs": "nixpkgs_4",
- "nixpkgs-23-11": "nixpkgs-23-11",
- "nixpkgs-regression": "nixpkgs-regression_3",
- "pre-commit-hooks": "pre-commit-hooks_3"
- },
- "locked": {
- "lastModified": 1727438425,
- "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=",
- "owner": "domenkozar",
- "repo": "nix",
- "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546",
- "type": "github"
- },
- "original": {
- "owner": "domenkozar",
- "ref": "devenv-2.24",
- "repo": "nix",
- "type": "github"
- }
- },
"nixlib": {
"locked": {
"lastModified": 1736643958,
@@ -915,7 +517,7 @@
},
"nixos-wsl": {
"inputs": {
- "flake-compat": "flake-compat_6",
+ "flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
]
@@ -950,22 +552,6 @@
"type": "github"
}
},
- "nixpkgs-23-11": {
- "locked": {
- "lastModified": 1717159533,
- "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
- "type": "github"
- }
- },
"nixpkgs-24_05": {
"locked": {
"lastModified": 1735563628,
@@ -998,70 +584,6 @@
"type": "github"
}
},
- "nixpkgs-regression": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
- "nixpkgs-regression_2": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
- "nixpkgs-regression_3": {
- "locked": {
- "lastModified": 1643052045,
- "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
- "type": "github"
- }
- },
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1720386169,
- "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
"lastModified": 1730768919,
@@ -1079,38 +601,6 @@
}
},
"nixpkgs_3": {
- "locked": {
- "lastModified": 1692808169,
- "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9201b5ff357e781bf014d0330d18555695df7ba8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_4": {
- "locked": {
- "lastModified": 1717432640,
- "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "release-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_5": {
"locked": {
"lastModified": 1737469691,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
@@ -1126,33 +616,6 @@
"type": "github"
}
},
- "poetry2nix": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nix-github-actions": "nix-github-actions_4",
- "nixpkgs": [
- "devenv",
- "cachix",
- "devenv",
- "cachix",
- "devenv",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1692876271,
- "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=",
- "owner": "nix-community",
- "repo": "poetry2nix",
- "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "poetry2nix",
- "type": "github"
- }
- },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@@ -1196,69 +659,6 @@
"type": "github"
}
},
- "pre-commit-hooks_3": {
- "inputs": {
- "flake-compat": [
- "devenv",
- "nix"
- ],
- "flake-utils": "flake-utils_2",
- "gitignore": [
- "devenv",
- "nix"
- ],
- "nixpkgs": [
- "devenv",
- "nix",
- "nixpkgs"
- ],
- "nixpkgs-stable": [
- "devenv",
- "nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1712897695,
- "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
- "pre-commit-hooks_4": {
- "inputs": {
- "flake-compat": [
- "devenv",
- "flake-compat"
- ],
- "gitignore": "gitignore_3",
- "nixpkgs": [
- "devenv",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1726745158,
- "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
"root": {
"inputs": {
"agenix": "agenix",
@@ -1266,9 +666,8 @@
"chapeau-rouge": "chapeau-rouge",
"chick-group": "chick-group",
"dagger": "dagger",
- "devenv": "devenv",
"emacs-overlay": "emacs-overlay",
- "flake-compat": "flake-compat_5",
+ "flake-compat": "flake-compat_3",
"home-manager": "home-manager_2",
"home-manager-24_05": "home-manager-24_05",
"home-manager-24_11": "home-manager-24_11",
@@ -1276,7 +675,7 @@
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_3",
"nixpkgs-24_05": "nixpkgs-24_05",
"nixpkgs-24_11": "nixpkgs-24_11",
"sops-nix": "sops-nix"
@@ -1316,21 +715,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_2": {
- "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",
flake.nix
@@ -15,12 +15,9 @@
(import ./nix/overlays).tekton
(import ./nix/overlays/sbr.nix)
inputs.emacs-overlay.overlay
- # inputs.nur.overlay
- # inputs.devshell.overlays.default
inputs.chapeau-rouge.overlays.openshift
inputs.chick-group.overlays.default
(_: prev: {
- inherit (inputs.devenv.packages.${prev.system}) devenv;
inherit (inputs.buildkit-tekton.packages.${prev.system}) tkn-local;
inherit (inputs.dagger.packages.${prev.system}) dagger;
})
@@ -158,13 +155,8 @@
# Flake for compatibility with non-flake commands
flake-compat = { type = "github"; owner = "edolstra"; repo = "flake-compat"; flake = false; };
- devenv = {
- url = "github:cachix/devenv/latest";
- inputs.nixpkgs.follows = "nixpkgs";
- };
buildkit-tekton = { url = "github:vdemeester/buildkit-tekton"; inputs.nixpkgs.follows = "nixpkgs"; };
-
# nixpkgs
nixpkgs = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
nixpkgs-24_05 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-24.05"; };