JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-11 12:08:47 +00:00 committed by GitHub
commit 044ddc2335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 413 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/termusic/default.nix
View File

@ -7,14 +7,14 @@
rustPlatform.buildRustPackage rec {
pname = "termusic";
version = "0.6.10";
version = "0.6.15";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg=";
sha256 = "sha256-e4hCo5a54EPp6/sd1/ivwHePu+e6MqbA9tvPWf41EhQ=";
};
cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk=";
cargoHash = "sha256-kQjLmASJpo7+LT73vVjbPWhNUGJ1HI6S/8W6gJskJXE=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib ];

33
pkgs/applications/blockchains/zcash/default.nix
View File

@ -1,24 +1,37 @@
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper
, cargo, pkg-config, curl, coreutils, boost177, db62, hexdump, libsodium
, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook
, makeWrapper, cargo, pkg-config, curl, coreutils, boost178, db62, hexdump
, libsodium, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
, withUtils ? true, withWallet ? true, withZmq ? true, zeromq
}:
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "zcash";
version = "4.6.0-2";
version = "4.7.0";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
sha256 = "sha256-RvUa8CKPBFfsqzrJkPHePZMqpCfyVafrUbftMdTviHA=";
sha256 = "sha256-yF+/QepSiZwsdZydWjvxDIFeFyJbJyqZmCdMyQHmrzI=";
};
cargoSha256 = "sha256-qWimataBZ/rLDOLgetNfFAzi/psXcJV54b3WGm9k+b4=";
prePatch = lib.optionalString stdenv.isAarch64 ''
substituteInPlace .cargo/config.offline \
--replace "[target.aarch64-unknown-linux-gnu]" "" \
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
'';
cargoPatches = [
(fetchpatch {
url = "https://github.com/zcash/zcash/commit/61cd19a52d41d60c1987ecf269f7aa8e4d527310.diff";
sha256 = "sha256-/7T2yCSVlRN7qfFjrZlfBNMlbVHb/KRjtUBY2xFr0mo=";
})
];
cargoSha256 = "sha256-+BLfO5OnCBqQTIqMXKJdoPCRgtENa+m0WOHKG9gkdMk=";
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
buildInputs = [ boost177 libevent libsodium utf8cpp ]
buildInputs = [ boost178 libevent libsodium utf8cpp ]
++ lib.optional withWallet db62
++ lib.optional withZmq zeromq;
@ -37,7 +50,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
configureFlags = [
"--disable-tests"
"--with-boost-libdir=${lib.getLib boost177}/lib"
"--with-boost-libdir=${lib.getLib boost178}/lib"
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
] ++ lib.optional (!withWallet) "--disable-wallet"
@ -58,8 +71,8 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
meta = with lib; {
description = "Peer-to-peer, anonymous electronic cash system";
homepage = "https://z.cash/";
maintainers = with maintainers; [ rht tkerber ];
maintainers = with maintainers; [ rht tkerber centromere ];
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -6326,6 +6326,18 @@ final: prev:
meta.homepage = "https://github.com/darfink/starsearch.vim/";
};
stylish-nvim = buildVimPluginFrom2Nix {
pname = "stylish.nvim";
version = "2022-02-11";
src = fetchFromGitHub {
owner = "teto";
repo = "stylish.nvim";
rev = "ea745ebf446410ef3d75f9890b2e7fd59be42e19";
sha256 = "1kl2g32ls4s7kpr6395rdmsa7gdzkpfiypphmnxg8n75n0b0mwb3";
};
meta.homepage = "https://github.com/teto/stylish.nvim/";
};
suda-vim = buildVimPluginFrom2Nix {
pname = "suda.vim";
version = "2022-02-10";

10
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -41,6 +41,8 @@
, ycmd
, zoxide
, nodejs
, xdotool
, xorg
# test dependencies
, neovim-unwrapped
@ -606,6 +608,14 @@ self: super: {
'';
};
stylish-nvim = super.stylish-nvim.overrideAttrs (old: {
postPatch = ''
substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool
substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
'';
});
sved =
let
# we put the script in its own derivation to benefit the magic of wrapGAppsHook

12
pkgs/applications/editors/vscode/vscode.nix
View File

@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0ss7c0dvlgnfqi0snhx73ndzjbw24xz6pcny4v52mrd1kfhcmpvd";
x86_64-darwin = "0ds5jv5q6k1hzrwhcgkyvx0ls9p1q7zh0fqigpxandx6ysrd7cga";
aarch64-linux = "12zz02hdhhw19rx9kbi3yd5x81w1vs8vxjrnqqvva8bj0jnwf4iq";
aarch64-darwin = "07ws2dc2il7ky77j5pxaxqp5cyw0v04jnv98z1494pdmxyn8gf7q";
armv7l-linux = "0khyzc69rbfz2pnbab9v3as1hdzkzxfg3mxvf6g7ax9npvsrqw92";
x86_64-linux = "1db5vwcwi3w11zm2b72cvddn5k9yav65rg7ii9wq4a0dym39f8ql";
x86_64-darwin = "1q5vjisdc0q5vigb1lwq8fkxbaar73jnk4ac0fqlhc4gqacz3cs3";
aarch64-linux = "01lcvjw9nfgp93ydl16bp91gbkivd23jn8pan220fjvdsgvcbg48";
aarch64-darwin = "06p6p2c9a3rav9c23pvfn8mmd77wc9z7pavpmkgm1f3wplx48q8q";
armv7l-linux = "0pzim9r2zzwyim3g6f8ixgqllgz4cijaiw76czi0wmz4dxxdljrw";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.67.0";
version = "1.67.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

31
pkgs/applications/emulators/pcsx2/default.nix
View File

@ -12,7 +12,9 @@
, libpng
, libpulseaudio
, libsamplerate
, libxml2
, libXdmcp
, openssl
, pcre
, perl
, pkg-config
, portaudio
@ -20,6 +22,8 @@
, soundtouch
, stdenv
, udev
, vulkan-headers
, vulkan-loader
, wrapGAppsHook
, wxGTK
, zlib
@ -28,14 +32,14 @@
stdenv.mkDerivation rec {
pname = "pcsx2";
version = "1.7.2105";
version = "1.7.2731";
src = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";
fetchSubmodules = true;
rev = "v${version}";
hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk=";
hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo=";
};
cmakeFlags = [
@ -44,9 +48,10 @@ stdenv.mkDerivation rec {
"-DPACKAGE_MODE=TRUE"
"-DWAYLAND_API=TRUE"
"-DXDG_STD=TRUE"
"-DUSE_VULKAN=TRUE"
];
nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ];
nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ];
buildInputs = [
alsa-lib
@ -60,16 +65,29 @@ stdenv.mkDerivation rec {
libpng
libpulseaudio
libsamplerate
libxml2
libXdmcp
openssl
pcre
portaudio
SDL2
soundtouch
udev
vulkan-loader
wayland
wxGTK
zlib
];
# Wayland doesn't seem to work right now (crashes when booting a game).
# Try removing `--prefix GDK_BACKEND : x11` on the next update.
# (This may be solved when the project finshes migrating to Qt)
preFixup = ''
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
--prefix GDK_BACKEND : x11
)
'';
meta = with lib; {
description = "Playstation 2 emulator";
longDescription = ''
@ -81,13 +99,12 @@ stdenv.mkDerivation rec {
'';
homepage = "https://pcsx2.net";
maintainers = with maintainers; [ hrdinka govanify ];
mainProgram = "PCSX2";
# PCSX2's source code is released under LGPLv3+. It However ships
# additional data files and code that are licensed differently.
# This might be solved in future, for now we should stick with
# license.free
license = licenses.free;
platforms = platforms.x86;
platforms = platforms.x86_64;
};
}

