update flake inputs

(also remove some broken things / reduce closure size for chaski)

4 files changed, 45 insertions, 31 deletions

diff --git a/abbenay/configuration.nix b/abbenay/configuration.nix
index 47f9a9b..0474c62 100644
--- a/abbenay/configuration.nix
+++ b/abbenay/configuration.nix
@@ -19,7 +19,7 @@
 
   environment.systemPackages = with pkgs; [
     gnome3.gnome-tweaks
-    flatpak flatpak-builder
+    flatpak
     # for mounting samba
     cifs-utils
   ];
diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix
index bd99abf..ade9b68 100644
--- a/chaski/services/tracktrain.nix
+++ b/chaski/services/tracktrain.nix
@@ -1,5 +1,17 @@
 { config, lib, pkgs, inputs, ... }:
 
+let
+  # this gets rid of the implicit dependency on ghc, reducing closure size
+  stripLib = drv: pkgs.stdenv.mkDerivation {
+    name = drv.name + "-without-lib";
+    src = drv.outPath;
+    buildPhase = ''
+      mkdir -p $out
+      cp -r $src/bin $out
+    '';
+    phases = [ "buildPhase" ];
+  };
+in
 {
   services.nginx.virtualHosts."tracktrain.stuebinm.eu" = {
     locations."/" = {
@@ -36,13 +48,13 @@
         script = ''
           cd /tmp
           wget "https://ilztalbahn.eu/wp-content/uploads/2020/07/gtfs.zip"
-          ${((import inputs.tracktrain {nixpkgs = pkgs;}))
+          ${stripLib (((import inputs.tracktrain {nixpkgs = pkgs;}))
             # have to remove version constraints because some aren't in 22.05
             .overrideAttrs (old: { patchPhase = ''
               sed -i "s/base.*/base/g" *.cabal
               sed -i "s/^>=.*//g" *.cabal
               sed -i "s/>=.*//g" *.cabal
-            ''; })
+            ''; }))
            }/bin/tracktrain "dbname=tracktrain user=tracktrain"
         '';
         startAt = "daily";
diff --git a/flake.lock b/flake.lock
index 21fe586..db37506 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,8 +31,8 @@
     "blog": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-oYszqrdbejPEQXtUr173QPNFOx5eLLQfgp85GqlnLrY=",
-        "path": "/home/stuebinm/Dokumente/blog",
+        "narHash": "sha256-rvo/7QNbTkD7a7h7zq5J8Eft5YdlwNJXB4lw012sPgo=",
+        "path": "/home/stuebinm/projects/blog",
         "type": "path"
       },
       "original": {
@@ -114,11 +114,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654113405,
-        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
+        "lastModified": 1656169755,
+        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
+        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
         "type": "github"
       },
       "original": {
@@ -150,11 +150,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1655200170,
-        "narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=",
+        "lastModified": 1658166980,
+        "narHash": "sha256-gRlO+Cy0zM83PLgIASAD+q5CVk7xH1hIPHLrRhcJPQ4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8",
+        "rev": "c35cc3546f09d0d74fccf819aa467032355663c1",
         "type": "github"
       },
       "original": {
@@ -164,35 +164,35 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1655183247,
-        "narHash": "sha256-RQwSjdHA3MY/UpKpuT+Nv5HfFj8yCQHwKLd287j9jbE=",
+        "lastModified": 1654936503,
+        "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3c2068d6c90cab895afad0f8249fcf968aea4bca",
+        "rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-22.05",
+        "type": "indirect"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1642635915,
-        "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
+        "lastModified": 1658119717,
+        "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f",
+        "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "playground": {
@@ -250,15 +250,18 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-22_05": "nixpkgs-22_05",
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1653423337,
-        "narHash": "sha256-TLNyDhwhQWimt5QWzFf/3B7lKk5isdICNRTwiCAhiB0=",
+        "lastModified": 1655930346,
+        "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "15cf252a0dfffb2420a60fbd6be3467c11026142",
+        "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
         "type": "gitlab"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4106417..4904e5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,6 @@
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
-    # simple-nixos-mailserver.follows = "nixpkgs";
 
     uplcg.url = "git+https://stuebinm.eu/git/uplcg?ref=main";
     uplcg.flake = false;