nix flake update
To use parsedmarc, we need the latest versions of everything (plus,
staying up-to-date has its own benefits). It seems that this update also
updates nix to a version where overlays can no longer take a functor, so
I have wrapped the frappix overlays in a function to workaround this
issue
Change-Id: Ia029232ad605783b304251c4182ec017c209c0c3
Reviewed-on: https://git.clicks.codes/c/Infra/NixFiles/+/541
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/flake.lock b/flake.lock
index 4e077ae..ad0121f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1702460489,
- "narHash": "sha256-H6s6oVLvx7PCjUcvfkB89Bb+kbaiJxTAgWfMjiQTjA0=",
+ "lastModified": 1708091384,
+ "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "915327515f5fd1b7719c06e2f1eb304ee0bdd803",
+ "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
"type": "github"
},
"original": {
@@ -126,11 +126,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1701680307,
- "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -201,11 +201,11 @@
"std": "std"
},
"locked": {
- "lastModified": 1710087131,
- "narHash": "sha256-SU7W/m+u0MXliDcXJatwTHMJxQLtbvgofriC9YMdMLk=",
+ "lastModified": 1710429318,
+ "narHash": "sha256-f7o84UJ3cNnmKkWjhPq+3i5iqTsAHKS2oDWDo3WG2IE=",
"owner": "blaggacao",
"repo": "frappix",
- "rev": "9366e712cd9760db0584f8fa77173e118e66c388",
+ "rev": "15ba811aa19ba8bb5f2f03410d5dd8f11156ff70",
"type": "github"
},
"original": {
@@ -260,11 +260,11 @@
"rev": "8b911b96cd322f9a3741d382cca30894617e4dad",
"revCount": 19,
"type": "git",
- "url": "https://git.clicks.codes/Clicks/NixHelpers"
+ "url": "https://git.clicks.codes/Infra/NixHelpers"
},
"original": {
"type": "git",
- "url": "https://git.clicks.codes/Clicks/NixHelpers"
+ "url": "https://git.clicks.codes/Infra/NixHelpers"
}
},
"home-manager": {
@@ -274,11 +274,11 @@
]
},
"locked": {
- "lastModified": 1702814678,
- "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
+ "lastModified": 1706981411,
+ "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
+ "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github"
},
"original": {
@@ -439,16 +439,16 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1702777222,
- "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=",
+ "lastModified": 1710628718,
+ "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3",
+ "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "release-23.05",
+ "ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -469,11 +469,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1702645756,
- "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
+ "lastModified": 1710695816,
+ "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
+ "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"type": "github"
},
"original": {
@@ -592,11 +592,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1702812162,
- "narHash": "sha256-18cKptpAAfkatdQgjO5SZXZsbc1IVPRoYx2AxaiooL4=",
+ "lastModified": 1710644594,
+ "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "21f2b8f123a1601fef3cf6bbbdf5171257290a77",
+ "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 0ca0186..87c388a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
inputs.nixpkgs-privatebin.url = "github:e1mo/nixpkgs/privatebin";
inputs.nixpkgs-mongodb.url = "github:nixos/nixpkgs?rev=8dfad603247387df1df4826b8bea58efc5d012d8";
- inputs.helpers.url = "git+https://git.clicks.codes/Clicks/NixHelpers";
+ inputs.helpers.url = "git+https://git.clicks.codes/Infra/NixHelpers";
inputs.frappix.url = "github:blaggacao/frappix";
@@ -48,9 +48,22 @@
inherit (nixpkgs-privatebin.legacyPackages.${system})
privatebin pbcli;
})
- frappix.toolsOverlay.${system}
- frappix.pythonOverlay.${system}
- frappix.frappeOverlay.${system}
+ (functorBuster: frappix.toolsOverlay.${system} functorBuster)
+ (functorBuster: frappix.pythonOverlay.${system} functorBuster)
+ (functorBuster: frappix.frappeOverlay.${system} functorBuster)
+ (final: prev: {
+ python311 = prev.python311.override {
+ packageOverrides = pyFinal: pyPrev: {
+ elasticsearch = (
+ pyPrev.elasticsearch.overrideAttrs (prevAttrs: {
+ propagatedBuildInputs = prevAttrs.propagatedBuildInputs ++ [
+ final.python311Packages.elastic-transport
+ ];
+ })
+ );
+ };
+ };
+ })
];
};
helpers = inputs.helpers.helpers { inherit pkgs nixpkgs; };