8
pkgs/applications/networking/tmpmail/default.nix
View File

@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles }:
{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles, xclip }:
stdenvNoCC.mkDerivation rec {
pname = "tmpmail";
version = "1.1.9";
version = "1.2.3";
src = fetchFromGitHub {
owner = "sdushantha";
repo = "tmpmail";
rev = "v${version}";
sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg=";
sha256 = "sha256-s4c1M4YHK/CNpH7nPt7rRqlkLUZrpBXvAVS/qxCai9c=";
};
dontConfigure = true;
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
mkdir -p $out/bin
install -Dm755 -t $out/bin tmpmail
installManPage tmpmail.1
wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq ]}
wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq xclip ]}
'';
meta = with lib; {

10
pkgs/applications/radio/flex-ndax/default.nix
View File

@ -1,19 +1,19 @@
{ lib, buildGoModule, fetchFromGitHub, pulseaudio }:
{ lib, buildGoModule, fetchFromGitHub, libpulseaudio }:
buildGoModule rec {
pname = "flex-ndax";
version = "0.2-20211111.0";
version = "0.2-20220427";
src = fetchFromGitHub {
owner = "kc2g-flex-tools";
repo = "nDAX";
rev = "v${version}";
sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904";
hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc=";
};
buildInputs = [ pulseaudio ];
buildInputs = [ libpulseaudio ];
vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf";
vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg=";
meta = with lib; {
homepage = "https://github.com/kc2g-flex-tools/nDAX";

9
pkgs/applications/radio/gnss-sdr/default.nix
View File

@ -21,13 +21,13 @@
gnuradio.pkgs.mkDerivation rec {
pname = "gnss-sdr";
version = "0.0.16";
version = "0.0.17";
src = fetchFromGitHub {
owner = "gnss-sdr";
repo = "gnss-sdr";
rev = "v${version}";
sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM=";
sha256 = "sha256-0aAjkrVAswoRL/KANBSZ5Jq4Y9VwOHZKUKLpXDdKtk8=";
};
patches = [
@ -35,11 +35,6 @@ gnuradio.pkgs.mkDerivation rec {
# cpu_features which is bundled in the source. NOTE: Perhaps this patch
# should be sent upstream.
./fix_libcpu_features_install_path.patch
# Fixes a compilation issue, should be removed on next release.
(fetchpatch {
url = "https://github.com/gnss-sdr/gnss-sdr/commit/8a42967c854e575f2dd9ee7ca81a2522eebb864b.patch";
sha256 = "sha256-W8BwC08QVtW0LUj5Q+j28aYG+713s+vQIzsWyrNUs1Q=";
})
];
nativeBuildInputs = [

30
pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch
View File

@ -1,6 +1,6 @@
--- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800
+++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800
@@ -1214,7 +1214,7 @@
--- i/CMakeLists.txt
+++ w/CMakeLists.txt
@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND)
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
@ -9,16 +9,16 @@
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
@@ -1247,7 +1247,7 @@
)
set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
)
@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND)
)
set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif()
endif()
ExternalProject_Add(volk_gnsssdr_module
@@ -1256,7 +1256,7 @@
@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND)
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
@ -27,7 +27,7 @@
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
@@ -1271,7 +1271,7 @@
@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND)
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
@ -36,9 +36,9 @@
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
@@ -1310,7 +1310,7 @@
@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND)
if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH)
if(NOT CpuFeatures_FOUND)
if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES)
set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
+ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}

