diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 050c54e168d2..c929f1da5b61 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl , withALSA ? true, alsa-lib , withPulseAudio ? false, libpulseaudio , withPortAudio ? false, portaudio @@ -7,21 +7,21 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE="; + sha256 = "sha256-lZ7wFhXJ9I4IcHLLoyMTnq3MJDtUNcVdMHYLThuN7c8="; }; - cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M="; + cargoSha256 = "sha256-JLNB196GWpLyCrZ8fBH8+1RF1fa6PhdwFw6RW3fUARM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin libiconv + buildInputs = [ ncurses ] + ++ lib.optional stdenv.isLinux openssl ++ lib.optional withALSA alsa-lib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.nix b/pkgs/applications/misc/gpsbabel/debian-patches.nix new file mode 100644 index 000000000000..34dd2db31c57 --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/debian-patches.nix @@ -0,0 +1,26 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "https://sources.debian.org/data/main/g/gpsbabel/1.8.0+ds-4/debian/patches"; +in +[ + { + url = "${prefix}/gpsbabelfe_disable_version_check"; + sha256 = "1kk1iq4mbmldl1jjvd4bphr0165rgn2gpqdyyd1vq8v8wjx942sb"; + } + { + url = "${prefix}/gpsbabelfe_opt-in-for-usage-data-reporting"; + sha256 = "0dr3jyn8sxx9vw3w11gir6jvshlda0ldmhlq4aq313xn6d1j8qv2"; + } + { + url = "${prefix}/gpsbabelfe_do-not-check-for-newer-version"; + sha256 = "0kmmxcq1k9p84v9cjagda1cqcc9p7p48i104l3z6clc17zixwgai"; + } + { + url = "${prefix}/htmldoc-location"; + sha256 = "0nk3gz3l0q68d7blzfkbkvr630xy8y7vlxalnzlbdigqcx7lk54f"; + } + { + url = "${prefix}/Disable-donation-nagging"; + sha256 = "11j2ffa0hn5cy8xw98jndkf735ar39sf6rl28bn91pxd38xyaz5b"; + } +] diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.txt b/pkgs/applications/misc/gpsbabel/debian-patches.txt new file mode 100644 index 000000000000..012c28a37df2 --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/debian-patches.txt @@ -0,0 +1,6 @@ +gpsbabel/1.8.0+ds-4 +gpsbabelfe_disable_version_check +gpsbabelfe_opt-in-for-usage-data-reporting +gpsbabelfe_do-not-check-for-newer-version +htmldoc-location +Disable-donation-nagging diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 054c3d1af84c..b09e7ef725ef 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,59 +1,99 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which, expat }: +{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, which +, qtbase, qmake, qttools, qttranslations, wrapQtAppsHook +, libusb1, shapelib, zlib +, withGUI ? false, qtserialport +, withMapPreview ? (!stdenv.isDarwin), qtwebengine +, withDoc ? false, docbook_xml_dtd_45, docbook_xsl, expat, fop, libxml2, libxslt, perl +}: stdenv.mkDerivation rec { pname = "gpsbabel"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"; + sha256 = "sha256-0w8LsO+HwqZF8SQmwd8bCKma9PCM0hAzXhzWR4DgAHs="; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip"; - sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; - }) + patches = map fetchurl (import ./debian-patches.nix); + + postPatch = '' + patchShebangs testo + '' + lib.optionalString withGUI '' + # See https://github.com/NixOS/nixpkgs/issues/86054 + substituteInPlace gui/mainwindow.cc \ + --replace 'QLibraryInfo::location(QLibraryInfo::TranslationsPath)' \ + 'QLatin1String("${qttranslations}/translations")' + '' + lib.optionalString withDoc '' + substituteInPlace gbversion.h.qmake.in \ + --replace /usr/share/doc $doc/share/doc + + substituteInPlace testo.d/serialization.test \ + --replace /usr/share/doc $doc/share/doc + + substituteInPlace xmldoc/gpsbabel_man.xml \ + --replace /usr/share/doc $doc/share/doc + ''; + + outputs = [ "out" ] ++ lib.optional withDoc "doc"; + + nativeBuildInputs = [ pkg-config qmake ] + ++ lib.optionals withGUI [ qttools wrapQtAppsHook ] + ++ lib.optionals withDoc [ docbook_xml_dtd_45 docbook_xsl expat fop libxml2 libxslt perl ]; + + buildInputs = [ libusb1 shapelib zlib ] + ++ lib.optional withGUI qtserialport + ++ lib.optional (withGUI && withMapPreview) qtwebengine; + + checkInputs = [ libxml2 which ]; + + preConfigure = lib.optionalString withGUI '' + lrelease gui/*.ts gui/coretool/*.ts + ''; + + qmakeFlags = [ + "WITH_LIBUSB=pkgconfig" + "WITH_SHAPELIB=pkgconfig" + "WITH_ZLIB=pkgconfig" + ] ++ lib.optionals (withGUI && !withMapPreview) [ + "CONFIG+=disable-mappreview" ]; - buildInputs = [ libusb1 qtbase zlib ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + makeFlags = lib.optional withGUI "gui" + ++ lib.optionals withDoc [ "gpsbabel.pdf" "gpsbabel.html" "gpsbabel.org" ]; - checkInputs = [ expat.dev which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase. + # Floating point behavior on i686 causes nmea.test failures. Preventing + # extended precision fixes this problem. + NIX_CFLAGS_COMPILE = lib.optional stdenv.isi686 "-ffloat-store"; - /* FIXME: Building the documentation, with "make doc", requires this: - - [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] - - But FOP isn't packaged yet. */ - - configureFlags = [ "--with-zlib=system" ] - # Floating point behavior on i686 causes test failures. Preventing - # extended precision fixes this problem. - ++ lib.optionals stdenv.isi686 [ - "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store" - ]; - - enableParallelBuilding = true; + doCheck = true; dontWrapQtApps = true; - doCheck = true; - preCheck = '' - patchShebangs testo - substituteInPlace testo \ - --replace "-x /usr/bin/hexdump" "" + installPhase = '' + install -Dm755 gpsbabel -t $out/bin + '' + lib.optionalString withGUI (if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv gui/GPSBabelFE.app $out/Applications + install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations + ln -s $out/bin/gpsbabel $out/Applications/GPSBabelFE.app/Contents/MacOS + '' else '' + install -Dm755 gui/objects/gpsbabelfe -t $out/bin + install -Dm644 gui/gpsbabel.desktop -t $out/share/application + install -Dm644 gui/images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png + install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/share/gpsbabel/translations + '') + lib.optionalString withDoc '' + install -Dm655 gpsbabel.{html,pdf} -t $doc/share/doc/gpsbabel + cp -r html $doc/share/doc/gpsbabel + ''; - rm -v testo.d/alantrl.test - '' - # The raymarine and gtm tests fail on i686 despite -ffloat-store. - + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" - # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572. - + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test" - # The arc-project test fails on aarch64. - + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test"; + postFixup = lib.optionalString withGUI (if stdenv.isDarwin then '' + wrapQtApp "$out/Applications/GPSBabelFE.app/Contents/MacOS/GPSBabelFE" + '' else '' + wrapQtApp "$out/bin/gpsbabelfe" + ''); meta = with lib; { broken = stdenv.isDarwin; @@ -76,8 +116,9 @@ stdenv.mkDerivation rec { process data that may (or may not be) placed on a map, such as waypoints, tracks, and routes. ''; - homepage = "http://www.gpsbabel.org/"; + homepage = "https://www.gpsbabel.org/"; license = licenses.gpl2Plus; - platforms = platforms.all; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix deleted file mode 100644 index 8501b7c0875b..000000000000 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, mkDerivation, qmake, qttools, qtwebkit, qttranslations, gpsbabel }: - -mkDerivation { - pname = "gpsbabel-gui"; - - inherit (gpsbabel) src version; - - sourceRoot = "source/gui"; - - nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtwebkit ]; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace mainwindow.cc \ - --replace "QApplication::applicationDirPath() + \"/" "\"" \ - --replace "QApplication::applicationDirPath() + '/' + " "" \ - --replace "translator.load(full_filename)" "translator.load(filename)" \ - --replace "gpsbabelfe_%1.qm" "$out/share/gpsbabel/translations/gpsbabelfe_%1.qm" \ - --replace "gpsbabel_%1.qm" "$out/share/gpsbabel/translations/gpsbabel_%1.qm" \ - --replace "qt_%1.qm" "${qttranslations}/translations/qt_%1.qm" - substituteInPlace formatload.cc \ - --replace "QApplication::applicationDirPath() + \"/" "\"" - substituteInPlace gpsbabel.desktop \ - --replace "gpsbabelfe-bin" "gpsbabelfe" - ''; - - preConfigure = '' - lrelease *.ts coretool/*.ts - ''; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}" - ]; - - postInstall = '' - install -Dm755 objects/gpsbabelfe -t $out/bin - install -Dm644 gpsbabel.desktop -t $out/share/applications - install -Dm644 images/appicon.png $out/share/icons/hicolor/512x512/apps/gpsbabel.png - install -Dm644 *.qm coretool/*.qm -t $out/share/gpsbabel/translations - ''; - - meta = with lib; { - description = "Qt-based GUI for gpsbabel"; - homepage = "http://www.gpsbabel.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index ca842ff6db00..1b41f9ae53e9 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "toipe"; - version = "0.4.0"; + version = "0.4.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-lAvFCvNm55SjRmrhIkMBiM0nSlAG+jUEKLlLaGs1RkY="; + sha256 = "sha256-aunejitHVNIB/zIDgX3mlA1FzG7wIxlDCFdUvtuzQnc="; }; - cargoSha256 = "sha256-WmWH/x69H17uHQEB0+GRUtApJnSEkoeFLLweP8NoBrk="; + cargoSha256 = "sha256-Nabc2lPpsUCcWEJzL6U84UoIJ5PCtYKVyLRhjhiqhpE="; meta = with lib; { description = "Trusty terminal typing tester"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 3133ec9dde1d..1c99ded65447 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.45.0"; # Please backport all updates to the stable channel. + version = "5.45.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-RqzFUE43wbz8Hw7hXxqqX9iEatjIHe0SbHD1+ieIR34="; + sha256 = "sha256-ZkQQL05pz06iszguXkrBt/h4PoZcbybX4CmDXOoMYkw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 2bda4af97a43..8fa3d2faf8d9 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -338,7 +338,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw=="; + sha512 = "sha512-MLO3JUGJpe5+EVisA/i47+zlyF8Ug0ivvGYG4B9oSXQcPiUHB1ccmnpxqR7o0Up5SQgmxkBiEU//HgR6UuIKOw=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 89db1ccad28d..ca14185738cd 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , flask , events , pymongo @@ -11,13 +12,15 @@ buildPythonPackage rec { pname = "Eve"; - version = "1.1.5"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "5647ee7dd6e063b967276e49f564cd4f96decdd0a218482bdf86c404a2be1fbf"; + sha256 = "sha256-KVKUSPGGLXOusflL4OjzXdJDGi66q+895qvtaBrSFG8="; }; + disabled = pythonOlder "3.7"; + propagatedBuildInputs = [ cerberus events @@ -40,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://python-eve.org/"; description = "Open source Python REST API framework designed for human beings"; + changelog = "https://github.com/pyeve/eve/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 26ec6597213e..c18fdcabcf0e 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.14.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-UawQbVbafRpxkYFGW+y+HkkYME8qziG7tmsIjbqwHq0="; + sha256 = "sha256-p636B8NUu/XncHLTQTiAYfvBaMbiopLVRwGrFf45BW8="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-1kR70t7vWzvV3DOrkVP6ktzKK5tB9KjJyAMpKO6gtYA="; + cargoSha256 = "sha256-miDdP4kokRwhR9tif6llI1PI+F4O6tC4pAWucRRyLNQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 7b6b1238d4d0..9e13e3e9c19b 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { - pname = "nats-server"; - version = "2.7.4"; + pname = "nats-server"; + version = "2.8.4"; src = fetchFromGitHub { - rev = "v${version}"; - owner = "nats-io"; - repo = pname; - sha256 = "sha256-lMwFh+njzQr1hOJFbO3LnPdBK7U4XmX4F/6MlIRILlU="; + owner = "nats-io"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hybCAVgHSwby8oSO0T2ZuqAYbqtZDc/adSPMOTdeI+w="; }; - vendorSha256 = "sha256-EEOvDOqMbqfB0S3Nf7RQMKGSZX802eqa3eGaNjUHxQ4="; + vendorSha256 = "sha256-sK79szerxz42Y6V6NyDAveeMOx0XFq28Tjx27JkEWW4="; doCheck = false; @@ -19,8 +19,8 @@ buildGoModule rec { meta = with lib; { description = "High-Performance server for NATS"; + homepage = "https://nats.io/"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop derekcollison ]; - homepage = "https://nats.io/"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix new file mode 100644 index 000000000000..25d27fcdfcbe --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_hint_plan"; + version = "14-1.4.0"; + + src = fetchFromGitHub { + owner = "ossc-db"; + repo = pname; + rev = "REL${builtins.replaceStrings ["-" "."] ["_" "_"] version}"; + sha256 = "sha256-2hYDn/69264x2lMRVIp/I5chjocL6UqIw5ry1qdRcDM="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + mkdir -p $out/{lib,share/postgresql/extension} + + cp *.so $out/lib + cp *.sql $out/share/postgresql/extension + cp *.control $out/share/postgresql/extension + ''; + + meta = with lib; { + description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments"; + homepage = "https://github.com/ossc-db/pg_hint_plan"; + maintainers = with maintainers; [ _1000101 ]; + platforms = postgresql.meta.platforms; + license = licenses.bsd3; + broken = versionOlder postgresql.version "14"; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 775dee206edf..5bbede9ddfc4 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -14,6 +14,8 @@ self: super: { pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { }; + pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { }; + pg_rational = super.callPackage ./ext/pg_rational.nix { }; pg_repack = super.callPackage ./ext/pg_repack.nix { }; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 8d46197214c0..2381402534e1 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnu-efi, nixosTests }: +{ lib, stdenv, fetchurl, fetchpatch, gnu-efi, nixosTests }: let archids = { @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { patches = [ # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch + + # Fixes issue with null dereference in ReadHiddenTags + # Upstream: https://sourceforge.net/p/refind/code/merge-requests/45/ + (fetchpatch { + url = "https://github.com/samueldr/rEFInd/commit/29cd79dedabf84d5ddfe686f5692278cae6cc4d6.patch"; + sha256 = "sha256-/jAmOwvMmFWazyukN+ru1tQDiIBtgGk/e/pczsl1Xc8="; + }) ]; buildInputs = [ gnu-efi ]; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 0e6f5ad88346..86687933efaf 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.8.2"; + version = "1.9"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FqlSMTCKtcG2HOA6KaPYArK/rxHG9eJSQmNOWIzJzCs="; + sha256 = "sha256-+LuA9gSdVmt4iEJyeg6HbddD2YsKmkV/MJQbAgg/vJQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/networking/tinystatus/default.nix b/pkgs/tools/networking/tinystatus/default.nix new file mode 100644 index 000000000000..e4e930e799a8 --- /dev/null +++ b/pkgs/tools/networking/tinystatus/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenvNoCC, makeWrapper, netcat, curl, unixtools, coreutils, mktemp +, findutils, gnugrep, fetchFromGitHub, gawk, gnused }: + +stdenvNoCC.mkDerivation rec { + pname = "tinystatus"; + version = "unstable-2021-07-09"; + + src = fetchFromGitHub { + owner = "bderenzo"; + repo = "tinystatus"; + rev = "fc128adf240261ac99ea3e3be8d65a92eda52a73"; + sha256 = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + runtimeInputs = [ + curl + netcat + unixtools.ping + coreutils + mktemp + findutils + gnugrep + gawk + gnused + ]; + + installPhase = '' + runHook preInstall + install -Dm555 tinystatus $out/bin/tinystatus + wrapProgram $out/bin/tinystatus \ + --set PATH "${lib.makeBinPath runtimeInputs}" + runHook postInstall + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preCheck + + cat <test.csv + ping, 0, testing, this.should.fail.example.com + EOF + + $out/bin/tinystatus test.csv | grep Disrupted + + runHook postCheck + ''; + + meta = with lib; { + description = "A static HTML status page generator written in pure shell"; + homepage = "https://github.com/bderenzo/tinystatus"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index f283a911a62c..2e9f0e7c44ce 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.2"; + version = "1.14.3"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JhLFax0UR/AVl/736pdsAyyQF/555YmLWLnZrsLDjlA="; + sha256 = "sha256-Tep57FowoDWujgh0pyawzOu3w37cCWKAkb4SOT/5L10="; }; - vendorSha256 = "sha256-ESIlmY3SzmfWLqLxf62dOhAsHPOKc2YYSOhzpJCjvCQ="; + vendorSha256 = "sha256-8Ergb3qYCAlyYVQw6433jEi7cHiqwvwiZHIgnOS6D8w="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e58fec366c..99974a4861a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9025,6 +9025,8 @@ with pkgs; tinyssh = callPackage ../tools/networking/tinyssh { }; + tinystatus = callPackage ../tools/networking/tinystatus { }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); openssh = opensshPackages.openssh.override { @@ -26923,11 +26925,12 @@ with pkgs; gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { - inherit (darwin) IOKit; - }; + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; - gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpsbabel-gui = gpsbabel.override { + withGUI = true; + withDoc = true; + }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { };