diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/galmon.nix | 7 | ||||
| -rw-r--r-- | pkgs/galmon.patch | 101 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 3 |
3 files changed, 108 insertions, 3 deletions
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 |