22
pkgs/applications/science/biology/bowtie/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib }:
stdenv.mkDerivation rec {
pname = "bowtie";
@ -11,6 +11,26 @@ stdenv.mkDerivation rec {
sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4=";
};
patches = [
# Without this patch, compiling with clang on an M1 Mac fails because
# 'cpuid.h' is included. It only works on x86 and throws an error.
(fetchpatch {
name = "fix_compilation_on_arm64";
url = "https://github.com/BenLangmead/bowtie/commit/091d72f4cb69ca0713704d38bd7f9b37e6c4ff2d.patch";
sha256 = "sha256-XBvgICUBnE5HKpJ36IHTDiKjJgLFKETsIaJC46uN+2I=";
})
# Without this patch, compilation adds the current source directory to the
# include search path, and #include <version> in standard library code can
# end up picking the unrelated VERSION source code file on case-insensitive
# file systems.
(fetchpatch {
name = "fix_include_search_path";
url = "https://github.com/BenLangmead/bowtie/commit/c208b9db936eab0bc3ffdf0182b4f59a9017a1c4.patch";
sha256 = "sha256-772EE+oWFWXssSMabPryb0AfIS1tC10mPTRCBm7RrUs=";
})
];
buildInputs = [ zlib ];
installFlags = [ "prefix=$(out)" ];

7
pkgs/applications/version-management/cvs2svn/default.nix
View File

@ -1,6 +1,7 @@
{ lib, fetchurl, makeWrapper
, pypy2Packages
, cvs, subversion, git, breezy
, installShellFiles
}:
pypy2Packages.buildPythonApplication rec {
@ -12,7 +13,7 @@ pypy2Packages.buildPythonApplication rec {
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper installShellFiles ];
checkInputs = [ subversion git breezy ];
@ -24,13 +25,15 @@ pypy2Packages.buildPythonApplication rec {
for i in bzr svn git; do
wrapProgram $out/bin/cvs2$i \
--prefix PATH : "${lib.makeBinPath [ cvs ]}"
$out/bin/cvs2$i --man > csv2$i.1
installManPage csv2$i.1
done
'';
meta = with lib; {
description = "A tool to convert CVS repositories to Subversion repositories";
homepage = "https://github.com/mhagger/cvs2svn";
maintainers = [ maintainers.makefu ];
maintainers = with maintainers; [ makefu viraptor ];
platforms = platforms.unix;
license = licenses.asl20;
};

16
pkgs/development/interpreters/php/generic.nix
View File

@ -223,8 +223,7 @@ let
[ "--disable-all" ]
# PCRE
++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]
++ [ "PCRE_LIBDIR=${pcre2}" ]
++ [ "--with-external-pcre=${pcre2.dev}" ]
# Enable sapis
@ -232,10 +231,6 @@ let
++ lib.optional (!cliSupport) "--disable-cli"
++ lib.optional fpmSupport "--enable-fpm"
++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ]
++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [
"--enable-libxml"
"--with-libxml-dir=${libxml2.dev}"
]
++ lib.optional pharSupport "--enable-phar"
++ lib.optional (!phpdbgSupport) "--disable-phpdbg"
@ -270,14 +265,7 @@ let
done
export EXTENSION_DIR=$out/lib/php/extensions
''
# PKG_CONFIG need not be a relative path
+ lib.optionalString (lib.versionOlder version "7.4") ''
for i in $(find . -type f -name "*.m4"); do
substituteInPlace $i \
--replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
done
'' + ''
./buildconf --copy --force
if test -f $src/genfiles; then

44
pkgs/development/interpreters/php/zlib-darwin-tests.patch
View File

@ -1,44 +0,0 @@
diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt
index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644
--- a/ext/zlib/tests/bug55544.phpt
+++ b/ext/zlib/tests/bug55544.phpt
@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip");
if (substr(PHP_OS, 0, 3) == 'WIN') {
die("skip not for windows");
}
+if (PHP_OS == "Darwin") {
+ die("skip not for darwin");
+}
?>
--INI--
output_handler=ob_gzhandler
diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt
index c966b2cbc5b7..2f953168fa22 100644
--- a/ext/zlib/tests/gzencode_variation1.phpt
+++ b/ext/zlib/tests/gzencode_variation1.phpt
@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
if (!extension_loaded("zlib")) {
print "skip - ZLIB extension not loaded";
}
+
+if (PHP_OS == "Darwin") {
+ print "skip - OS is encoded in headers, tested header is non Darwin";
+}
?>
--FILE--
<?php
diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt
index 94ac42a5f1cd..9160cf519751 100644
--- a/ext/zlib/tests/gzencode_variation2.phpt
+++ b/ext/zlib/tests/gzencode_variation2.phpt
@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
if (!extension_loaded("zlib")) {
print "skip - ZLIB extension not loaded";
}
+
+if (PHP_OS == "Darwin") {
+ print "skip - OS is encoded in headers, tested header is non Darwin";
+}
?>
--FILE--
<?php

4
pkgs/development/libraries/libstrophe/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "libstrophe";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "strophe";
repo = pname;
rev = version;
sha256 = "sha256-xAqBxCYNo2IntnHKXY6CSJ+Yiu01lxQ1Q3gb0ioypSs=";
sha256 = "sha256-YJ8A97ECc3VxdGfhUu0YYijAamnrHCO6kr7TAIan96o=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

2
pkgs/development/libraries/libxslt/default.nix
View File

@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
homepage = "http://xmlsoft.org/XSLT/";
homepage = "https://gitlab.gnome.org/GNOME/libxslt";
description = "A C library and tools to do XSL transformations";
license = licenses.mit;
platforms = platforms.all;

3
pkgs/development/libraries/pe-parse/default.nix
View File

@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# See https://github.com/trailofbits/pe-parse/issues/169
NIX_CFLAGS_COMPILE = "-Wno-sign-conversion";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/dump-pe ../tests/assets/example.exe

2
pkgs/development/node-packages/default.nix
View File

@ -329,7 +329,7 @@ let
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
sha512 = "sha512-oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q==";
sha512 = "sha512-l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw==";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \

10
pkgs/development/node-packages/node-packages.nix generated
View File

@ -67102,15 +67102,6 @@ let
sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==";
};
};
"ts-pattern-4.0.2" = {
name = "ts-pattern";
packageName = "ts-pattern";
version = "4.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.0.2.tgz";
sha512 = "eHqR/7A6fcw05vCOfnL6RwgGJbVi9G/YHTdYdjYmElhDdJ1SMn7pWs+6+YuxygaFwQS/g+cIDlu+UD8IVpur1A==";
};
};
"ts-pnp-1.2.0" = {
name = "ts-pnp";
packageName = "ts-pnp";
@ -118740,7 +118731,6 @@ in
};
dependencies = [
sources."@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b"
sources."ts-pattern-4.0.2"
];
buildInputs = globalBuildInputs;
meta = {

2
pkgs/development/ocaml-modules/benchmark/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://ocaml-benchmark.forge.ocamlcore.org/";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
description = "Benchmark running times of code";
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ volth ];

5
pkgs/development/ocaml-modules/biniou/default.nix
View File

@ -22,9 +22,10 @@ buildDunePackage rec {
'';
meta = {
inherit (src.meta) homepage;
description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "bdump";
};
}

2
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation {
for reading from and writing to compressed files in these formats.
'';
license = "LGPL+linking exceptions";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = with maintainers; [ maggesi ];
};
}

2
pkgs/development/ocaml-modules/camomile/0.8.2.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "A comprehensive Unicode library for OCaml";
license = lib.licenses.lgpl21;
branch = "0.8.2";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

2
pkgs/development/ocaml-modules/camomile/0.8.5.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile";
description = "A comprehensive Unicode library for OCaml";
license = lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

2
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = "https://erratique.ch/software/cmdliner";
description = "An OCaml module for the declarative definition of command line interfaces";
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.vbgl ];
};
}

2
pkgs/development/ocaml-modules/cpdf/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.coherentpdf.com/";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
description = "PDF Command Line Tools";
license = licenses.unfree;
maintainers = [ maintainers.vbgl ];

2
pkgs/development/ocaml-modules/cryptgps/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
itself.
'';
license = lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

2
pkgs/development/ocaml-modules/curses/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES";
maintainers = [ maintainers.volth ];
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/dypgen/default.nix
View File

@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = "http://dypgen.free.fr";
description = "Dypgen GLR self extensible parser generator";
license = lib.licenses.cecill-b;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/extlib/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ygrek/ocaml-extlib";
description = "Enhancements to the OCaml Standard Library modules";
license = lib.licenses.lgpl21Only;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.sternenseemann ];
};
}

