diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-26 06:40:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-26 06:40:29 +0000 |
commit | 40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52 (patch) | |
tree | 214a089b6ed588afdc298ade6e1d11a1a536e1f6 /pkgs | |
parent | 4cdf9d045ce522d7f226f06fd42e6f63fe75a643 (diff) | |
parent | 7c26586a31ce49d4f9f3db0e67f95617ba86d5fa (diff) | |
download | nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.tar nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.tar.gz nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.tar.bz2 nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.tar.lz nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.tar.xz nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.tar.zst nixpkgs-40d4ac38d0e8e5b6ee39f17bcc8c843f32085d52.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/cluster/pgo-client/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/base.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/xgboost/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/devpi-client/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/devpi-server/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/stlink/default.nix | 24 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_rational.nix | 39 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/packages.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/exploitdb/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/security/snowcrash/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/text/mdbook/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
13 files changed, 148 insertions, 14 deletions
diff --git a/pkgs/applications/networking/cluster/pgo-client/default.nix b/pkgs/applications/networking/cluster/pgo-client/default.nix index 52c9c191218..ec36d5f52ac 100644 --- a/pkgs/applications/networking/cluster/pgo-client/default.nix +++ b/pkgs/applications/networking/cluster/pgo-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgo-client"; - version = "4.6.2"; + version = "4.7.0"; src = fetchFromGitHub { owner = "CrunchyData"; repo = "postgres-operator"; rev = "v${version}"; - sha256 = "sha256-zPFsLKbuVq2wMjFsqjBGiatPBwGR/X6q3mj8o5BE+r0="; + sha256 = "sha256-WuKLQWq/Zr/eDaUq/HbydHMdtlCWmjM858PLX7hYba4="; }; - vendorSha256 = "sha256-DU1kc7YDQ+denj6tHVGt79s494aBFZ2KM7PVSn951KI="; + vendorSha256 = "sha256-m8b6Lh6it67A6cppdBDX4X0u7Kde4GQz9wln/TrHVwI="; subPackages = [ "cmd/pgo" ]; @@ -21,6 +21,5 @@ buildGoModule rec { changelog = "https://github.com/CrunchyData/postgres-operator/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.bryanasdev000 ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 841c979e97f..a61ab254348 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { libXScrnSaver libXtst libxcb - mesa.drivers + mesa nss wrapGAppsHook ]; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; libPath = lib.makeLibraryPath [ - libcxx systemd libpulseaudio + libcxx systemd libpulseaudio libdrm mesa stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix LD_LIBRARY_PATH : ${libPath} + --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 4f02d72c9a1..1045b86a444 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , pytestCheckHook , cmake , scipy @@ -56,6 +57,11 @@ buildPythonPackage { disabledTests = [ "test_cli_binary_classification" "test_model_compatibility" + ] ++ lib.optionals stdenv.isDarwin [ + # fails to connect to the com.apple.fonts daemon in sandboxed mode + "test_plotting" + "test_sklearn_plotting" ]; + __darwinAllowLocalNetworking = true; } diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 5bca8733771..11fa78f1f02 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -49,6 +49,8 @@ buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "http://doc.devpi.net"; description = "Client for devpi, a pypi index server and packaging meta tool"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 8a484a23349..b5ddda9f08b 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -55,6 +55,8 @@ python3Packages.buildPythonApplication rec { "TestMirrorIndexThings" ]; + __darwinAllowLocalNetworking = true; + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 5bad6493c49..2fbb60a0ddc 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libusb1 }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libusb1 +, gtk3 +, pkg-config +, wrapGAppsHook +, withGUI ? false +}: let # The Darwin build of stlink explicitly refers to static libusb. @@ -18,8 +27,17 @@ in stdenv.mkDerivation rec { sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl"; }; - buildInputs = [ libusb1' ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ + libusb1' + ] ++ lib.optionals withGUI [ + gtk3 + ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals withGUI [ + pkg-config + wrapGAppsHook + ]; cmakeFlags = [ "-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0da020cc0f7..13413a84075 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -678,6 +678,8 @@ in with py.pkgs; buildPythonApplication rec { "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error" "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error" "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_require_auth" + # prometheus/test_init.py: Spurious AssertionError regarding humidifier_target_humidity_percent metric + "--deselect tests/components/prometheus/test_init.py::test_view" # tests are located in tests/ "tests" # dynamically add packages required for component tests diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix new file mode 100644 index 00000000000..5cfd6240990 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, lib +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "pg_rational"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "begriffs"; + repo = "pg_rational"; + rev = "v${version}"; + sha256 = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{lib,share/postgresql/extension} + + cp *.so $out/lib + cp *.sql $out/share/postgresql/extension + cp *.control $out/share/postgresql/extension + + runHook postInstall + ''; + + meta = with lib; { + description = "Precise fractional arithmetic for PostgreSQL"; + homepage = "https://github.com/begriffs/pg_rational"; + maintainers = with maintainers; [ netcrns ]; + platforms = postgresql.meta.platforms; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 0c8f0e642a6..9cca7c8374b 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_rational = super.callPackage ./ext/pg_rational.nix { }; + pg_repack = super.callPackage ./ext/pg_repack.nix { }; pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix new file mode 100644 index 00000000000..1c5a3fdd473 --- /dev/null +++ b/pkgs/tools/security/exploitdb/default.nix @@ -0,0 +1,26 @@ +{stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "exploitdb"; + version = "2021-05-22"; + + src = fetchFromGitHub { + owner = "offensive-security"; + repo = pname; + rev = version; + sha256 = "sha256-cpzAdRAtF47j92u8GHyu6V1ycqtNld+9saCqoboAu+o="; + }; + + installPhase = '' + mkdir -p $out/bin + cp --recursive ./* $out/bin + cp ./.searchsploit_rc $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/offensive-security/exploitdb"; + description = "Archive of public exploits and corresponding vulnerable software"; + license = with licenses; [ gpl2Plus gpl3Plus mit ]; + maintainers = with maintainers; [ applePrincess ]; + }; +} diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/tools/security/snowcrash/default.nix new file mode 100644 index 00000000000..cd85ff90bf9 --- /dev/null +++ b/pkgs/tools/security/snowcrash/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "snowcrash"; + version = "unstable-2021-04-29"; + + src = fetchFromGitHub { + owner = "redcode-labs"; + repo = "SNOWCRASH"; + rev = "514cceea1ca82f44e0c8a8744280f3a16abb6745"; + sha256 = "16p1nfi9zdlcffjyrk1phrippjqrdzf3cpc51dgdy3bfr7pds2ld"; + }; + + vendorSha256 = "1xm2yjr4mqkara3yib6vgfj14ldh7r0v1vr2i0ks13l1rm54x840"; + + subPackages = [ "." ]; + + runVend = true; + + postFixup = '' + mv $out/bin/SNOWCRASH $out/bin/${pname} + ''; + + meta = with lib; { + description = "Polyglot payload generator"; + homepage = "https://github.com/redcode-labs/SNOWCRASH"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index baa5f5988bf..e841d0c5fb5 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-51S4I1YIbdgXkhuT7KnhJe71nGCQmr9JmuGtp7Bcxqo="; + sha256 = "sha256-MdkKDjyePlu6nDyHM9qdhn+kFeXZnyfin+cIZkE+PRE="; }; - cargoSha256 = "sha256-4bYLrmyI7cPUes6DYREiIB9gDze0KO2jMP/jPzvWbwQ="; + cargoSha256 = "sha256-MaN0Zz1cQQvwA6rPJRqzI4Q8gniHKAsROLsc0tBpYYU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 849563ac1e9..6822f943001 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17898,6 +17898,8 @@ in snow = callPackage ../tools/security/snow { }; + snowcrash = callPackage ../tools/security/snowcrash { }; + soapyairspy = callPackage ../applications/radio/soapyairspy { }; soapyaudio = callPackage ../applications/radio/soapyaudio { }; @@ -18053,6 +18055,7 @@ in stfl = callPackage ../development/libraries/stfl { }; stlink = callPackage ../development/tools/misc/stlink { }; + stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; }; stegseek = callPackage ../tools/security/stegseek {}; @@ -23112,6 +23115,8 @@ in dynamips = callPackage ../applications/virtualization/dynamips { }; + exploitdb = callPackage ../tools/security/exploitdb { }; + evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or []; }; |