Merge pull request 'Update docker, forgejo, systemd and others' (#219 ) from flake-updates into main

Reviewed-on: #219 Reviewed-by: b12f <b12f@noreply.git.pub.solar> Reviewed-by: Hendrik Sokolowski <hensoko@noreply.git.pub.solar>
loki: move data dir to /data disk with more room
2024-08-07 11:55:29 +00:00 · 2024-08-07 10:19:53 +02:00 · 2024-08-07 10:09:37 +02:00 · 2024-08-06 21:17:23 +02:00
4 changed files with 17 additions and 39 deletions
--- a/flake.lock
+++ b/flake.lock
@ -165,11 +165,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@ -299,11 +299,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722082646,
-        "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
        "type": "github"
      },
      "original": {
@ -330,11 +330,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1722221733,
-        "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
+        "lastModified": 1722869614,
+        "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
+        "rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
        "type": "github"
      },
      "original": {
@ -360,32 +360,16 @@
        "type": "github"
      }
    },
-    "nixpkgs-331083-331168": {
-      "locked": {
-        "lastModified": 1722418656,
-        "narHash": "sha256-C0zLS4tb8yulQ61L0FOQJ+Z3NC3GylewegS7oKJunSs=",
-        "owner": "teutat3s",
-        "repo": "nixpkgs",
-        "rev": "65251f43b4564dbd46a71da90e420326749c02a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "teutat3s",
-        "ref": "backport-element-desktop-1.11.72",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1719876945,
-        "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+        "lastModified": 1722555339,
+        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
      }
    },
    "root": {
@ -402,7 +386,6 @@
        "nixos-flake": "nixos-flake",
        "nixpkgs": "nixpkgs",
        "nixpkgs-2205": "nixpkgs-2205",
-        "nixpkgs-331083-331168": "nixpkgs-331083-331168",
        "simple-nixos-mailserver": "simple-nixos-mailserver",
        "triton-vmtools": "triton-vmtools",
        "unstable": "unstable"
@ -536,11 +519,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1722185531,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "lastModified": 1722813957,
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -4,8 +4,6 @@
    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
    unstable.url = "github:nixos/nixpkgs/nixos-unstable";

-    nixpkgs-331083-331168.url = "github:teutat3s/nixpkgs/backport-element-desktop-1.11.72";
-
    nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";

    nix-darwin.url = "github:lnl7/nix-darwin/master";
--- a/modules/loki/default.nix
+++ b/modules/loki/default.nix
@ -25,7 +25,7 @@
          };
        };
        replication_factor = 1;
-        path_prefix = "/var/lib/loki";
+        path_prefix = "/data/loki";
        storage = {
          filesystem = {
            chunks_directory = "chunks/";
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -10,15 +10,12 @@
              final: prev:
              let
                unstable = import inputs.unstable { system = prev.system; };
-                nixpkgs-331083-331168 = import inputs.nixpkgs-331083-331168 { system = prev.system; };
              in
              {
                element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; };
                element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker {
                  inherit (inputs) element-stickers maunium-stickerpicker;
                };
-                element-web = nixpkgs-331083-331168.element-web;
-                matrix-synapse-unwrapped = nixpkgs-331083-331168.matrix-synapse-unwrapped;
              }
            )
          ];
Author	SHA1	Message	Date
teutat3s	3708d77d9b	Merge pull request 'Update docker, forgejo, systemd and others' (#219 ) from flake-updates into main Reviewed-on: #219 Reviewed-by: b12f <b12f@noreply.git.pub.solar> Reviewed-by: Hendrik Sokolowski <hensoko@noreply.git.pub.solar>	2024-08-07 11:55:29 +00:00
teutat3s	7f2bfd923f	loki: move data dir to /data disk with more room All checks were successful Flake checks / Check (pull_request) Successful in 4m33s Details	2024-08-07 10:19:53 +02:00
teutat3s	30d18c725a	revert: overlay for element-web and matrix-synapse both packages now have the desired version available in nixos-24.05	2024-08-07 10:09:37 +02:00
teutat3s	387d97a2ea	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01) • Updated input 'flake-parts/nixpkgs-lib': '`5daf051448`.tar.gz?narHash=sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI%3D' (2024-07-01) → '`a5d394176e`.tar.gz?narHash=sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q%3D' (2024-08-01) • Updated input 'nix-darwin': 'github:lnl7/nix-darwin/0413754b3cdb879ba14f6e96915e5fdf06c6aab6' (2024-07-27) → 'github:lnl7/nix-darwin/91010a5613ffd7ee23ee9263213157a1c422b705' (2024-08-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29) → 'github:nixos/nixpkgs/883180e6550c1723395a3a342f830bfc5c371f6b' (2024-08-05) • Updated input 'unstable': 'github:nixos/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28) → 'github:nixos/nixpkgs/cb9a96f23c491c081b38eab96d22fa958043c9fa' (2024-08-04)	2024-08-06 21:17:23 +02:00