2
pkgs/development/ocaml-modules/functory/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation {
description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
license = licenses.lgpl21;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

3
pkgs/development/ocaml-modules/jsonm/default.nix
View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
homepage = "https://erratique.ch/software/jsonm";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ vbgl ];
platforms = ocaml.meta.platforms or [];
mainProgram = "jsontrip";
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation (rec {
meta = {
branch = "2.14";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
lib.maintainers.roconnor

2
pkgs/development/ocaml-modules/lablgtk/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation {
dontStrip = true;
meta = with lib; {
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = with maintainers; [
maggesi roconnor vbgl
];

2
pkgs/development/ocaml-modules/llvm/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation {
meta = {
inherit (libllvm.meta) license homepage;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
description = "OCaml bindings distributed with LLVM";
maintainers = with lib.maintainers; [ vbgl ];
};

2
pkgs/development/ocaml-modules/ocaml-cairo/default.nix
View File

@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
homepage = "http://cairographics.org/cairo-ocaml";
description = "ocaml bindings for cairo library";
license = lib.licenses.gpl2;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "https://libvirt.org/ocaml/";
license = licenses.gpl2;
maintainers = [ maintainers.volth ];
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/ocamlnat/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
x86 or x86-64 processors. Support for additional architectures and
operating systems is planned, but not yet available.
'';
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

2
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [
lib.maintainers.maggesi
];

2
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View File

@ -67,7 +67,7 @@ buildDunePackage rec {
A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
'';
license = lib.licenses.lgpl21Only;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.gal_bolle ];
};

1
pkgs/development/ocaml-modules/omd/default.nix
View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ocaml/omd";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "omd";
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/otfm/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation {
of them.
'';
homepage = webpage;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
};

3
pkgs/development/ocaml-modules/piqi-ocaml/default.nix
View File

@ -28,9 +28,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://piqi.org";
description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings";
homepage = "https://piqi.org";
license = licenses.asl20;
maintainers = [ maintainers.maurer ];
mainProgram = "piqic-ocaml";
};
}

3
pkgs/development/ocaml-modules/ppx_bap/default.nix
View File

@ -44,8 +44,9 @@ buildDunePackage rec {
meta = {
description = "The set of ppx rewriters for BAP";
license = lib.licenses.mit;
inherit (src.meta) homepage;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "ppx-bap";
};
}

2
pkgs/development/ocaml-modules/rope/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation ({
meta = {
homepage = "http://rope.forge.ocamlcore.org/";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
description = ''Ropes ("heavyweight strings") in OCaml'';
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ volth ];

2
pkgs/development/ocaml-modules/sawja/default.nix
View File

@ -44,6 +44,6 @@ stdenv.mkDerivation {
homepage = "http://sawja.inria.fr/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/sodium/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/dsheets/ocaml-sodium";
description = "Binding to libsodium 1.0.9+";
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.rixed ];
};
}

2
pkgs/development/ocaml-modules/syslog/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/rixed/ocaml-syslog";
description = "Simple wrapper to access the system logger from OCaml";
license = licenses.lgpl21Plus;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.rixed ];
};
}

2
pkgs/development/ocaml-modules/tsdl/default.nix
View File

@ -37,6 +37,6 @@ stdenv.mkDerivation {
homepage = webpage;
description = "Thin bindings to the cross-platform SDL library";
license = licenses.isc;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}

2
pkgs/development/ocaml-modules/ulex/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
description = "A lexer generator for Unicode and OCaml";
license = lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
maintainers = [ lib.maintainers.roconnor ];
};
}

3
pkgs/development/ocaml-modules/uuidm/default.nix
View File

@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
homepage = "https://erratique.ch/software/uuidm";
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.maurer ];
mainProgram = "uuidtrip";
inherit (ocaml.meta) platforms;
};
}

3
pkgs/development/ocaml-modules/uunf/default.nix
View File

@ -32,8 +32,9 @@ stdenv.mkDerivation {
meta = with lib; {
description = "An OCaml module for normalizing Unicode text";
homepage = webpage;
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
mainProgram = "unftrip";
inherit (ocaml.meta) platforms;
};
}

3
pkgs/development/ocaml-modules/uuseg/default.nix
View File

@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An OCaml library for segmenting Unicode text";
homepage = webpage;
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
mainProgram = "usegtrip";
inherit (ocaml.meta) platforms;
};
}

3
pkgs/development/ocaml-modules/uutf/default.nix
View File

@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Non-blocking streaming Unicode codec for OCaml";
homepage = "https://erratique.ch/software/uutf";
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
mainProgram = "utftrip";
inherit (ocaml.meta) platforms;
};
}

5
pkgs/development/ocaml-modules/xmlm/default.nix
View File

@ -27,8 +27,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An OCaml streaming codec to decode and encode the XML data format";
homepage = webpage;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
mainProgram = "xmltrip";
inherit (ocaml.meta) platforms;
};
}

1
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -18,5 +18,6 @@ buildDunePackage rec {
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
mainProgram = "ydump";
};
}

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.2";
version = "9.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-JJ5wrjXazq0+6f4nccLRYaAgTg0d39REXmPHVchDzaE=";
hash = "sha256-R8AaQj/Rdz8SSN2L8v8ZzIxnPQqdg/SKUB6FV9uYFLs=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aioairzone/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.4.3";
version = "0.4.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-QLHM7M3x0QjTTzKNngsNioEzpPh4qG1ntEtSkHQPlfQ=";
hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/angr/default.nix
View File

