diff options
25 files changed, 136 insertions, 146 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index effcebf0d79..7d12a82d492 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -108,15 +108,6 @@ with lib.maintainers; { shortName = "Chia Blockchain"; }; - cleanup = { - members = [ - ajs124 - ]; - scope = "Cleaning of the nixpkgs source tree."; - shortName = "Cleanup"; - enableFeatureFreezePing = true; - }; - coq = { members = [ cohencyril diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 624959ffa9e..ccccca8d65c 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, appstream-glib , desktop-file-utils , gio-sharp , glib @@ -20,22 +21,23 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4="; + sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM="; + hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480="; }; nativeBuildInputs = [ + appstream-glib # For appstream-util desktop-file-utils # For update-desktop-database meson ninja diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index fed9d245c19..0446c694fe0 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -4,6 +4,7 @@ # build inputs , atk +, file , gdk-pixbuf , glib-networking , gnome-desktop @@ -17,7 +18,7 @@ # check inputs , xvfb-run -, nose +, nose2 , flake8 # python dependencies @@ -83,13 +84,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.9.1"; + version = "0.5.10"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "sha256-ykPJneCKbFKv0x/EDo9PkRb1LkMeFeYzTDmvE3ShNe0="; + sha256 = "sha256-PrnULCdQXNZ9OTa00NVyqiTdKRRkAYBcDj7lMwEqkw4="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -103,6 +104,7 @@ buildPythonApplication rec { libnotify pango webkitgtk + python_magic ] ++ gstDeps; propagatedBuildInputs = [ @@ -118,7 +120,13 @@ buildPythonApplication rec { python_magic ]; - checkInputs = [ xvfb-run nose flake8 ] ++ requiredTools; + postPatch = '' + substituteInPlace lutris/util/magic.py \ + --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" + ''; + + + checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; preCheck = "export HOME=$PWD"; checkPhase = '' runHook preCheck @@ -126,12 +134,6 @@ buildPythonApplication rec { runHook postCheck ''; - # unhardcodes xrandr and fixes nosetests - # upstream in progress: https://github.com/lutris/lutris/pull/3754 - patches = [ - ./fixes.patch - ]; - # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/lutris/fixes.patch b/pkgs/applications/misc/lutris/fixes.patch deleted file mode 100644 index 42482453f6a..00000000000 --- a/pkgs/applications/misc/lutris/fixes.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/Makefile b/Makefile -index 821a9500..75affa77 100644 ---- a/Makefile -+++ b/Makefile -@@ -25,12 +25,12 @@ release: build-source upload upload-ppa - - test: - rm tests/fixtures/pga.db -f -- nosetests3 -+ nosetests - - cover: - rm tests/fixtures/pga.db -f - rm tests/coverage/ -rf -- nosetests3 --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage -+ nosetests --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage - - pgp-renew: - osc signkey --extend home:strycore -diff --git a/lutris/util/graphics/xrandr.py b/lutris/util/graphics/xrandr.py -index f788c94c..5544dbe9 100644 ---- a/lutris/util/graphics/xrandr.py -+++ b/lutris/util/graphics/xrandr.py -@@ -5,6 +5,7 @@ from collections import namedtuple - - from lutris.util.log import logger - from lutris.util.system import read_process_output -+from lutris.util.linux import LINUX_SYSTEM - - Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary", "rate")) - -@@ -12,7 +13,7 @@ Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary" - def _get_vidmodes(): - """Return video modes from XrandR""" - logger.debug("Retrieving video modes from XrandR") -- return read_process_output(["xrandr"]).split("\n") -+ return read_process_output([LINUX_SYSTEM.get("xrandr")]).split("\n") - - - def get_outputs(): # pylint: disable=too-many-locals -@@ -76,7 +77,7 @@ def turn_off_except(display): - for output in get_outputs(): - if output.name != display: - logger.info("Turning off %s", output[0]) -- subprocess.Popen(["xrandr", "--output", output.name, "--off"]) -+ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "--output", output.name, "--off"]) - - - def get_resolutions(): -@@ -111,7 +112,7 @@ def change_resolution(resolution): - logger.warning("Resolution %s doesn't exist.", resolution) - else: - logger.info("Changing resolution to %s", resolution) -- subprocess.Popen(["xrandr", "-s", resolution]) -+ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "-s", resolution]) - else: - for display in resolution: - logger.debug("Switching to %s on %s", display.mode, display.name) -@@ -128,7 +129,7 @@ def change_resolution(resolution): - logger.info("Switching resolution of %s to %s", display.name, display.mode) - subprocess.Popen( - [ -- "xrandr", -+ LINUX_SYSTEM.get("xrandr"), - "--output", - display.name, - "--mode", diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 9602fee5b5c..a92f7984513 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.1.5"; + version = "2.2.1"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA="; + hash = "sha256-clCCVOoiInaxg9++GiHMLaD+k0gAvt3oOmqQ/a+WgCE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index e746f115043..ed5cad35474 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.26"; + version = "2.27"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-VFeKj8X7gEyxsdsOK6UYJ6xB24gsuzb1Wm4GK5AJCHc="; + hash = "sha256-cHUI95Zrwzg242BM8/roA40sAxijFw6go6BbQNZSzRw="; }; - cargoHash = "sha256-pr/Vzm321/uX4fIGt3kuWrtcgsnDRbeK3AvNO19NDwQ="; + cargoHash = "sha256-YZpaPfExKNLHWHmnCery4fGAJmOhpK3umuO343qe0Zo="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index d9606cda1fa..e8367402cad 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "caqti"; - version = "1.5.1"; + version = "1.7.0"; useDune2 = true; minimumOCamlVersion = "4.04"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "paurkedal"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1"; + sha256 = "sha256-NGK38so6ZVCRbtV3ww1u31EFAjkHgDdsFfFUwc8ldm4="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 8a4799c688b..4fedfd4cbf5 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi , azure-keyvault-certificates , azure-keyvault-keys , azure-keyvault-secrets @@ -6,13 +9,15 @@ buildPythonPackage rec { pname = "azure-keyvault"; - version = "4.1.0"; - disabled = isPy27; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40"; + hash = "sha256-cxrdEIo+KatP1QGjxHclbChsNNCZazg/tqOUVGKTN2E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index ce4d99e4517..7749c246e14 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -9,10 +9,6 @@ buildPythonPackage rec { sha256 = "sha256-1lP/ee4fQvY7WgkPL5jOAjNdhq2JY7POJmGAXK/pmgQ="; }; - postPatch = '' - substituteInPlace setup.py --replace README.md README.txt - ''; - propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index ea14989dbb1..98e2394d0bd 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.8.1"; + version = "6.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-bH7XCk1jPsGalFQ68rQhSyZv9nCZE+xUJyWX828PQQI="; + sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 99f5bebbc67..c14598a8eba 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.8.0"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE="; + sha256 = "sha256-FHa6/oWV35TPsafgEUTCuu0Rnd1/YBZF3mHOhkVuEU0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 8bf2b5863f0..f8aecee9a67 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.7.6"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-U5XigLFkpRoIXcFB4dpxi8pxqcmmb20sv9i9J70s0C0="; + sha256 = "sha256-B2AQoVyoG6wyE9pTWf/ASQd8iZfIrjUr078rSkoARf0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index aa7cc22b7a8..b5d0b56bc06 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "8.2.0"; + version = "8.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk="; + sha256 = "sha256-8mdHPFL8aohsa4Fq2xVb7Asne8fSJPs/q+uDg05zPHI="; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index fcacc7cbf76..f2745bf3f6f 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.0.3"; + version = "9.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "v${version}"; - hash = "sha256-ckT3eSjOgIG2/Ci9Ig6QLCrO9iMF9VyZNJy9KfHUg4A="; + hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 37ef4da7daf..32462707cb6 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.3.0"; + version = "11.0.0"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-TrEHRG/b7YdvSMgyArYhKyIShhaKVcFrPrjt9CAPEKE="; + sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index f5675aae8ed..370ed373da5 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -1,25 +1,29 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, isPy27 +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "1.1.0"; pname = "pysnooper"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "0fa932ad396d2bac089d4b1f94f0ce49cde4140ee64ddd24a4065fadea10fcc9"; + hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; }; - # test dependency python-toolbox fails with py27 - doCheck = !isPy27; - checkInputs = [ - pytest + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysnooper" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 30666ef4706..01805c6a2d2 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.0.1"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = version; - hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y="; + hash = "sha256-IE2qyRzvrOTymwga+hCwE785sAVTqQtcN1DL/uADpbQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 1661104dcef..8274b744069 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.22.5"; + version = "0.22.6"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yzYmlewM9NcNHPUmfGiUP0Px2s+sagZOU82wK4973rY="; + sha256 = "sha256-Dx0eVg1T9WTHeIQO9hwUoCAcUgQey8rlZ5+uxPIX0Wc="; }; - cargoSha256 = "sha256-XZkTfpi9stW13l7yo0LFZryAPITVZa9MALrSWSei5LU="; + cargoSha256 = "sha256-RGZgo9uxRmPpZzXu6AC2FPjOoZxLnh4gCjadAOTWJ4Q="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix new file mode 100644 index 00000000000..775850ea32e --- /dev/null +++ b/pkgs/servers/roapi/http.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchurl +}: +let + pname = "roapi-http"; + version = "0.6.0"; + target = if stdenv.isDarwin then "apple-darwin" else ""; +in +# TODO build from source, currently compilation fails on darwin on snmalloc with +# ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' +# reinterpret_cast<void*>(&result), sizeof(result)) != kCCSuccess) +# +# rustPlatform.buildRustPackage { +# pname = "roapi-http"; +# inherit version; + +# src = fetchFromGitHub { +# owner = "roapi"; +# repo = "roapi"; +# rev = "roapi-http-v${version}"; +# sha256 = "sha256-qHAO3h+TTCQQ7vdd4CoXVGfKZ1fIxTWKqbUNnRsJaok="; +# }; + +# cargoSha256 = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo="; + +# buildAndTestSubdir = "roapi-http"; + +# nativeBuildInputs = [ cmake ]; + +stdenv.mkDerivation rec { + inherit pname version; + + src = fetchurl { + url = "https://github.com/roapi/roapi/releases/download/${pname}-v${version}/${pname}-${target}.tar.gz"; + sha256 = "sha256-lv6BHg/LkrOlyq8D1udAYW8/AbZRb344YCcVnwo3ZHk="; + }; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + tar xvzf $src + mkdir -p "$out/bin" + cp roapi-http $out/bin + ''; + + meta = with lib; { + description = "Create full-fledged APIs for static datasets without writing a single line of code. "; + homepage = "https://roapi.github.io/docs/"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0515a2bbb80..b0eea877893 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.5.5"; + version = "1.5.6"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gTdmqyGJ+TipiwDtbnGFrEZjkAyNejNINlB5iZz5yTI="; + sha256 = "sha256-1yvFyTH5m+KIN/x61cbUNgweK38WFdIUDvnkFYmST9s="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 5acd0a93ac2..a9a6fe29e13 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; + sha256 = "sha256-soYtm8vEkMJq9MeoUqOGJPWxZUrh3mGnApxG154W1wI="; }; - vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs"; + vendorSha256 = "sha256-MR1JUbeGC4N0jDuYdwVFMHBdZEy5BkID2BFdCwjtTAg="; buildInputs = [ libpcap diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index b9da8e95d3e..02f3615233a 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ja7Cpd+BegGdKOWAiH5JsniO4NYlFEgJzqBuNzE2ao4="; + sha256 = "sha256-O4oLtbijTAgUD+X3rxJkH2VmWLX5nQaN5JwoznNpKOM="; }; - vendorSha256 = "sha256-h/mSF4hJ3TS+4b3CCUEXVin8MRcPg8qEe90Mcxk0uVo="; + vendorSha256 = "sha256-dfd5yQ3t23YyFin770UlCtEIldRxTqeWfgl0GLLF+Qw="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index 5b30d5270df..edf5e846801 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "zzuf"; @@ -11,10 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool pkg-config ]; - - preConfigure = "./bootstrap"; + nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { description = "Transparent application input fuzzer"; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 02f745575ad..683eecde46b 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: +{ lib, stdenv, fetchFromGitHub, jre_headless, jdk_headless, ant, saxon }: stdenv.mkDerivation rec { pname = "jing-trang"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ jdk ant saxon ]; + buildInputs = [ jdk_headless ant saxon ]; CLASSPATH = "lib/saxon.jar"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6d3fc6a79..89f42ba3996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6969,7 +6969,7 @@ with pkgs; jing = res.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -21055,7 +21055,10 @@ with pkgs; saxonb = saxonb_8_8; - inherit (callPackages ../development/libraries/java/saxon { }) + inherit (callPackages ../development/libraries/java/saxon { + jre = jre_headless; + jre8 = jre8_headless; + }) saxon saxonb_8_8 saxonb_9_1 @@ -24352,6 +24355,8 @@ with pkgs; rime-data = callPackage ../data/misc/rime-data { }; + roapi-http = callPackage ../servers/roapi/http.nix { }; + rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; route159 = callPackage ../data/fonts/route159 { }; |