jump to nixos 23.11

12 files changed, 152 insertions, 71 deletions

diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix
index bbaa693..50ba440 100644
--- a/chaski/services/tracktrain.nix
+++ b/chaski/services/tracktrain.nix
@@ -137,9 +137,7 @@ in
         ensureDatabases = [ "tracktrain" ];
         ensureUsers = [ {
           name = "tracktrain";
-          ensurePermissions = {
-            "DATABASE tracktrain" = "ALL PRIVILEGES";
-          };
+          ensureDBOwnership = true;
         } ];
         authentication = ''
           local   all   all                              trust
diff --git a/common/desktop.nix b/common/desktop.nix
index 37c299f..d59b4d8 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -5,9 +5,9 @@
     ./common.nix
   ];
 
-  nix.extraOptions = ''
-    plugin-files = ${pkgs.nix-doc}/lib/libnix_doc_plugin.so
-  '';
+  # nix.extraOptions = ''
+  #   plugin-files = ${pkgs.nix-doc}/lib/libnix_doc_plugin.so
+  # '';
 
   # Enable CUPS to print documents.
   services.printing = {
@@ -77,11 +77,12 @@
   #boot.kernelParams = [ "console=tty1" ];
 
   hardware.opengl.enable = true;
-  fonts.enableDefaultFonts = true;
+  fonts.enableDefaultPackages = true;
   programs.xwayland.enable = false;
   programs.wireshark.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
   xdg.portal.enable = true;
+  xdg.portal.config.common.default = "*";
   services.flatpak.enable = true;
 
   # Enable sound.
diff --git a/flake.lock b/flake.lock
index e77a9b9..9893546 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "bahnhof-name": {
       "flake": false,
       "locked": {
-        "lastModified": 1701279248,
-        "narHash": "sha256-ejAr+Tc3TIvWTu/Tt+4sju0udaqgb8L/DCv9XnKDgY4=",
+        "lastModified": 1701368232,
+        "narHash": "sha256-wLWb8xbfyusEcjl10KLgJh8worFxfVzTNJq2SdLQFD8=",
         "ref": "refs/heads/main",
-        "rev": "71c2ceb1c6b78a10dccc4419c0204ef0bea68974",
-        "revCount": 20,
+        "rev": "2c91d094847a072292f279b18b698b387e5b2397",
+        "revCount": 21,
         "type": "git",
         "url": "https://stuebinm.eu/git/bahnhof.name"
       },
@@ -174,16 +174,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "lastModified": 1700814205,
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -204,33 +204,18 @@
         "url": "https://stuebinm.eu/git/isabelle-utils"
       }
     },
-    "nix-gleam": {
-      "locked": {
-        "lastModified": 1699114633,
-        "narHash": "sha256-WwXpcfhX2K2aPN9nVLQl9t6zPRiXnsGadJT/m33hGkY=",
-        "owner": "arnarg",
-        "repo": "nix-gleam",
-        "rev": "e9227676594132020f289f04f75b3aa3d4b79723",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arnarg",
-        "repo": "nix-gleam",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699291058,
-        "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
+        "lastModified": 1701263465,
+        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
+        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -252,11 +237,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1699343069,
-        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
+        "lastModified": 1701237617,
+        "narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+        "rev": "85306ef2470ba705c97ce72741d56e42d0264015",
         "type": "github"
       },
       "original": {
@@ -292,7 +277,6 @@
         "gtfsBooks": "gtfsBooks",
         "home-manager": "home-manager",
         "isabelle-utils": "isabelle-utils",
-        "nix-gleam": "nix-gleam",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "playground": "playground",
@@ -314,11 +298,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699409596,
-        "narHash": "sha256-L3g1smIol3dGTxkUQOlNShJtZLvjLzvtbaeTRizwZBU=",
+        "lastModified": 1701310566,
+        "narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "58240e1ac627cef3ea30c7732fedfb4f51afd8e7",
+        "rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff",
         "type": "github"
       },
       "original": {
@@ -358,11 +342,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1695910380,
-        "narHash": "sha256-CyzeiXQGm8ceEOSK1dffBCfO7JNp8XhQeNkUiJ5HxgY=",
+        "lastModified": 1700085753,
+        "narHash": "sha256-qtib7f3eRwfaUF+VziJXiBcZFqpHCAXS4HlrFsnzzl4=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "84783b661ecf33927c534b6476beb74ea3308968",
+        "rev": "008d78cc21959e33d0d31f375b88353a7d7121ae",
         "type": "gitlab"
       },
       "original": {
@@ -382,11 +366,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699311858,
-        "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=",
+        "lastModified": 1701127353,
+        "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "664187539871f63857bda2d498f452792457b998",
+        "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4ea0bcd..d6d6c18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,10 +5,10 @@
   '';
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     deploy-rs.url = "git+https://stuebinm.eu/git/forks/deploy-rs?ref=nom-flag";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
@@ -16,12 +16,12 @@
       "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
     simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs-unstable";
     simple-nixos-mailserver.inputs.nixpkgs-23_05.follows = "nixpkgs";
+    simple-nixos-mailserver.inputs.nixpkgs-23_11.follows = "nixpkgs";
     rust-overlay.url = "github:oxalica/rust-overlay";
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
-    nix-gleam.url = "github:arnarg/nix-gleam";
 
     uplcg.url = "git+https://stuebinm.eu/git/forks/uplcg?ref=main";
     uplcg.flake = false;
@@ -56,7 +56,6 @@
         system = "x86_64-linux";
         overlays = [
           inputs.rust-overlay.overlays.default
-          inputs.nix-gleam.overlays.default
           self.overlays.default
         ];
       };
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index ec655a2..51b9950 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -163,7 +163,7 @@ in
         ensureDatabases = [ "pleroma" ];
         ensureUsers = [ {
           name = "pleroma";
-          ensurePermissions."DATABASE pleroma" = "ALL PRIVILEGES";
+          ensureDBOwnership = true;
         } ];
 
         # give pleroma access. must be done with lib.mkForce, for some reason
diff --git a/home/home.nix b/home/home.nix
index 5a01960..a67a693 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -222,7 +222,7 @@
   programs.newsboat = {
     enable = true;
     urls = (import ./newsboat-public.nix) ++ (import inputs.feeds).rss;
-    browser = lib.getExe pkgs.offpunk;
+    browser = lib.getExe' pkgs.offpunk "offpunk";
     reloadThreads = 200;
     queries = {
       unread = ''unread="yes"'';
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index f24226b..12c549c 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -13,7 +13,7 @@
     pandoc
     # general cli utils
     tree dnsutils inetutils pijul bat age libsecret gping bottom dogdns
-    cifs-utils jekyll fzf ripgrep fd sd bandwhich exa dive
+    cifs-utils jekyll fzf ripgrep fd sd bandwhich eza dive
     ripgrep shellcheck graphviz
     zip unzip acpi sfz viu glow
     yt-dlp weechat hexyl bottom lm_sensors
diff --git a/home/packages.nix b/home/packages.nix
index 6314e94..18f5ded 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -35,6 +35,7 @@ in
     gpsd galmon-full
     # things for emacs
     sqlite brightnessctl scrot playerctl tlp (aspellWithDicts (ds: [ds.en]))
+    emacs.pkgs.mu4e
     # haskell & co
     ghc cabal-install stack
     haskell-language-server
@@ -47,7 +48,7 @@ in
     jq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
     libxml2 fq htmlq
     # purescript
-    spago purescript # nodePackages.purescript-language-server nodejs
+    #spago purescript # nodePackages.purescript-language-server nodejs
     # rust
     #cargo rustc
     rust-bin.stable.latest.minimal
@@ -60,7 +61,8 @@ in
     julia python39 inweb
     # nix things
     nixfmt niv inputs.deploy-rs.defaultPackage.${system}
-    haskellPackages.nix-serve-ng nix-doc nix-output-monitor
+    #haskellPackages.nix-serve-ng
+    nix-doc nix-output-monitor
     direnv rnix-lsp
     # isabelle
     (isabelle.mkEnv "isabelle-env" "fish")
diff --git a/ilex/configuration.nix b/ilex/configuration.nix
index e309c41..e87af9a 100644
--- a/ilex/configuration.nix
+++ b/ilex/configuration.nix
@@ -43,24 +43,16 @@
     ensureDatabases = [ "tracktrain" "glitchtrip" "crstracker" "travelynx" ];
     ensureUsers = [ {
       name = "tracktrain";
-      ensurePermissions = {
-        "DATABASE tracktrain" = "ALL PRIVILEGES";
-      };
+      ensureDBOwnership = true;
     } {
       name = "travelynx";
-      ensurePermissions = {
-        "DATABASE travelynx" = "ALL PRIVILEGES";
-      };
+      ensureDBOwnership = true;
     } {
       name = "glitchtrip";
-      ensurePermissions = {
-        "DATABASE glitchtrip" = "ALL PRIVILEGES";
-      };
+      ensureDBOwnership = true;
     } {
       name = "crstracker";
-      ensurePermissions = {
-        "DATABASE crstracker" = "ALL PRIVILEGES";
-      };
+      ensureDBOwnership = true;
     } ];
     authentication = ''
       local   all   all                              trust
diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix
index 87e77fd..a5a7566 100644
--- a/pkgs/galmon.nix
+++ b/pkgs/galmon.nix
@@ -6,6 +6,7 @@
 , ncurses5
 , zstd
 , zlib
+, abseil-cpp
 , curl
 , gitMinimal
 , stdenv
@@ -26,12 +27,14 @@ stdenv.mkDerivation {
     owner = "berthubert";
     repo = "galmon";
     rev = "refs/heads/master";
-    sha256 = "sha256-QDluII9Ry3smMup5yOkAQZi35Phdf8m3fsQLDT8JFGc=";
+    hash = "sha256-QDluII9Ry3smMup5yOkAQZi35Phdf8m3fsQLDT8JFGc=";
     fetchSubmodules = true;
   };
 
+  patches = [ ./galmon.patch ];
+
   buildInputs = [
-    protobuf pkg-config h2o openssl eigen ncurses5 zstd zlib curl gitMinimal
+    protobuf pkg-config h2o openssl eigen ncurses5 zstd zlib curl gitMinimal abseil-cpp
   ];
 
   buildPhase = ''
diff --git a/pkgs/galmon.patch b/pkgs/galmon.patch
new file mode 100644
index 0000000..f53c504
--- /dev/null
+++ b/pkgs/galmon.patch
@@ -0,0 +1,101 @@
+From b2de12bf49f4992f20539e5d5233a36775fa46bc Mon Sep 17 00:00:00 2001
+From: stuebinm <stuebinm@disroot.org>
+Date: Thu, 30 Nov 2023 22:05:58 +0100
+Subject: [PATCH] libabseil doesn't link by itself anymore
+
+---
+ Makefile | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8afa6ef..5d3e9ad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -79,48 +79,48 @@ decrypt: decrypt.o bits.o ${FMT}/src/format.o
+ 	$(CXX) -std=gnu++17 $^ -o $@ 
+ 
+ navparse: navparse.o ${FMT}/src/format.o $(H2OPP) $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o trkmeas.o influxpush.o ${EXTRADEP} githash.o sbas.o rtcm.o galileo.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -L/usr/local/opt/openssl/lib/  -lh2o-evloop -lssl -lcrypto -lz  -lcurl -lprotobuf  $(WSLAY)
++	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -L/usr/local/opt/openssl/lib/  -lh2o-evloop -lssl -lcrypto -lz  -lcurl -lprotobuf -labsl_log_internal_message -labsl_log_internal_check_op  $(WSLAY)
+ 
+ reporter: reporter.o ${FMT}/src/format.o $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o githash.o influxpush.o 
+-	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl
++	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ sp3feed: sp3feed.o ${FMT}/src/format.o $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o influxpush.o githash.o sp3.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl
++	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl  -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ tracker: tracker.o ${FMT}/src/format.o $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl
++	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ galmonmon: galmonmon.o ${FMT}/src/format.o $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl
++	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ # rs.o fixhunter.o
+ navdump: navdump.o ${FMT}/src/format.o ${FMT}/src/os.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o navmon.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o sp3.o osen.o trkmeas.o githash.o rinex.o sbas.o rtcm.o galileo.o  ${EXTRADEP}
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread  -lprotobuf -lz 
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread  -lprotobuf -lz -labsl_log_internal_message -labsl_log_internal_check_op
+ # -lfec
+ 
+ navdisplay: navdisplay.o ${FMT}/src/format.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o ephemeris.o navmon.o osen.o githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread  -lprotobuf -lncurses
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread  -lprotobuf -lncurses -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ navnexus: navnexus.o ${FMT}/src/format.o  $(SIMPLESOCKETS) bits.o navmon.pb.o storage.o githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ navcat: navcat.o ${FMT}/src/format.o  $(SIMPLESOCKETS) ubx.o bits.o navmon.pb.o storage.o navmon.o githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ navrecv: navrecv.o ${FMT}/src/format.o $(SIMPLESOCKETS) navmon.pb.o storage.o githash.o zstdwrap.o navmon.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -lzstd 
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -lzstd -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ navmerge: navmerge.o ${FMT}/src/format.o $(SIMPLESOCKETS) navmon.pb.o storage.o githash.o zstdwrap.o navmon.o nmmsender.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -lzstd 
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -lzstd -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ tlecatch: tlecatch.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf  
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf   -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ rinreport: rinreport.o rinex.o githash.o navmon.o ${FMT}/src/format.o  ephemeris.o osen.o
+ 	$(CXX) -std=gnu++17 $^ -o $@ -lz -pthread
+@@ -130,18 +130,19 @@ rinjoin: rinjoin.o rinex.o githash.o navmon.o ${FMT}/src/format.o  ephemeris.o o
+ 
+ 
+ rtcmtool: rtcmtool.o navmon.pb.o githash.o ${FMT}/src/format.o  bits.o nmmsender.o $(SIMPLESOCKETS)  navmon.o rtcm.o zstdwrap.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lz -pthread -lprotobuf -lzstd
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lz -pthread -lprotobuf -lzstd -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ ubxtool: navmon.pb.o ubxtool.o ubx.o bits.o ${FMT}/src/format.o galileo.o  gps.o beidou.o navmon.o ephemeris.o $(SIMPLESOCKETS) osen.o githash.o nmmsender.o zstdwrap.o 
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lprotobuf -pthread -lzstd
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lprotobuf -pthread -lzstd -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ septool: navmon.pb.o septool.o bits.o ${FMT}/src/format.o galileo.o  gps.o beidou.o navmon.o ephemeris.o $(SIMPLESOCKETS) osen.o githash.o nmmsender.o zstdwrap.o 
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lprotobuf -pthread -lzstd
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lprotobuf -pthread -lzstd -labsl_log_internal_message -labsl_log_internal_check_op
+ 
+ 
+ testrunner: navmon.pb.o testrunner.o ubx.o bits.o ${FMT}/src/format.o galileo.o  gps.o beidou.o ephemeris.o sp3.o osen.o navmon.o rinex.o githash.o
+-	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lprotobuf -lz  -pthread
++	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -lprotobuf -lz  -pthread -labsl_log_internal_message -labsl_log_internal_check_op
++
+ 
+ gndate: gndate.o githash.o ${FMT}/src/format.o navmon.o
+ 	$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib
+-- 
+2.42.0
+
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 71ee3b4..3d6db42 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -86,9 +86,10 @@ in
 
   bahnhof-name =
     let
-      haskellPkgs = self.haskellPackages.override (old: {
+      haskellPkgs = self.haskell.packages.ghc928.override (old: {
         overrides = self': super': with self.haskell.lib; {
           fuzzyfind = unmarkBroken (doJailbreak super'.fuzzyfind);
+          fuzzyset = unmarkBroken (doJailbreak super'.fuzzyset);
         };
       });
       pkg = { mkDerivation, base, bytestring, cassava, containers