diff options
| author | Jill <kokakiwi@deuxfleurs.fr> | 2024-08-01 11:35:40 +0000 |
|---|---|---|
| committer | Jill <kokakiwi@deuxfleurs.fr> | 2024-08-01 11:35:40 +0000 |
| commit | ca01149e165b3ad1c9549735caa658efda380cd3 (patch) | |
| tree | 97827bb93518e0ef3aa45e26ee98ff7170669e83 | |
| parent | 6c88813e8d6830a1fdd7b98de7e863a4f6f5e55c (diff) | |
| parent | 093951af05ddca2c97c42d7f43c1bbb8217caba4 (diff) | |
| download | nixcfg-ca01149e165b3ad1c9549735caa658efda380cd3.tar.gz nixcfg-ca01149e165b3ad1c9549735caa658efda380cd3.zip | |
Merge pull request 'Upgrade crytptpad to 2024.6.1' (#32) from KokaKiwi/nixcfg:crytptpad-upgrade-2024.6.1 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/nixcfg/pulls/32
| -rw-r--r-- | cluster/prod/app/cryptpad/build/default.nix | 10 | ||||
| -rw-r--r-- | cluster/prod/app/cryptpad/build/npins/sources.json | 4 | ||||
| -rw-r--r-- | cluster/prod/app/cryptpad/deploy/cryptpad.hcl | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cluster/prod/app/cryptpad/build/default.nix b/cluster/prod/app/cryptpad/build/default.nix index 83296d5..5239be1 100644 --- a/cluster/prod/app/cryptpad/build/default.nix +++ b/cluster/prod/app/cryptpad/build/default.nix @@ -31,8 +31,8 @@ hash = "sha256-BZdExj2q/bqUD3k9uluOot2dlrWKA+vpad49EdgXKww="; }; v7 = { - rev = "ba82142ff242ce385804bcb4287126de52d329f3"; - hash = "sha256-3WX3dTWJoeApon1AH3XplBIvEosVNzchkjgi2C808B4="; + rev = "e1267803ea749cd93e9d5f81438011ea620d04af"; + hash = "sha256-iIds0GnCHAyeIEdSD4aCCgDtnnwARh3NE470CywseS0="; }; }; mkOnlyOffice = { @@ -71,16 +71,16 @@ }); in buildNpmPackage rec { pname = "cryptpad"; - version = "2024.6.0"; + version = "2024.6.1"; src = fetchFromGitHub { owner = "cryptpad"; repo = "cryptpad"; rev = version; - hash = "sha256-huIhhnjatkaVfm1zDeqi88EX/nAUBQ0onPNOwn7hrX4="; + hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0="; }; - npmDepsHash = "sha256-Oh1fBvP7OXC+VDiH3D+prHmi8pRrxld06n30sqw5apY="; + npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw="; inherit nodejs; diff --git a/cluster/prod/app/cryptpad/build/npins/sources.json b/cluster/prod/app/cryptpad/build/npins/sources.json index b750283..ad47dde 100644 --- a/cluster/prod/app/cryptpad/build/npins/sources.json +++ b/cluster/prod/app/cryptpad/build/npins/sources.json @@ -3,8 +3,8 @@ "nixpkgs": { "type": "Channel", "name": "nixos-24.05", - "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.2355.d032c1a6dfad/nixexprs.tar.xz", - "hash": "1fynyfjsmrxs383mygzlbkb3yhzmlnnpf8x84mikaiqc3ngszsv8" + "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.3311.a1cc729dcbc3/nixexprs.tar.xz", + "hash": "13al93fac4xdxj0jllfby2v9klwqdhsf3yg10mnsm9ys84v7gsnn" } }, "version": 3 diff --git a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl index b14a093..048345d 100644 --- a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl +++ b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl @@ -26,7 +26,7 @@ job "cryptpad" { } config { - image = "kokakiwi/cryptpad:2024.6.0" + image = "kokakiwi/cryptpad:2024.6.1" ports = [ "http" ] volumes = [ |