fi/nix-infra
Watch
1
2
Fork
You've already forked nix-infra
 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: fi:0bdb480ebac3ac374de07f8c0dd7f71ecdb96eb6
Branches Tags
fi:main
fi:ikiwiki
fi:mas
..
compare: fi:35f8bbaf209272993c2c9aabd229fd03b413535c
Branches Tags
fi:main
fi:ikiwiki
fi:mas
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/hosts/mastodon/mastodon.nix
View file

@ -16,14 +16,14 @@ let
}; };
mastodonNekoverseOverlay = final: prev: { mastodonNekoverseOverlay = final: prev: {
mastodon = (prev.mastodon.override rec { mastodon = (prev.mastodon.override rec {
version = "4.7.4"; version = "4.7.3";
srcOverride = final.applyPatches { srcOverride = final.applyPatches {
src = pkgs.stdenv.mkDerivation { src = pkgs.stdenv.mkDerivation {
name = "mastodonWithThemes"; name = "mastodonWithThemes";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/mastodon/mastodon.git"; url = "https://github.com/mastodon/mastodon.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+Xctddo4CStftfCb2aBtVO7XCOb22w+HZvuZ4Ds2jps="; sha256 = "sha256-cKLjdk5FWcM4e5bh2P0W2UDP+9CKI6FgHH9vDnjg2xQ=";
}; };
# mastodon ships with broken symlinks, disable the check for that for now # mastodon ships with broken symlinks, disable the check for that for now
dontCheckForBrokenSymlinks = true; dontCheckForBrokenSymlinks = true;

6
config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix
View file

@ -1,14 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
elementAdminVersion = "0.1.18"; elementAdminVersion = "0.1.12";
elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: { elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "element-admin"; pname = "element-admin";
version = elementAdminVersion; version = elementAdminVersion;
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip"; url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip";
sha256 = "sha256-gyqYcY17FGVo6ZlKonwRTqtZZsiPmjYgD6u/dpYncks="; sha256 = "sha256-+vm3oem3B9vEaWBc5I9huaEpgoajN74tJ1K5xt7U9n4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,7 +19,7 @@ let
pnpmDeps = pkgs.pnpm.fetchDeps { pnpmDeps = pkgs.pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
fetcherVersion = 3; fetcherVersion = 3;
hash = "sha256-iNKQ6P+psdgWSVjP5mLKlTIUIe/fBxFMMVami5E8oLc="; hash = "sha256-29clkcYO7xXX5c+cVpyaBIAo3Xyp5z4f13Lg3eWMZ9I=";
}; };
buildPhase = '' buildPhase = ''

42
flake.lock generated
View file

@ -24,11 +24,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1793370552, "lastModified": 1792936775,
"narHash": "sha256-Dv4jEQeqvPpicC3H8mLTyqtTgXp23p4HPiCMKqKWXFA=", "narHash": "sha256-eaU2pHtCYaICoKVZrE6kMvhjdW64i9LGgWUcfBjQAmU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "colmena", "repo": "colmena",
"rev": "fc7d67ed1cd52af91415f92ba92b543bc7245f25", "rev": "3ec48100cdc024300b0c442fff34e7b3d5c8addb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1792773339, "lastModified": 1791734076,
"narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +176,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1793649591, "lastModified": 1792954525,
"narHash": "sha256-uVRQhN/OZYdudVAi8L94i6MdkdKwUzEE5B2c7rSzHWw=", "narHash": "sha256-9uy/ZZu4UtRnAYvVVkzDAGUKphO/QeePleERbLyMcKo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3e80179921b4aa4952aa0e9c3b6ec55f3fdc098", "rev": "6336634c29b84fe925b343fa1a4c92e1d169a9e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1793580174, "lastModified": 1792925778,
"narHash": "sha256-Df87rV1AnZaIX3kM7LZ6bHKKqZ1v8MnK/g286JDTcyw=", "narHash": "sha256-aCg6fAHZszDX68IsLPUm/NQ7ZVXMHk74bjHAIr8K5dM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "577e5b3393ab727c2cd3768ef981a7ba7d8c120d", "rev": "acc2ec71996e90e6e011fa14979b13cdc070ec79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1793571983, "lastModified": 1792926719,
"narHash": "sha256-hwLE3wUw9gnplbv1I4EaB92BecfYK4P0sl84SmB5SPs=", "narHash": "sha256-zwKdE7sT2nhFOxXZVBkxH7RQw3J61coMAewFjNFSjR4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64aec40e18595d342f25f120069f2cb63c3947b4", "rev": "3ea16152199721889ec1b3e9ab1503dbadc583ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1793052255, "lastModified": 1792809984,
"narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=", "narHash": "sha256-KV+CaZX7QS0hcdKxwGKehDb1jmUgx6lbkTPpaoIW5Nw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d", "rev": "442449fa7b1fe6c692d0103ac9fc8f9e82931cf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -293,11 +293,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1793044983, "lastModified": 1791836840,
"narHash": "sha256-TMADWku9ye40AQKGMdSoCpByfqaL7kbO+o8E46Q7CLQ=", "narHash": "sha256-3Ahbtge+KeRUBrpfGA9kNnXwuKC8n9dG+FBlf5jfVO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89844ad35df40e876cb6d0a3a319fbf65ea4b984", "rev": "a869610ddd0c17e9c29f13e333bfca6eb8a5c3b4",
"type": "github" "type": "github"
}, },
"original": { "original": {