@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.2.2";
version = "9.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-aniLMNKfEqlVkniS2mSCaeXIOc0EC4zOR59kiGTNUWk=";
hash = "sha256-RcAiPzz2JUlNIGU7+6WCd5JskRYmlMee8wOcOclfb0Q=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/angrop/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.2.2";
version = "9.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-LCgY/eOtRulnMeYt96ZYI8vPyyM+jxjlkxTd8Cmnfe0=";
hash = "sha256-bhdn3uomvegpvynR0ts4KdwFapX2xGfuwp4e57Xtcoo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.2";
version = "9.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-wJEipAlqBsP2tgsRDVDe1ZtiEg1uhpP+1P1VGU7tBBw=";
hash = "sha256-r0cZXyj47HmgFVyQ3POGexeQxBiQ1xx/ptsPMwCRjHY=";
};
checkInputs = [

20
pkgs/development/python-modules/azure-mgmt-network/default.nix
View File

@ -5,18 +5,20 @@
, azure-mgmt-core
, msrest
, msrestazure
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
version = "19.3.0";
version = "20.0.0";
pname = "azure-mgmt-network";
disabled = !isPy3k;
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11";
hash = "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY=";
};
propagatedBuildInputs = [
@ -26,12 +28,16 @@ buildPythonPackage rec {
msrestazure
];
# has no tests
# Module has no tests
doCheck = false;
pythonNamespaces = [ "azure.mgmt" ];
pythonNamespaces = [
"azure.mgmt"
];
pythonImportsCheck = [ "azure.mgmt.network" ];
pythonImportsCheck = [
"azure.mgmt.network"
];
meta = with lib; {
description = "Microsoft Azure SDK for Python";

19
pkgs/development/python-modules/azure-storage-file-share/default.nix
View File

@ -1,7 +1,7 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, lib
, pythonOlder
# pythonPackages
, azure-core
@ -11,13 +11,15 @@
buildPythonPackage rec {
pname = "azure-storage-file-share";
version = "12.7.0";
disabled = !isPy3k;
version = "12.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-kYNugiWNlXEgryKLwrzytca/W+2481RqqUCbdJWrqDI=";
hash = "sha256-46OEVjMYFUa8A6Qh+yicrqUuXmUaSzsWT4maBFG6Yqg=";
};
propagatedBuildInputs = [
@ -28,6 +30,7 @@ buildPythonPackage rec {
# requires checkout from monorepo
doCheck = false;
pythonImportsCheck = [
"azure.core"
"azure.storage"
@ -37,8 +40,6 @@ buildPythonPackage rec {
description = "Microsoft Azure File Share Storage Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda
];
maintainers = with maintainers; [ kamadorueda ];
};
}

6
pkgs/development/python-modules/bellows/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.29.0";
version = "0.30.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = version;
sha256 = "sha256-coIrI3C6Wnn8Of/IHAlvZgkcBBf9OBQt5Ir6YOXCf0c=";
rev = "refs/tags/${version}";
sha256 = "sha256-epsE/VKK6LwMVbkx5PWgAxZ62PO4udCFr3jYi0MrUpI=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.2";
version = "9.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-b07WygCR3IhRgyt7u1ipyyK4MM3TNeLW04WoZJ2eQZk=";
hash = "sha256-O2nkGIQfjGmhrqBPoMI97DsCvOUZix0VcUHwmDyF40Q=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/cle/default.nix
View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.2";
version = "9.2.3";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-vEnhoVxn/p4CNzfHFM1cKaQ3ESsJx5U4+Lz4/LDCtao=";
hash = "sha256-gyWeE4sF9Bmk2CNmXh90xMtXlaz/Agm7wX6sWr0Fyco=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/fontmath/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "fontMath";
version = "0.9.1";
version = "0.9.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1c5e76e135409f49b15809d0ce94dfd00850f893f86d4d6a336808dbbf292700";
sha256 = "sha256-TIsccR4cv0upPD0IQ5NbBmGXMTEmGvCGCL3hfeEBhAQ=";
extension = "zip";
};

19
pkgs/development/python-modules/pure-pcapy3/default.nix
View File

@ -1,17 +1,28 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "pure-pcapy3";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr";
hash = "sha256-uZ5F8W1K1BDrXrvH1dOeNT1+2n6G8K1S5NxcRaez6pI=";
};
pythonImportsCheck = [
"pure_pcapy"
];
meta = with lib; {
description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
homepage = "https://bitbucket.org/viraptor/pure-pcapy";
description = "Reimplementation of pcapy";
homepage = "https://github.com/rcloran/pure-pcapy-3";
license = licenses.bsd2;
maintainers = with maintainers; [ etu ];
};

12
pkgs/development/python-modules/pygtfs/default.nix
View File

@ -4,6 +4,7 @@
, fetchPypi
, nose
, pytz
, pythonOlder
, setuptools-scm
, six
, sqlalchemy
@ -11,11 +12,14 @@
buildPythonPackage rec {
pname = "pygtfs";
version = "0.1.6";
version = "0.1.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0nx2idgza07kmvj7pcgpj3pqhw53v5rq63paw2ly51cjas2fv5pr";
hash = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8=";
};
nativeBuildInputs = [
@ -33,7 +37,9 @@ buildPythonPackage rec {
nose
];
pythonImportsCheck = [ "pygtfs" ];
pythonImportsCheck = [
"pygtfs"
];
meta = with lib; {
description = "Python module for GTFS";

36
pkgs/development/python-modules/pypiserver/default.nix
View File

@ -1,15 +1,23 @@
{ buildPythonPackage, fetchFromGitHub, lib, passlib, pytestCheckHook, setuptools
, setuptools-git, twine, webtest }:
{ buildPythonPackage
, fetchFromGitHub
, lib
, passlib
, pytestCheckHook
, setuptools
, setuptools-git
, twine
, webtest
}:
buildPythonPackage rec {
pname = "pypiserver";
version = "1.4.2";
version = "1.5.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1z5rsmqgin98m6ihy1ww42fxxr6jb4hzldn8vlc9ssv7sawdz8vz";
sha256 = "sha256-BK5vQsaWIMOnUqyeofAWJC1nQJPsTvmzl9i2893JCDI=";
};
nativeBuildInputs = [ setuptools-git ];
@ -20,13 +28,23 @@ buildPythonPackage rec {
export HOME=$TMPDIR
'';
checkInputs = [ passlib pytestCheckHook twine webtest ];
checkInputs = [
passlib
pytestCheckHook
twine
webtest
];
# These tests try to use the network
disabledTests = [
"test_pipInstall_openOk"
"test_pipInstall_authedOk"
# fails to install the package
"test_hash_algos"
"test_pip_install_authed_succeeds"
"test_pip_install_open_succeeds"
];
disabledTestPaths = [
# requires docker service running
"docker/test_docker.py"
];
pythonImportsCheck = [ "pypiserver" ];
@ -35,6 +53,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pypiserver/pypiserver";
description = "Minimal PyPI server for use with pip/easy_install";
license = with licenses; [ mit zlib ];
maintainers = [ maintainers.austinbutler ];
maintainers = with maintainers; [ austinbutler SuperSandro2000 ];
};
}

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.2";
version = "9.2.3";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-jfquDFZylrrtYb3PbDmLDy7wHcvM8H2nIv4dRqRvY2U=";
hash = "sha256-uGZlWDTDczBiNCd4D4y6Umz44G8Zn3Zr8/R7Kn+4aS8=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/weasyprint/default.nix
View File

@ -48,6 +48,12 @@ buildPythonPackage rec {
pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}";
})
# Disable tests for new Ghostscript
# Remove when next version is released
(fetchpatch {
url = "https://github.com/Kozea/WeasyPrint/commit/e544398b00d76bc0317ea7e2abe40dc46b380910.patch";
sha256 = "sha256-oQO3j9Mo1x98WaLPROxsOn0qkeYRJrCx5QWWKoHvabE=";
})
];
nativeBuildInputs = [

6
pkgs/development/python-modules/yte/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, dpath
, fetchFromGitHub
, plac
, poetry-core
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "yte";
version = "1.2.3";
version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +20,7 @@ buildPythonPackage rec {
owner = "koesterlab";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo=";
sha256 = "sha256-G3TjIs/EeCqpNuFdb/WZ7PaPtnUdTvbH41OtRypfptg=";
};
nativeBuildInputs = [
@ -27,6 +28,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
dpath
plac
pyyaml
];

4
pkgs/development/python-modules/ytmusicapi/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ytmusicapi";
version = "0.21.0";
version = "0.22.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A=";
hash = "sha256-CZ4uoW4UHn5C+MckQXysTdydaApn99b0UCnF5RPb7DI=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/database/prisma-engines/default.nix
View File

@ -13,19 +13,19 @@
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "3.13.0";
version = "3.14.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-+Ug4tOaqUaqcEoMv20CKE8JrjIdW34VSn20gXZYX92k=";
sha256 = "sha256-UawQbVbafRpxkYFGW+y+HkkYME8qziG7tmsIjbqwHq0=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
cargoSha256 = "sha256-V2G++BYLRGVM4leB2jkM+HcFiCIdf2wA3dfYdtlq7XI=";
cargoSha256 = "sha256-1kR70t7vWzvV3DOrkVP6ktzKK5tB9KjJyAMpKO6gtYA=";
nativeBuildInputs = [ pkg-config ];

45
pkgs/development/tools/mysql-shell/default.nix
View File

@ -31,14 +31,10 @@
, CoreServices
, developer_cmds
, DarwinTools
, mysql-shell
}:
let
pythonDeps = [
python3.pkgs.certifi
python3.pkgs.paramiko
];
pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ];
site = ''
import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}])
@ -46,24 +42,22 @@ let
in
stdenv.mkDerivation rec{
pname = "mysql-shell";
version = "8.0.28";
version = "8.0.29";
srcs = [
(fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz";
sha256 = "sha256-xm2sepVgI0MPs25vu+BcRQeksaVhHcQlymreN1myu6c=";
sha256 = "sha256-ijwyamQgMoUEcMNpIJjJxH/dRuRFpdcXGmQqpD+WrmA=";
})
(fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz";
sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI=";
sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY=";
})
];
sourceRoot = "mysql-shell-${version}-src";
postPatch = ''
patch ../mysql-${version}/cmake/fido2.cmake ${./fido2.cmake.patch}
substituteInPlace ../mysql-${version}/cmake/libutils.cmake --replace /usr/bin/libtool libtool
substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
@ -73,12 +67,7 @@ stdenv.mkDerivation rec{
echo '${site}' >> python/packages/mysqlsh/__init__.py
'';
nativeBuildInputs = [
pkg-config
cmake
git
bison
] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
buildInputs = [
boost
@ -99,30 +88,21 @@ stdenv.mkDerivation rec{
cyrus_sasl
openldap
v8
python3
] ++ pythonDeps ++ lib.optionals stdenv.isLinux [
numactl
libtirpc
] ++ lib.optionals stdenv.isDarwin [
cctools
CoreServices
developer_cmds
DarwinTools
];
] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ];
preConfigure = ''
# Build MySQL
cmake -DWITH_BOOST=system \
-DWITH_SYSTEM_LIBS=ON \
-DWITH_ROUTER=OFF \
-DWITH_UNIT_TESTS=OFF \
-DFORCE_UNSUPPORTED_COMPILER=1 \
-S ../mysql-${version} -B ../mysql-${version}/build
cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
-DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build
cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
# Get libv8_monolith
mkdir -p ../v8/lib
ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
mkdir -p ../v8/lib && ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a
'';
cmakeFlags = [
@ -139,10 +119,7 @@ stdenv.mkDerivation rec{
"-DHAVE_PYTHON=1"
];
CXXFLAGS = [
"-DV8_COMPRESS_POINTERS=1"
"-DV8_31BIT_SMIS_ON_64BIT_ARCH=1"
];
CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
meta = with lib; {
homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/";

25
pkgs/development/tools/mysql-shell/fido2.cmake.patch
View File

@ -1,25 +0,0 @@
diff --git a/cmake/fido2.cmake b/cmake/fido2.cmake
index c20e6e75c0d..f2d5cbd8430 100644
--- a/cmake/fido2.cmake
+++ b/cmake/fido2.cmake
@@ -30,19 +30,8 @@ MACRO(FIND_FIDO_VERSION)
IF(WITH_FIDO STREQUAL "bundled")
SET(FIDO_VERSION "1.7.0")
ELSE()
- # This does not set any version information:
- # PKG_CHECK_MODULES(SYSTEM_FIDO fido2)
-
MYSQL_CHECK_PKGCONFIG()
- EXECUTE_PROCESS(
- COMMAND ${MY_PKG_CONFIG_EXECUTABLE} --modversion libfido2
- OUTPUT_VARIABLE MY_FIDO_MODVERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE
- RESULT_VARIABLE MY_MODVERSION_RESULT
- )
- IF(MY_MODVERSION_RESULT EQUAL 0)
- SET(FIDO_VERSION ${MY_FIDO_MODVERSION})
- ENDIF()
+ PKG_CHECK_MODULES(FIDO libfido2)
ENDIF()
MESSAGE(STATUS "FIDO_VERSION (${WITH_FIDO}) is ${FIDO_VERSION}")
ENDMACRO(FIND_FIDO_VERSION)

8
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -54,14 +54,12 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://projects.camlcity.org/projects/findlib.html";
description = "O'Caml library manager";
homepage = "http://projects.camlcity.org/projects/findlib.html";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ maggesi vbmithr ];
mainProgram = "ocamlfind";
platforms = ocaml.meta.platforms or [];
maintainers = [
lib.maintainers.maggesi
lib.maintainers.vbmithr
];
};
}

