cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix cryptpad by letting its flake reference its own nixpkgs pin
Some checks failed
use nix / build (push) Failing after 5m23s
Details

Browse source
This commit is contained in:
Cyryl Płotnicki 2024-07-26 09:39:56 +01:00
parent d975021482
commit e396b30573
3 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
flake.lock
View file

@ -47,9 +47,7 @@
"cryptpad": { "cryptpad": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixpkgs-stable"
]
}, },
"locked": { "locked": {
"lastModified": 1710073490, "lastModified": 1710073490,
@ -240,11 +238,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1721838325, "lastModified": 1721979122,
"narHash": "sha256-RT27JgB0rtX4bQ3cxVIA0GRZbKGkUQEpxxRsqExLgd4=", "narHash": "sha256-bZPnYd6ciYJWgR9LtBba5am3S4w/EzgVubidftf81YY=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "ef4a4ff3c558afff0917633876f11b586899934d", "rev": "a1e20a342641241d06c2553a76ee518aca0e35bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +364,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1721839713, "lastModified": 1721911538,
"narHash": "sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo=", "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a7432ebaefc9a400dcda399d48b949230378d784", "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,13 +378,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721892361, "lastModified": 1720535198,
"narHash": "sha256-3u0TfoPAAgNbBPo5FKRYX45fQaOwu/kSorNNZp1oJ1U=", "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "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" "type": "github"
}, },
"original": { "original": {
@ -398,11 +412,11 @@
}, },
"nixpkgs-nixos-unstable": { "nixpkgs-nixos-unstable": {
"locked": { "locked": {
"lastModified": 1721562059, "lastModified": 1721743106,
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +428,11 @@
}, },
"nixpkgs-rust-analyzer": { "nixpkgs-rust-analyzer": {
"locked": { "locked": {
"lastModified": 1721892361, "lastModified": 1721979810,
"narHash": "sha256-3u0TfoPAAgNbBPo5FKRYX45fQaOwu/kSorNNZp1oJ1U=", "narHash": "sha256-Q7QkWaAJzl5X/fleriHLqaXOD+1m+dUHoAMITDnNkdQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a0162c8b00048cc4c238a97616e699ab5063c5a", "rev": "23e715c6b15c98e97fb752f4dc3a3666da286956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,11 +444,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1721686456, "lastModified": 1721821769,
"narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=", "narHash": "sha256-PhmkdTJs2SfqKzSyDB74rDKp1MH4mGk0pG/+WqrnGEw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b", "rev": "d0907b75146a0ccc1ec0d6c3db287ec287588ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,11 +460,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1721890023, "lastModified": 1721978777,
"narHash": "sha256-Q0VVuQBsFuofMsneR4ilRp+eznN8Q/Gz+cv+BlslK6w=", "narHash": "sha256-4hfzhKbj4LWmTbY7/udcwA7TGhsuimo6Q55+yJEtPnA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1002ee1f90ca51d8891642094d3a1e840d82b616", "rev": "1767b9721f84f31784014e40320718a489ed7ad4",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -382,7 +382,6 @@
}; };
cryptpad = { cryptpad = {
url = "github:michaelshmitty/cryptpad-flake"; url = "github:michaelshmitty/cryptpad-flake";
inputs = {nixpkgs.follows = "nixpkgs-stable";};
}; };
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";

1
nixos/boxes/cupsnet/cryptpad.nix
View file

@ -14,6 +14,7 @@ in {
enable = true; enable = true;
configureNginx = true; configureNginx = true;
settings = { settings = {
verbose = true;
httpUnsafeOrigin = domain; httpUnsafeOrigin = domain;
httpSafeOrigin = sandboxDomain; httpSafeOrigin = sandboxDomain;
adminKeys = ["[cyplo@notes.peninsula.industries/I6JogBXmOeSxP0QSMltqs24QR4qgnpo70eRbDDLAFwA=]"]; adminKeys = ["[cyplo@notes.peninsula.industries/I6JogBXmOeSxP0QSMltqs24QR4qgnpo70eRbDDLAFwA=]"];