From e396b3057365f8c14aa8c5c7fb3b83d18faa1cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 26 Jul 2024 09:39:56 +0100 Subject: [PATCH] fix cryptpad by letting its flake reference its own nixpkgs pin --- flake.lock | 64 +++++++++++++++++++------------- flake.nix | 1 - nixos/boxes/cupsnet/cryptpad.nix | 1 + 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index f466ce8c..c24f93ce 100644 --- a/flake.lock +++ b/flake.lock @@ -47,9 +47,7 @@ "cryptpad": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs-stable" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1710073490, @@ -240,11 +238,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721838325, - "narHash": "sha256-RT27JgB0rtX4bQ3cxVIA0GRZbKGkUQEpxxRsqExLgd4=", + "lastModified": 1721979122, + "narHash": "sha256-bZPnYd6ciYJWgR9LtBba5am3S4w/EzgVubidftf81YY=", "owner": "helix-editor", "repo": "helix", - "rev": "ef4a4ff3c558afff0917633876f11b586899934d", + "rev": "a1e20a342641241d06c2553a76ee518aca0e35bb", "type": "github" }, "original": { @@ -366,11 +364,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721839713, - "narHash": "sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo=", + "lastModified": 1721911538, + "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a7432ebaefc9a400dcda399d48b949230378d784", + "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", "type": "github" }, "original": { @@ -380,13 +378,29 @@ "type": "github" } }, - "nixpkgs-master": { + "nixpkgs": { "locked": { - "lastModified": 1721892361, - "narHash": "sha256-3u0TfoPAAgNbBPo5FKRYX45fQaOwu/kSorNNZp1oJ1U=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a0162c8b00048cc4c238a97616e699ab5063c5a", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-master": { + "locked": { + "lastModified": 1721979810, + "narHash": "sha256-Q7QkWaAJzl5X/fleriHLqaXOD+1m+dUHoAMITDnNkdQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23e715c6b15c98e97fb752f4dc3a3666da286956", "type": "github" }, "original": { @@ -398,11 +412,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1721743106, + "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "type": "github" }, "original": { @@ -414,11 +428,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1721892361, - "narHash": "sha256-3u0TfoPAAgNbBPo5FKRYX45fQaOwu/kSorNNZp1oJ1U=", + "lastModified": 1721979810, + "narHash": "sha256-Q7QkWaAJzl5X/fleriHLqaXOD+1m+dUHoAMITDnNkdQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a0162c8b00048cc4c238a97616e699ab5063c5a", + "rev": "23e715c6b15c98e97fb752f4dc3a3666da286956", "type": "github" }, "original": { @@ -430,11 +444,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1721686456, - "narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=", + "lastModified": 1721821769, + "narHash": "sha256-PhmkdTJs2SfqKzSyDB74rDKp1MH4mGk0pG/+WqrnGEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b", + "rev": "d0907b75146a0ccc1ec0d6c3db287ec287588ef6", "type": "github" }, "original": { @@ -446,11 +460,11 @@ }, "nur": { "locked": { - "lastModified": 1721890023, - "narHash": "sha256-Q0VVuQBsFuofMsneR4ilRp+eznN8Q/Gz+cv+BlslK6w=", + "lastModified": 1721978777, + "narHash": "sha256-4hfzhKbj4LWmTbY7/udcwA7TGhsuimo6Q55+yJEtPnA=", "owner": "nix-community", "repo": "NUR", - "rev": "1002ee1f90ca51d8891642094d3a1e840d82b616", + "rev": "1767b9721f84f31784014e40320718a489ed7ad4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6c471f18..9344ea37 100644 --- a/flake.nix +++ b/flake.nix @@ -382,7 +382,6 @@ }; cryptpad = { url = "github:michaelshmitty/cryptpad-flake"; - inputs = {nixpkgs.follows = "nixpkgs-stable";}; }; disko = { url = "github:nix-community/disko"; diff --git a/nixos/boxes/cupsnet/cryptpad.nix b/nixos/boxes/cupsnet/cryptpad.nix index 7e54061a..90c8b77f 100644 --- a/nixos/boxes/cupsnet/cryptpad.nix +++ b/nixos/boxes/cupsnet/cryptpad.nix @@ -14,6 +14,7 @@ in { enable = true; configureNginx = true; settings = { + verbose = true; httpUnsafeOrigin = domain; httpSafeOrigin = sandboxDomain; adminKeys = ["[cyplo@notes.peninsula.industries/I6JogBXmOeSxP0QSMltqs24QR4qgnpo70eRbDDLAFwA=]"];