7
pkgs/development/tools/ocaml/oasis/default.nix
View File

@ -39,12 +39,11 @@ stdenv.mkDerivation {
'';
meta = with lib; {
homepage = "http://oasis.forge.ocamlcore.org/";
description = "Configure, build and install system for OCaml projects";
homepage = "http://oasis.forge.ocamlcore.org/";
license = licenses.lgpl21;
maintainers = with maintainers; [ vbgl maggesi ];
mainProgram = "oasis";
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [
vbgl maggesi
];
};
}

6
pkgs/development/tools/pur/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "pur";
version = "6.1.0";
version = "7.0.0";
src = fetchFromGitHub {
owner = "alanhamlett";
repo = "pip-update-requirements";
rev = version;
hash = "sha256-EcyDEXDgjicCRThXC+co/PwTjAxkRXVG1++JZtsSjZo=";
rev = "refs/tags/${version}";
hash = "sha256-JAjz9A9r1H6MJX7MSq7UvQKfULhB9UuPP3tI6Cggx9I=";
};
propagatedBuildInputs = [

3
pkgs/games/azimuth/default.nix
View File

@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which ];
buildInputs = [ SDL ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ];
preConfigure = ''
cat Makefile
substituteInPlace data/azimuth.desktop \
--replace Exec=azimuth "Exec=$out/bin/azimuth" \
--replace "Version=%AZ_VERSION_NUMBER" "Version=${version}"

2
pkgs/servers/http/mini-httpd/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
meta = {
homepage = "http://mini-httpd.nongnu.org/";
description = "minimalistic high-performance web server";

4
pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "prometheus-xmpp-alerts";
version = "0.5.1";
version = "0.5.3";
src = fetchFromGitHub {
owner = "jelmer";
repo = pname;
rev = "v${version}";
sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld";
sha256 = "sha256-gb7lFRqqw4w/B+Sw0iteDkuGsPfw/ZZ+sRMTu5vxIUo=";
};
propagatedBuildInputs = [

32
pkgs/stdenv/generic/make-derivation.nix
View File

@ -193,6 +193,12 @@ let
else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable);
# hardeningDisable additionally supports "all".
erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable);
checkDependencyList = checkDependencyList' [];
checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep
else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep
else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");
in if builtins.length erroneousHardeningFlags != 0
then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} {
inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags;
@ -208,34 +214,34 @@ else let
dependencies = map (map lib.chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild)
(map (drv: drv.nativeDrv or drv) nativeBuildInputs
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))
(map (drv: drv.nativeDrv or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
++ lib.optionals doCheck checkInputs
++ lib.optionals doInstallCheck' installCheckInputs)
(map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget)
++ lib.optionals doInstallCheck' installCheckInputs))
(map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTarget" depsBuildTarget))
]
[
(map (drv: drv.__spliced.hostHost or drv) depsHostHost)
(map (drv: drv.crossDrv or drv) buildInputs)
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost))
(map (drv: drv.crossDrv or drv) (checkDependencyList "buildInputs" buildInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget)
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget))
]
];
propagatedDependencies = map (map lib.chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated)
(map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
(map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated)
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated))
(map (drv: drv.nativeDrv or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))
(map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated))
]
[
(map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated)
(map (drv: drv.crossDrv or drv) propagatedBuildInputs)
(map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated))
(map (drv: drv.crossDrv or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs))
]
[
(map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated)
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated))
]
];

