diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2021-02-25 22:16:42 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@gmail.com> | 2021-02-25 22:16:42 +0300 |
| commit | 58de60f30bc9da2591921ecf7b88d49992c007b1 (patch) | |
| tree | dec951ff0ed76c8d3390851b838ba0d7369542c1 /pkgs/servers | |
| parent | 7ce33fa62785d406d56c353c3680fc75cf13c928 (diff) | |
| download | nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.tar nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.tar.gz nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.tar.bz2 nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.tar.lz nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.tar.xz nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.tar.zst nixpkgs-58de60f30bc9da2591921ecf7b88d49992c007b1.zip | |
gpsd: 3.21 → 3.22
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/gpsd/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/gpsd/sconstruct-env-fixes.patch | 7 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index b7d50719305..62b711af67a 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "gpsd"; - version = "3.21"; + version = "3.22"; src = fetchurl { - url = "https://download-mirror.savannah.gnu.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "14gyqrbrq6jz4y6x59rdpv9d4c3pbn0vh1blq3iwrc6kz0x4ql35"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + sha256 = "18rplv1cd76ndb2wc91jarjmfm2nk508pykv1hir79bqbwmdygvq"; }; nativeBuildInputs = [ @@ -46,15 +46,12 @@ stdenv.mkDerivation rec { ./sconstruct-env-fixes.patch ]; - postPatch = '' - sed -i -e '17i#include <sys/sysmacros.h>' serial.c - ''; - # - leapfetch=no disables going online at build time to fetch leap-seconds # info. See <gpsd-src>/build.txt for more info. preBuild = '' patchShebangs . - sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct + sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript + export TAR=noop sconsFlags+=" udevdir=$out/lib/udev" sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" @@ -104,7 +101,8 @@ stdenv.mkDerivation rec { diagnostic monitoring and profiling of receivers and feeding location-aware applications GPS/AIS logs for diagnostic purposes. ''; - homepage = "http://catb.org/gpsd/"; + homepage = "https://gpsd.gitlab.io/gpsd/index.html"; + changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor rasendubi ]; diff --git a/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/pkgs/servers/gpsd/sconstruct-env-fixes.patch index e90bd04b634..d11ad1299f0 100644 --- a/pkgs/servers/gpsd/sconstruct-env-fixes.patch +++ b/pkgs/servers/gpsd/sconstruct-env-fixes.patch @@ -1,6 +1,7 @@ ---- SConstruct.orig 2020-12-03 12:39:40.759793977 -0600 -+++ gpsd-3.21/SConstruct 2020-12-03 12:44:30.858761753 -0600 -@@ -516,9 +516,11 @@ +diff -Naur gpsd-3.22.orig/SConscript gpsd-3.22/SConscript +--- gpsd-3.22.orig/SConscript 2021-01-09 05:35:30.000000000 +0300 ++++ gpsd-3.22/SConscript 2021-02-25 21:06:47.921044438 +0300 +@@ -518,9 +518,11 @@ 'CWRAPPERS_CONFIG_DIR', # pkgsrc # Variables used in testing 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. |