Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 10 Pull requests 2 Projects Releases Wiki Activity

Compare commits

base: Deuxfleurs:ca01149e165b3ad1c9549735caa658efda380cd3
Branches Tags
Deuxfleurs:main
Deuxfleurs:fix_ports_conflicts
Deuxfleurs:debug-cryptpad-update
Deuxfleurs:telemetry-update
Deuxfleurs:jitsi
Deuxfleurs:feat/im-tls-proxy
Deuxfleurs:simplify-network-config
Deuxfleurs:plume-s3
Deuxfleurs:wgautomesh-service-v2
Deuxfleurs:refactor
..
compare: Deuxfleurs:6c88813e8d6830a1fdd7b98de7e863a4f6f5e55c
Branches Tags
Deuxfleurs:fix_ports_conflicts
Deuxfleurs:main
Deuxfleurs:debug-cryptpad-update
Deuxfleurs:telemetry-update
Deuxfleurs:jitsi
Deuxfleurs:feat/im-tls-proxy
Deuxfleurs:simplify-network-config
Deuxfleurs:plume-s3
Deuxfleurs:wgautomesh-service-v2
Deuxfleurs:refactor

No commits in common. "ca01149e165b3ad1c9549735caa658efda380cd3" and "6c88813e8d6830a1fdd7b98de7e863a4f6f5e55c" have entirely different histories.
ca01149e16 ... 6c88813e8d

3 changed files with 8 additions and 8 deletions
Show stats Expand all files Collapse all files

10
cluster/prod/app/cryptpad/build/default.nix
View file

@ -31,8 +31,8 @@
hash = "sha256-BZdExj2q/bqUD3k9uluOot2dlrWKA+vpad49EdgXKww="; hash = "sha256-BZdExj2q/bqUD3k9uluOot2dlrWKA+vpad49EdgXKww=";
}; };
v7 = { v7 = {
rev = "e1267803ea749cd93e9d5f81438011ea620d04af"; rev = "ba82142ff242ce385804bcb4287126de52d329f3";
hash = "sha256-iIds0GnCHAyeIEdSD4aCCgDtnnwARh3NE470CywseS0="; hash = "sha256-3WX3dTWJoeApon1AH3XplBIvEosVNzchkjgi2C808B4=";
}; };
}; };
mkOnlyOffice = { mkOnlyOffice = {
@ -71,16 +71,16 @@
}); });
in buildNpmPackage rec { in buildNpmPackage rec {
pname = "cryptpad"; pname = "cryptpad";
version = "2024.6.1"; version = "2024.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cryptpad"; owner = "cryptpad";
repo = "cryptpad"; repo = "cryptpad";
rev = version; rev = version;
hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0="; hash = "sha256-huIhhnjatkaVfm1zDeqi88EX/nAUBQ0onPNOwn7hrX4=";
}; };
npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw="; npmDepsHash = "sha256-Oh1fBvP7OXC+VDiH3D+prHmi8pRrxld06n30sqw5apY=";
inherit nodejs; inherit nodejs;

4
cluster/prod/app/cryptpad/build/npins/sources.json
View file

@ -3,8 +3,8 @@
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",
"name": "nixos-24.05", "name": "nixos-24.05",
"url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.3311.a1cc729dcbc3/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.2355.d032c1a6dfad/nixexprs.tar.xz",
"hash": "13al93fac4xdxj0jllfby2v9klwqdhsf3yg10mnsm9ys84v7gsnn" "hash": "1fynyfjsmrxs383mygzlbkb3yhzmlnnpf8x84mikaiqc3ngszsv8"
} }
}, },
"version": 3 "version": 3

2
cluster/prod/app/cryptpad/deploy/cryptpad.hcl
View file

@ -26,7 +26,7 @@ job "cryptpad" {
} }
config { config {
image = "kokakiwi/cryptpad:2024.6.1" image = "kokakiwi/cryptpad:2024.6.0"
ports = [ "http" ] ports = [ "http" ]
volumes = [ volumes = [