nix: fix dependencies
authorJulien Moutinho <julm@sourcephile.fr>
Tue, 11 May 2021 04:35:45 +0000 (06:35 +0200)
committerJulien Moutinho <julm@sourcephile.fr>
Tue, 11 May 2021 04:48:58 +0000 (06:48 +0200)
flake.lock
flake.nix
hosts/mermet/system.nix
nixpkgs/patches.nix

index 28402b09e1a9d13850506cc59be29751d2be52eb..7a73e63db7b6d1fd5dc39b0006c0cb0740ed7108 100644 (file)
         ]
       },
       "locked": {
-        "narHash": "sha256-DmjCGnpMGphe9dKLDLIAtdsIDX6I9jVyYlGecShRav0=",
-        "path": "julm-nix",
-        "type": "path"
+        "lastModified": 1620705127,
+        "narHash": "sha256-hkeSAGFwIkM9zMnfHxDQAl+h8pVZbsXQQSsMjU+6sh0=",
+        "ref": "master",
+        "rev": "a2c9c1dc686a05f13ca2468383abc23c6baa30a8",
+        "revCount": 123,
+        "type": "git",
+        "url": "git://git.sourcephile.fr/julm/julm-nix"
       },
       "original": {
-        "path": "julm-nix",
-        "type": "path"
+        "ref": "master",
+        "type": "git",
+        "url": "git://git.sourcephile.fr/julm/julm-nix"
       }
     },
     "nixpkgs": {
index 37a207a2f4b682f7003b05a3f09c9a0eac51c14a..3ef9bf2ff5a8609d38ffcaead787c0887b45bfe5 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,8 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/9031057b0e6642e61c74b3e3c97b4e80a8db1
 #inputs.nixpkgs.url = "flake:nixpkgs";
 inputs.flake-utils.url = "github:numtide/flake-utils";
 inputs.home-manager.follows = "julm-nix/home-manager";
-inputs.julm-nix.url = "path:julm-nix"; # FIXME: this puts the whole folder in the Nix store
+inputs.julm-nix.url = "git://git.sourcephile.fr/julm/julm-nix?ref=master";
+#inputs.julm-nix.url = "path:julm-nix"; # XXX: this puts the whole folder in the Nix store
 inputs.julm-nix.inputs.flake-utils.follows = "flake-utils";
 inputs.julm-nix.inputs.nixpkgs.follows = "nixpkgs";
 inputs.shell = { type = "path"; path = "./shell"; flake = false; };
index f5577edf63e87e9890c57e6cb9d17a25fa7f3efe..dab9fabc54cb75dab4321e675f581a6961abc3be 100644 (file)
@@ -10,10 +10,8 @@ services.unbound.enable = true;
 
 nix.gc.dates = "daily";
 nix.gc.options = "--delete-older-than 2d";
-nix.extraOptions = ''
-  trusted-public-keys = ${builtins.readFile (inputs.secrets + "/hosts/losurdo/nix/binary-cache-key/1.pub")}
-  substituters = https://nix-extracache.${networking.domain}
-'';
+nix.binaryCaches = [ "https://nix-extracache.${networking.domain}" ];
+nix.binaryCachePublicKeys = [ (builtins.readFile (inputs.secrets + "/hosts/losurdo/nix/binary-cache-key/1.pub")) ];
 
 environment.systemPackages = with pkgs; [
   cryptsetup
index 79eba09e36b5c2b9598237e4d135fbdaec9ec7a6..3cbdd155e1c642a02f02ddfc522b439051d19601 100644 (file)
@@ -57,7 +57,7 @@
 {
   meta.description = "nixos/syncoid: split in multiple systemd services and harden them";
   url = "https://github.com/NixOS/nixpkgs/pull/98455.diff";
-  sha256 = "sha256-mfD7IF3uHNXQk7zqmACNEwb89vyZfI0o5XhVeUOApSs=";
+  sha256 = "sha256-09ECRsdNQfVab4b/V9LxZQdj3JjHjZhCwwyYtViGW+8=";
 }
 /*
 {
@@ -67,9 +67,9 @@
 }
 */
 {
-  meta.description = "Update public-inbox to 1.6.0 and add systemd services";
+  meta.description = "Update public-inbox to 1.6.1 and add systemd services";
   url = "https://github.com/NixOS/nixpkgs/pull/104457.diff";
-  sha256 = "sha256-NLzjeHhot2JxEQ8ewNvVesJExOgTadZ5H/FZai2tW10=";
+  sha256 = "sha256-dVoMeYPivSpZmhO6rwjxYUUJX+n603Y6ytL+2ZNnb9o=";
 }
 /*
 {
   url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
   sha256 = "sha256-i9dhidO/Yf/u6wE08ZIL/s6A/LoaXfz14+Xqc2YvJQg=";
 }
+{
+  meta.description = "x2goserver";
+  url = "https://github.com/averelld/nixpkgs/commit/ac2b1e9915c3176879361fb5fbeab50b177fcce3.diff";
+  sha256 = "sha256-FjYTQD6d6jukLfusYwfHF7wDwE9IAGIvLLyeOs3HHV0=";
+}
 /*
 {
   meta.description = "";