alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Vladimír Čunát 2023-03-27 09:36:27 +02:00
parent 1894fc14b9 56206539ba
commit 1acb9fd044
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
12 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/graphics/hugin/default.nix
View file

@ -30,6 +30,7 @@
, perlPackages
, sqlite
, vigra
, wrapGAppsHook
, wxGTK
, zlib
}:
@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
zlib
];
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook ];
# disable installation of the python scripting interface
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];

4
pkgs/applications/radio/freedv/default.nix
View file

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "freedv";
version = "1.8.7";
version = "1.8.8";
src = fetchFromGitHub {
owner = "drowe67";
repo = "freedv-gui";
rev = "v${version}";
hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08=";
hash = "sha256-rXiNhk+6eeYF5w/8jSJaEaLEgRYngqTV/wLkMvg6qOQ=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/applications/science/logic/cvc5/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
hash = "sha256-1yJZtPZ4nMg9Kn3jHpN8b5XeFZ8ZeVLrKYWh7Rp3/oQ=";
hash = "sha256-l+L59QLLrAEVkAZjhxICJpa+j+jr1k/7B61JlapXGRI=";
};
nativeBuildInputs = [ pkg-config cmake flex ];

8
pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
View file

@ -2,6 +2,7 @@
args @ {
name
, version ? null
, runScript ? "bash"
, extraInstallCommands ? ""
, meta ? {}
@ -24,6 +25,7 @@ let
env = buildFHSEnv (removeAttrs args [
"runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
"version"
]);
etcBindEntries = let
@ -203,7 +205,11 @@ let
bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; });
in runCommandLocal name {
versionStr = lib.optionalString (version != null) ("-" + version);
nameAndVersion = name + versionStr;
in runCommandLocal nameAndVersion {
inherit meta;
passthru = passthru // {

12
pkgs/build-support/build-fhs-userenv/default.nix
View file

@ -1,11 +1,11 @@
{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }:
{ lib, callPackage, runCommandLocal, writeScript, stdenv, coreutils }:
let buildFHSEnv = callPackage ./env.nix { }; in
args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }:
args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }:
let
env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]);
env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]);
chrootenv = callPackage ./chrootenv {};
@ -23,7 +23,11 @@ let
exec ${run} "$@"
'';
in runCommandLocal name {
versionStr = lib.optionalString (version != null) ("-" + version);
nameAndVersion = name + versionStr;
in runCommandLocal nameAndVersion {
inherit meta;
passthru = passthru // {

2
pkgs/development/compilers/hip/default.nix
View file

@ -49,7 +49,7 @@ let
];
in stdenv.mkDerivation (finalAttrs: {
pname = "hip-${hipPlatform}";
version = "5.4.3";
version = "5.4.4";
outputs = [
"out"

5
pkgs/development/libraries/fizz/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "fizz";
version = "2023.03.06.00";
version = "2023.03.20.00";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "fizz";
rev = "refs/tags/v${version}";
hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E=";
hash = "sha256-oBdTj7IPlmtF5rEgDVN/wwa0ZxkN6h2QMN3PQB0nCgQ=";
};
nativeBuildInputs = [ cmake ];
@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "C++14 implementation of the TLS-1.3 standard";
homepage = "https://github.com/facebookincubator/fizz";
changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${version}";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ pierreis kylesferrazza ];

4
pkgs/development/python-modules/lightwave2/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "lightwave2";
version = "0.8.21";
version = "0.8.22";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-Zgsgt78ll/5NVSca4lnxXYkiw5FE2WgcO10o/IZaHgQ=";
hash = "sha256-YrvRlSogw9YSuOvm4PfjrKGvgiBqdXAO9CKqGcBBH0g=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/zha-quirks/default.nix
View file

@ -1,6 +1,5 @@
{ lib
, aiohttp
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
@ -28,7 +27,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
asynctest
pytestCheckHook
];

6
pkgs/development/tools/viceroy/default.nix
View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "viceroy";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "fastly";
repo = pname;
rev = "v${version}";
hash = "sha256-6D+P7fQBhLYuAw9bIVgEU4Zi18kBLUn/4jr1E8cFugU=";
hash = "sha256-Q/FLvZqmih3StVmLvEmJ5tY7Lz3dqFPUEn9HNubLNMY=";
};
buildInputs = lib.optional stdenv.isDarwin Security;
cargoHash = "sha256-URBtmMR61K1/LtIt3Q3tfQ4viZPvoiumR2LudcpYk6s=";
cargoHash = "sha256-SCaP6JtLztIO9Od75i4GkMPbLqpf52sAZVPHG86VcX0=";
cargoTestFlags = [
"--package viceroy-lib"

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-03-25";
version = "2023-03-26";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-pmhjSZMnTJn0MDKsCk799DrHBDqvUw8M9wxBx65W9pQ=";
hash = "sha256-oUoQNjg14rAs8BAxTOLtYHw9iTwEAsLymObog+GrQw8=";
};
nativeBuildInputs = [

9
pkgs/tools/security/katana/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "katana";
version = "0.0.3";
version = "1.0.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ax99pmoxlyUGLN2OdIItTNTnO/fDquvNadNnNG6ElEk=";
rev = "refs/tags/v${version}";
hash = "sha256-OSvkQIpZEMav1dh3DDTqFxoFbc6sWOjhslqVJcUS104=";
};
vendorHash = "sha256-IJcMIJF2A5DfyBdcIXTbeX72Q/4SAVZ0U3UIQ2H0fEc=";
vendorHash = "sha256-u/3MMuq2Zab6k+vPQ0iKQf8k9zMV2aIgIsTee0VUQaI=";
CGO_ENABLED = 0;
@ -23,6 +23,7 @@ buildGoModule rec {
meta = with lib; {
description = "A next-generation crawling and spidering framework";
homepage = "https://github.com/projectdiscovery/katana";
changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};