diff options
| -rw-r--r-- | flake.lock | 58 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | modules/common/networking.nix | 4 | ||||
| -rw-r--r-- | modules/tlmp/default.nix | 2 |
4 files changed, 33 insertions, 33 deletions
@@ -7,11 +7,11 @@ "parts": "parts_2" }, "locked": { - "lastModified": 1723471763, + "lastModified": 1723474345, "narHash": "sha256-ecMLAommojGLRp+s0WFfGZyu2+PfxEk83cvs1IIGo9Y=", "owner": "cocainefarm", "repo": "catinator", - "rev": "f045a12e0af8432c8c7dc2fb1e32805813467091", + "rev": "d212b916c3953d52e47b0a89890b6bf52dec7591", "type": "gitlab" }, "original": { @@ -107,11 +107,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1696944707, - "narHash": "sha256-/3mkN7ikzP89G3LqYnZ4jXw1AurEKr1xKkXtA2/WG88=", + "lastModified": 1738681534, + "narHash": "sha256-WGZprPAWRfS15PdSy4Bw35XQvvvmHNsv4DR57dYN5ug=", "owner": "maxaudron", "repo": "nixinate", - "rev": "09cbd84c8595f7ca10cf5c1b8adcad9ba732a565", + "rev": "a2d0ff83372d22c351bd83c51d2538db1470a065", "type": "github" }, "original": { @@ -261,14 +261,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs-lib_2": { @@ -291,11 +291,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1731155921, - "narHash": "sha256-ELwwvRVFYCVXDwxf6x9Y0pcNFkN/pK6Z6vL30yDZJsA=", + "lastModified": 1738679813, + "narHash": "sha256-aTmgnMwjun4vyfVsJBEOxmYD645Am9tYNmviGLi1K8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c2c5fa14d77edb0134f87f4b5670ee84307a375", + "rev": "a83d658bc5baa767086daec1c013b643281246b2", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1738546358, + "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", "type": "github" }, "original": { @@ -339,16 +339,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1738574474, + "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -462,11 +462,11 @@ "parts": "parts_4" }, "locked": { - "lastModified": 1723482736, - "narHash": "sha256-6A/xDPR6Ks8rmPj74mGcoApBddPzgKr5q/SO24zjbEw=", + "lastModified": 1734483116, + "narHash": "sha256-iXWkMCIVRwwQwP4JwvtXgf3kcJmfnmoTKwRquDcdeWY=", "owner": "cocainefarm", "repo": "pastor", - "rev": "ad9c820d64451e26d6b3101d1f0bb7e1d64b772b", + "rev": "fcac4e46ca1cb4f5a8d15edade664c95cc010293", "type": "gitlab" }, "original": { @@ -605,11 +605,11 @@ "secrets": { "flake": false, "locked": { - "lastModified": 1709387187, - "narHash": "sha256-Q7jtbNuCK9Ng7y68VhAdG2IaIuSbQfg2W/9jpV0hDDU=", + "lastModified": 1723468369, + "narHash": "sha256-BtC+Xp1OVLgJc59NNwYJ+lnRT0x+RyVKWtRuIFx2ZlU=", "ref": "refs/heads/main", - "rev": "0303b29d9194d42649dc6206d382d1a93f157af5", - "revCount": 27, + "rev": "21f3a5c51dd80a434f43c2e1c960a9f2c88e6a88", + "revCount": 28, "type": "git", "url": "ssh://git@gitlab.com/cocainefarm/k8s/secrets" }, @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/modules/common/networking.nix b/modules/common/networking.nix index 5281403..63c0d89 100644 --- a/modules/common/networking.nix +++ b/modules/common/networking.nix @@ -23,11 +23,11 @@ RemainAfterExit = true; PrivateNetwork = true; ExecStart = "${pkgs.writers.writeDash "netns-up" '' - ${pkgs.iproute}/bin/ip netns add $1 + ${pkgs.iproute2}/bin/ip netns add $1 ${pkgs.utillinux}/bin/umount /var/run/netns/$1 ${pkgs.utillinux}/bin/mount --bind /proc/self/ns/net /var/run/netns/$1 ''} %I"; - ExecStop = "${pkgs.iproute}/bin/ip netns del %I"; + ExecStop = "${pkgs.iproute2}/bin/ip netns del %I"; PrivateMounts = false; }; }; diff --git a/modules/tlmp/default.nix b/modules/tlmp/default.nix index 6c8029a..ddb9ff3 100644 --- a/modules/tlmp/default.nix +++ b/modules/tlmp/default.nix @@ -2,7 +2,7 @@ with self.lib.nginx; { - imports = [ ./rutorrent.nix ./rtorrent.nix ]; + imports = [ ./rtorrent.nix ]; security.acme.certs = { "media.cocaine.farm" = { |