22
pkgs/tools/admin/google-cloud-sdk/data.nix
View File

@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "384.0.1";
version = "385.0.0";
googleCloudSdkPkgs = {
x86_64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86_64.tar.gz";
sha256 = "1pa6dzizn7sjahghiwz98n906ssbq4aa9kg1f3akdsmmabh95pd7";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-linux-x86_64.tar.gz";
sha256 = "17l70chxxnacljhck1bxqz85170a6ilw5lzj8m3gcciy6klkj66d";
};
x86_64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-x86_64.tar.gz";
sha256 = "0pis92ldxxzvsamkck54d5d86ss13wipji29x082750c54gwm6w3";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-darwin-x86_64.tar.gz";
sha256 = "185kj98vwg0fbkfxw0w8258dg45avn22p7afq98gcflr2ymxin2v";
};
aarch64-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-arm.tar.gz";
sha256 = "1ssxb126hjyylgjbybl7ksiqnwf2hz6y0x1s5rjicaqpw5yv0sqy";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-linux-arm.tar.gz";
sha256 = "044zk3px8wqlz4wcl2kqdv4nr5r2p1s0ahlxiaigdgfm8b3wm1gh";
};
aarch64-darwin =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-arm.tar.gz";
sha256 = "1qxhl7c1ii44drls2mpmm03n2j7274dxcsf5inrhyjgs94yl5h7b";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-darwin-arm.tar.gz";
sha256 = "1rjjr5vn99cv9shr5yazqzh6m7yvbn7rmjg0f8wbbmlj7fqd7gzv";
};
i686-linux =
{
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86.tar.gz";
sha256 = "1gghl16bdc9vgd2p834vd2i6av81q15czi7arpnmgg9n5dl3i2c8";
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-385.0.0-linux-x86.tar.gz";
sha256 = "1ym5hh1dq5wbx3lr75im2ibsr5iqnsamqsvz1nw15l7ii2v7hsjy";
};
};
}

2
pkgs/tools/admin/google-cloud-sdk/update.sh
View File

@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
# Version of Google Cloud SDK from
# https://cloud.google.com/sdk/docs/release-notes
VERSION="384.0.1"
VERSION="385.0.0"
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"

4
pkgs/tools/filesystems/s3fs/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
version = "1.90";
version = "1.91";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${version}";
sha256 = "sha256-tcoINdkPfIdO0VMQ5tdpKcslpvvgVhaJiDFnS/ix0sc=";
sha256 = "sha256-41IgUgpVZiIzi3N5kgX7PAhgnd+i/FH1o8t5y3Uw14g=";
};
buildInputs = [ curl openssl libxml2 fuse ];

6
pkgs/tools/misc/broot/default.nix
View File

@ -15,14 +15,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.11.1";
version = "1.12.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-MbyfdzeBo12/7M1F/J7upBQGB/tv1M4sZ+90i/vcLjs=";
sha256 = "sha256-WCnTmb9EEFmA4nEBD3UzV3JfyHtJyJibMd85madoyto=";
};
cargoHash = "sha256-GDU7tL+NDKk46DYnZajcAoPMZxGCrg/IS4xhSZrB6Cs=";
cargoHash = "sha256-FH+swtzO65fKWFLG3rDOysmbsVSjGFGeMiYtNQU62ww=";
nativeBuildInputs = [
installShellFiles

16
pkgs/tools/misc/umlet/default.nix
View File

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl, jre, unzip, runtimeShell }:
stdenv.mkDerivation rec {
major = "14";
minor = "3";
version = "${major}.${minor}.0";
let
major = "15";
minor = "0";
patch = "0";
in stdenv.mkDerivation rec {
pname = "umlet";
version = "${major}.${minor}.${patch}";
src = fetchurl {
url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l";
url = "https://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
sha256 = "sha256-gdvhqYGyrFuQhhrkF26wXb3TQLRCLm59/uSxTPmHdAE=";
};
nativeBuildInputs = [ unzip ];
@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and
Linux.
'';
homepage = "http://www.umlet.com";
homepage = "https://www.umlet.com";
license = licenses.gpl3;
maintainers = with maintainers; [ oxzi ];
platforms = platforms.all;

8
pkgs/tools/networking/godns/default.nix
View File

@ -1,14 +1,14 @@
{ buildGoModule, fetchFromGitHub, lib }:
{ buildGoModule, fetchFromGitHub, lib, nix-update-script }:
buildGoModule rec {
pname = "godns";
version = "2.7.6";
version = "2.7.7";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
sha256 = "sha256-w0hHl7QOpIOINRbCrocZM68b44h+IwkHmXTDnVfT0o0=";
sha256 = "sha256-55A1dxVRIngfS43V+iM1RX2U6eQyPsIAHgyxKGO4yrY=";
};
vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850=";
@ -18,6 +18,8 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
passthru.updateScript = nix-update-script { attrPath = pname; };
meta = with lib; {
description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc";
homepage = "https://github.com/TimothyYe/godns";

6
pkgs/tools/security/naabu/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "naabu";
version = "2.0.6";
version = "2.0.7";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "naabu";
rev = "v${version}";
sha256 = "sha256-soYtm8vEkMJq9MeoUqOGJPWxZUrh3mGnApxG154W1wI=";
sha256 = "sha256-pfaK2Hj6iHk8njEMEbeSHGIKTn5O3IF83At14iDNI34=";
};
vendorSha256 = "sha256-MR1JUbeGC4N0jDuYdwVFMHBdZEy5BkID2BFdCwjtTAg=";
vendorSha256 = "sha256-eco1e1A0cDk1Yc0KP9tc3Kf4E+z1av7EDHynVhoHhMk=";
buildInputs = [
libpcap

15
pkgs/tools/wayland/wdomirror/configure-bounds.patch
View File

@ -1,15 +0,0 @@
From https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438
--- a/main.c
+++ b/main.c
@@ -409,9 +409,12 @@ xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel)
ctx->quit = true;
}
+static void xdg_toplevel_handle_configure_bounds(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height) {}
+
static const struct xdg_toplevel_listener xdg_toplevel_listener = {
xdg_toplevel_handle_configure,
xdg_toplevel_handle_close,
+ xdg_toplevel_handle_configure_bounds,
};

12
pkgs/tools/wayland/wdomirror/default.nix
View File

@ -6,6 +6,7 @@
, pkg-config
, wayland
, wayland-protocols
, fetchurl
}:
stdenv.mkDerivation {
@ -24,12 +25,11 @@ stdenv.mkDerivation {
buildInputs = [ wayland ];
patches = [
# A recent change to xdg-shell-client-protocol causes a build
# failure. This was reported upstream as GH #5. User @AlexBMJ
# posted the following two-line fix in that issue, but the
# developer has not yet responded:
# https://github.com/progandy/wdomirror/issues/5#issuecomment-1103265438
./configure-bounds.patch
# https://github.com/progandy/wdomirror/pull/7
(fetchurl {
url = "https://github.com/progandy/wdomirror/commit/142632208e9ea2b4a4ebd784532efdb8cad7b87c.patch";
hash = "sha256-z6/8q2vOtmlGFbDVG5BVWWbLQT8kBvJXT9/oZkWS9gw=";
})
];
installPhase = ''

6
pkgs/top-level/all-packages.nix
View File

@ -625,8 +625,8 @@ with pkgs;
mysql-shell = callPackage ../development/tools/mysql-shell {
inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost173; # Configure checks for specific version.
protobuf = protobuf3_11;
boost = boost177; # Configure checks for specific version.
protobuf = protobuf3_19;
icu = icu67;
v8 = v8_8_x;
};
@ -22452,6 +22452,8 @@ with pkgs;
pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { };
pypiserver = with python3Packages; toPythonApplication pypiserver;
qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };

130
pkgs/top-level/php-packages.nix
View File

@ -300,9 +300,9 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "dom";
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-dom" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--enable-dom"
];
}
{
name = "enchant";
@ -313,7 +313,7 @@ lib.makeScope pkgs.newScope (self: with self; {
doCheck = false;
}
{ name = "exif"; doCheck = false; }
{ name = "ffi"; buildInputs = [ libffi ]; enable = lib.versionAtLeast php.version "7.4"; }
{ name = "ffi"; buildInputs = [ libffi ]; }
{ name = "fileinfo"; buildInputs = [ pcre2 ]; }
{ name = "filter"; buildInputs = [ pcre2 ]; }
{ name = "ftp"; buildInputs = [ openssl ]; }
@ -326,33 +326,10 @@ lib.makeScope pkgs.newScope (self: with self; {
"--enable-gd-jis-conv"
];
doCheck = false;
enable = lib.versionAtLeast php.version "7.4";
}
{
name = "gd";
buildInputs = [ zlib gd libXpm ];
configureFlags = [
"--with-gd=${gd.dev}"
"--with-freetype-dir=${freetype.dev}"
"--with-jpeg-dir=${libjpeg.dev}"
"--with-png-dir=${libpng.dev}"
"--with-webp-dir=${libwebp}"
"--with-xpm-dir=${libXpm.dev}"
"--with-zlib-dir=${zlib.dev}"
"--enable-gd-jis-conv"
];
doCheck = false;
enable = lib.versionOlder php.version "7.4";
}
{
name = "gettext";
buildInputs = [ gettext ];
patches = lib.optionals (lib.versionOlder php.version "7.4") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/632b6e7aac207194adc3d0b41615bfb610757f41.patch";
sha256 = "0xn3ivhc4p070vbk5yx0mzj2n7p04drz3f98i77amr51w0vzv046";
})
];
postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' '';
configureFlags = [ "--with-gettext=${gettext}" ];
}
@ -361,7 +338,6 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ gmp ];
configureFlags = [ "--with-gmp=${gmp.dev}" ];
}
{ name = "hash"; enable = lib.versionOlder php.version "7.4"; }
{
name = "iconv";
configureFlags = [
@ -386,12 +362,6 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "intl";
buildInputs = [ icu64 ];
patches = lib.optionals (lib.versionOlder php.version "7.4") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
})
];
}
{ name = "json"; enable = lib.versionOlder php.version "8.0"; }
{
@ -442,24 +412,7 @@ lib.makeScope pkgs.newScope (self: with self; {
+----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
'')
] ++ lib.optionals (lib.versionOlder php.version "7.4.8") [
(pkgs.writeText "mysqlnd_fix_compression.patch" ''
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -48,7 +48,7 @@
#define MYSQLND_DBG_ENABLED 0
#endif
-#if defined(MYSQLND_COMPRESSION_WANTED) && defined(HAVE_ZLIB)
+#if defined(MYSQLND_COMPRESSION_WANTED)
#define MYSQLND_COMPRESSION_ENABLED 1
#endif
'')
];
postPhpize = lib.optionalString (lib.versionOlder php.version "7.4") ''
substituteInPlace configure --replace '$OPENSSL_LIBDIR' '${openssl}/lib' \
--replace '$OPENSSL_INCDIR' '${openssl.dev}/include'
'';
}
# oci8 (7.4, 7.3, 7.2)
# odbc (7.4, 7.3, 7.2)
@ -468,25 +421,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [
valgrind.dev
];
patches = lib.optionals (lib.versionOlder php.version "7.4") [
(pkgs.writeText "zend_file_cache_config.patch" ''
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -27,9 +27,9 @@
#include "ext/standard/md5.h"
#endif
+#include "ZendAccelerator.h"
#ifdef HAVE_OPCACHE_FILE_CACHE
-#include "ZendAccelerator.h"
#include "zend_file_cache.h"
#include "zend_shared_alloc.h"
#include "zend_accelerator_util_funcs.h"
'')
];
zendExtension = true;
doCheck = lib.versionAtLeast php.version "7.4";
# Tests launch the builtin webserver.
__darwinAllowLocalNetworking = true;
}
@ -568,9 +503,9 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "simplexml";
buildInputs = [ libxml2 pcre2 ];
configureFlags = [ "--enable-simplexml" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--enable-simplexml"
];
}
{
name = "snmp";
@ -583,9 +518,9 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "soap";
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-soap" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--enable-soap"
];
doCheck = false;
}
{
@ -603,20 +538,12 @@ lib.makeScope pkgs.newScope (self: with self; {
patches = lib.optional (lib.versionAtLeast php.version "8.1")
../development/interpreters/php/fix-tokenizer-php81.patch;
}
{
name = "wddx";
buildInputs = [ libxml2 ];
internalDeps = [ php.extensions.session ];
configureFlags = [ "--enable-wddx" "--with-libxml-dir=${libxml2.dev}" ];
# Removed in php 7.4.
enable = lib.versionOlder php.version "7.4";
}
{
name = "xml";
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-xml" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--enable-xml"
];
doCheck = false;
}
{
@ -625,25 +552,25 @@ lib.makeScope pkgs.newScope (self: with self; {
internalDeps = [ php.extensions.dom ];
NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ];
doCheck = false;
configureFlags = [ "--enable-xmlreader" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--enable-xmlreader"
];
}
{
name = "xmlrpc";
buildInputs = [ libxml2 libiconv ];
# xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc
enable = lib.versionOlder php.version "8.0";
configureFlags = [ "--with-xmlrpc" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--with-xmlrpc"
];
}
{
name = "xmlwriter";
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-xmlwriter" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
configureFlags = [
"--enable-xmlwriter"
];
}
{
name = "xsl";
@ -655,20 +582,17 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "zip";
buildInputs = [ libzip pcre2 ];
configureFlags = [ "--with-zip" ]
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]
++ lib.optionals (lib.versionOlder php.version "7.3") [ "--with-libzip" ];
configureFlags = [
"--with-zip"
];
doCheck = false;
}
{
name = "zlib";
buildInputs = [ zlib ];
patches = lib.optionals (lib.versionOlder php.version "7.4") [
# Derived from https://github.com/php/php-src/commit/f16b012116d6c015632741a3caada5b30ef8a699
../development/interpreters/php/zlib-darwin-tests.patch
configureFlags = [
"--with-zlib"
];
configureFlags = [ "--with-zlib" ]
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ];
}
];