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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-04-29 12:01:20 +00:00 committed by GitHub
commit 9701323277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 236 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -286,7 +286,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.openssh.ciphers` to `services.openssh.settings.Ciphers`
- `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts`
- `netbox` was updated to 3.4. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's [breaking changes](https://github.com/netbox-community/netbox/releases/tag/v3.4.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
- `netbox` was updated to 3.5. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's breaking changes [for 3.4.0](https://github.com/netbox-community/netbox/releases/tag/v3.4.0) and [for 3.5.0](https://github.com/netbox-community/netbox/releases/tag/v3.5.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
- `services.netbox` now support RFC42-style options, through `services.netbox.settings`.

4
pkgs/applications/misc/flowtime/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "flowtime";
version = "3.0";
version = "3.1";
src = fetchFromGitHub {
owner = "Diego-Ivan";
repo = "Flowtime";
rev = "v${version}";
hash = "sha256-op643yU7KdkTO9hT0iYTIqBP4oPe0MT1R5I3FAtN0/I=";
hash = "sha256-aXGdHFj9P8+33VuR8YBi+YYN/vBn94drmtKzNDc4SAY=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/jetbrains-toolbox/default.nix
View File

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "1.27.3.14493";
version = "1.28.0.15158";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY=";
sha256 = "sha256-IHs3tQtFXGS9xa5lKwSEWvp8aNffrCjNcoVE4tGX9ak=";
stripRoot = false;
};

6
pkgs/applications/networking/cluster/kn/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kn";
version = "1.7.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "knative-v${version}";
sha256 = "sha256-rcjAdujiK6urn14eG27Lnq/6g+O0n2KmrL7k8A5ONjg=";
sha256 = "sha256-LkjE3GMHoD+PmB4J09xf71nBrY1KPvh13l2O3QN9EH0=";
};
vendorSha256 = null;
vendorHash = null;
subPackages = [ "cmd/kn" ];

4
pkgs/applications/networking/cluster/rke/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rke";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-2qqEpH3Lkd7Ok+KBcRpRWiaUp0kN6j0YGURsX/qe3No=";
hash = "sha256-ldN0Fqh0V6JziTy5ml/i/un4/1o8MSeIAvrH5EyOeiw=";
};
vendorHash = "sha256-wuEsG2VKU4F/phSqpzUN3wChD93V4AE7poVLJu6kpF0=";

4
pkgs/applications/science/biology/bedtools/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bedtools";
version = "2.30.0";
version = "2.31.0";
src = fetchFromGitHub {
owner = "arq5x";
repo = "bedtools2";
rev = "v${version}";
sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ=";
sha256 = "sha256-LBD3z0+zGbQJ67oyPRFPgbiMY9EP17vSk1EKz3DrkEc=";
};
strictDeps = true;

6
pkgs/applications/version-management/forgejo/default.nix
View File

@ -39,17 +39,17 @@ let
in
buildGoModule rec {
pname = "forgejo";
version = "1.19.1-0";
version = "1.19.2-0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "forgejo";
repo = "forgejo";
rev = "v${version}";
hash = "sha256-0FmqLxQvr3bbgdzKFeAhRMvJp/xdRPW40WLH6eKNY9s=";
hash = "sha256-JRCEHaqRzJNRTu5OS43UmCg+vW8G/1Xwweuo5vuFO+s=";
};
vendorHash = "sha256-g8QJSewQFfyE/34A2JxrVnwk5vmiIRSbwrVE9LqYJrM=";
vendorHash = "sha256-bnLcHmwOh/fw6ecgsndX2BmVf11hJWllE+f2J8YSzec=";
subPackages = [ "." ];

6
pkgs/applications/version-management/gitoxide/default.nix
View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.22.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
sha256 = "sha256-PetU/cUWFZWl1OoSObI7wwqJLexWPTP6ynNSyPXjvMc=";
sha256 = "sha256-HmynsnlTj08vwYwckFdq+0u1nquC7bDOGcq2vCeqdhA=";
};
cargoHash = "sha256-A7gwC9EQ+5GVciGsL9uPbZ6nThPfku3ZNH8qQwfI0QQ=";
cargoHash = "sha256-5JvDqp3dZ9rcOS17YzwgNwJYQGQ021cpd0ClrR+1+5Y=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl ] ++ (if stdenv.isDarwin

4
pkgs/applications/video/jellyfin-media-player/default.nix
View File

@ -28,13 +28,13 @@
mkDerivation rec {
pname = "jellyfin-media-player";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-media-player";
rev = "v${version}";
sha256 = "sha256-PfzBxvGroHgjEz4OchnECSfcb1Ds8xbE28yxneaiPuo=";
sha256 = "sha256-97/9UYXOsg8v7QoRqo5rh0UGhjjS85K9OvUwtlG249c=";
};
patches = [

4
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libopenshot-audio";
version = "0.3.0";
version = "0.3.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
sha256 = "sha256-b3BZ275oJTxWfBWtdZetUQw0t7QznL0Q0lP7cKy/avg=";
sha256 = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw=";
};
patches = [

4
pkgs/development/embedded/nmrpflash/default.nix
View File

@ -9,13 +9,13 @@
}:
stdenv.mkDerivation rec {
pname = "nmrpflash";
version = "0.9.19";
version = "0.9.20";
src = fetchFromGitHub {
owner = "jclehner";
repo = "nmrpflash";
rev = "v${version}";
sha256 = "sha256-bXxJiIbMk8JG0nbWOgINUAb8zaGBN3XUdA3JZev4Igs=";
sha256 = "sha256-xfKZXaKzSTnCOC8qt6Zc/eidc1bnrKZOJPw/wwMoCaM=";
};
nativeBuildInputs = [ pkg-config ];

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

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "fb303";
version = "2023.02.20.00";
version = "2023.04.24.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "fb303";
rev = "v${version}";
sha256 = "sha256-cGJz7ArifkB6c5ukU9hoTqngZDTLZfSpdQ2Vx1gWntw=";
sha256 = "sha256-dhqHv+A4uak1FxKNqIsYlQl2WiP5+Y9I83pumpFbJDA=";
};
nativeBuildInputs = [ cmake ];

8
pkgs/development/libraries/febio/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3
, mklSupport ? true, mkl
, substituteAll
}:
stdenv.mkDerivation rec {
@ -14,13 +15,18 @@ stdenv.mkDerivation rec {
};
patches = [
./fix-cmake.patch # cannot find mkl libraries without this
(substituteAll {
src = ./fix-cmake.patch; # cannot find mkl libraries without this
so = stdenv.hostPlatform.extensions.sharedLibrary;
})
];
cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On"
++ lib.optional mklSupport "-DMKLROOT=${mkl}"
;
env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring";
installPhase = ''
runHook preInstall

4
pkgs/development/libraries/febio/fix-cmake.patch
View File

@ -5,7 +5,7 @@
PATHS ${${libDir}} NO_DEFAULT_PATH)
else()
- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a
+ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so
+ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@
PATHS ${${libDir}} NO_DEFAULT_PATH)
endif()
@ -19,7 +19,7 @@ index 2d644005f..7261ba923 100644
find_library(MKL_OMP_LIB
- NAMES iomp5 iomp5md libiomp5md.lib
- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
+ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib
+ NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib
+ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
PATH_SUFFIXES "intel64" "intel32"
NO_DEFAULT_PATH

15
pkgs/development/libraries/httplib/default.nix
View File

@ -1,9 +1,11 @@
{ lib
, stdenvNoCC
, stdenv
, fetchFromGitHub
, cmake
, openssl
}:
stdenvNoCC.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "httplib";
version = "0.12.2";
@ -14,13 +16,8 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-mpHw9fzGpYz04rgnfG/qTNrXIf6q+vFfIsjb56kJsLg=";
};
# Header-only library.
dontBuild = true;
installPhase = ''
mkdir -p "$out/include"
cp -r httplib.h "$out/include"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl ];
meta = with lib; {
description = "A C++ header-only HTTP/HTTPS server and client library";

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

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libmtp";
version = "1.1.20";
version = "1.1.21";
src = fetchFromGitHub {
owner = "libmtp";
repo = "libmtp";
rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}";
sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA=";
sha256 = "sha256-m9QFVD8udQ3SdGwn276BnIKqGeATA5QuokOK29Ykc1k=";
};
patches = [

85
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -4,7 +4,7 @@
, stdenvNoCC
, fetchurl
, rpmextract
, undmg
, _7zz
, darwin
, validatePkgConfig
, enableStatic ? stdenv.hostPlatform.isStatic
@ -19,49 +19,47 @@ let
# https://registrationcenter.intel.com/en/products/
version = "${mklVersion}.${rel}";
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
# https://github.com/matthewbauer/undmg/issues/4
mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2023.0.0";
rel = if stdenvNoCC.isDarwin then "199" else "25398";
mklVersion = "2023.1.0";
rel = if stdenvNoCC.isDarwin then "43558" else "46342";
# Intel openmp uses its own versioning.
openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "2023.0.0";
openmpRel = "25370";
openmpVersion = "2023.1.0";
openmpRel = "46305";
# Thread Building Blocks release.
tbbVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.8.0";
tbbRel = "25334";
tbbVersion = "2021.9.0";
tbbRel = "43484";
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
oneapi-mkl = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
hash = "sha256-fiL5TDmQHB+OQb1ERcoDQFpUutpsPe+AqIbMoa85nEk=";
hash = "sha256-BeI5zB0rrE6C21dezNc7/WSKmTWpjsZbpg0/y0Y87VQ=";
};
oneapi-mkl-common = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
hash = "sha256-AFayUxybi48SgR2mX6mxkNECconIXm1/TWelvE4aqX0=";
hash = "sha256-NjIqTeFppwjXFlPYHPHfZa/bWBiHJru3atC4fIMXN0w=";
};
oneapi-mkl-common-devel = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
hash = "sha256-riyIO2xWuvTSzfXgB+K6NSKqWLRmxKSnGZaH5nYTYPk=";
hash = "sha256-GX19dlvBWRgwSOCmWcEOrnbmp4S2j0448fWpx+iPVWw=";
};
oneapi-mkl-devel = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
hash = "sha256-2IK0t47FaPNp7Oq9LJ5ZdLmlFFjQluWrh+nhvi8MCd8=";
hash = "sha256-F4XxtSPAjNaShEL/l44jJK+JdOOkYI19X/njRB6FkNw=";
};
oneapi-openmp = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm";
hash = "sha256-grzVFWqt3Vpwb5K3Bur+sJz8pdKxZ4ISJXF5YAPrwmk=";
hash = "sha256-1SlkI01DxFvwGPBJ73phs86ka0SmCrniwiXQ9DJwIXw=";
};
oneapi-tbb = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm";
hash = "sha256-8hIoRfV36XVElKCqP9UmCkjLCs3l0ZKCHxg+yxNIHc0=";
hash = "sha256-wIktdf1p1SS1KrnUlc8LPkm0r9dhZE6cQNr4ZKTWI6A=";
};
in stdenvNoCC.mkDerivation ({
@ -70,16 +68,22 @@ in stdenvNoCC.mkDerivation ({
dontUnpack = stdenvNoCC.isLinux;
unpackPhase = if stdenvNoCC.isDarwin then ''
7zz x $src
'' else null;
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
then
[ undmg darwin.cctools ]
[ _7zz darwin.cctools ]
else
[ rpmextract ]);
buildPhase = if stdenvNoCC.isDarwin then ''
for f in Contents/Resources/pkg/*.tgz; do
tar xzvf $f
for f in bootstrapper.app/Contents/Resources/packages/*/cupPayload.cup; do
tar -xf $f
done
mkdir -p opt/intel
mv _installdir opt/intel/oneapi
'' else ''
rpmextract ${oneapi-mkl}
rpmextract ${oneapi-mkl-common}
@ -89,32 +93,7 @@ in stdenvNoCC.mkDerivation ({
rpmextract ${oneapi-tbb}
'';
installPhase = if stdenvNoCC.isDarwin then ''
for f in $(find . -name 'mkl*.pc') ; do
bn=$(basename $f)
substituteInPlace $f \
--replace "prefix=<INSTALLDIR>/mkl" "prefix=$out" \
--replace $\{MKLROOT} "$out" \
--replace "lib/intel64_lin" "lib" \
--replace "lib/intel64" "lib"
done
for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
substituteInPlace $f \
--replace "../compiler/lib" "lib"
done
mkdir -p $out/lib
cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/
mkdir -p $out/lib/pkgconfig
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
'' else ''
installPhase = ''
for f in $(find . -name 'mkl*.pc') ; do
bn=$(basename $f)
substituteInPlace $f \
@ -133,9 +112,9 @@ in stdenvNoCC.mkDerivation ({
# Dynamic libraries
mkdir -p $out/lib
cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
cp -a opt/intel/oneapi/compiler/${mklVersion}/linux/compiler/lib/intel64_lin/*.so* $out/lib
cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/intel64/gcc4.8/*.so* $out/lib
cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib
cp -a opt/intel/oneapi/compiler/${mklVersion}/${if stdenvNoCC.isDarwin then "mac" else "linux"}/compiler/lib/${lib.optionalString stdenvNoCC.isLinux "intel64_lin"}/*${shlibExt}* $out/lib
cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64/gcc4.8"}/*${shlibExt}* $out/lib
# Headers
cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
@ -144,10 +123,10 @@ in stdenvNoCC.mkDerivation ({
cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib
'' +
(if enableStatic then ''
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*.a
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/tools/pkgconfig/*.pc
'' else ''
cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
cp opt/intel/oneapi/mkl/${mklVersion}/lib/${lib.optionalString stdenvNoCC.isLinux "intel64"}/*${shlibExt}* $out/lib
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc
'') + ''
# Setup symlinks for blas / lapack
@ -170,8 +149,8 @@ in stdenvNoCC.mkDerivation ({
install_name_tool -id $out/lib/$(basename $f) $f || true
done
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib
install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib
install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib
install_name_tool -change @rpath/libtbb.12.dylib $out/lib/libtbb.12.dylib $out/lib/libmkl_tbb_thread.dylib
install_name_tool -change @rpath/libtbbmalloc.2.dylib $out/lib/libtbbmalloc.2.dylib $out/lib/libtbbmalloc_proxy.dylib
'';
# Per license agreement, do not modify the binary
@ -201,7 +180,7 @@ in stdenvNoCC.mkDerivation ({
};
} // lib.optionalAttrs stdenvNoCC.isDarwin {
src = fetchurl {
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/087a9190-9d96-4b8c-bd2f-79159572ed89/m_onemkl_p_${mklVersion}.${rel}_offline.dmg";
hash = "sha256-bUaaJPSaLr60fw0DzDCjPvY/UucHlLbCSLyQxyiAi04=";
};
})

4
pkgs/development/php-packages/psysh/default.nix
View File

@ -2,14 +2,14 @@
let
pname = "psysh";
version = "0.11.10";
version = "0.11.16";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
sha256 = "sha256-2U9HMA3OAA9Nl9JVJjepB2vi0O483xGpr8nQUGhOrpI=";
sha256 = "sha256-4FEjMtp7MRTjpdb1ZpKqCa0erxrW90JyGy1ZmMBVdZE=";
};
dontUnpack = true;

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

@ -10,6 +10,12 @@ buildPythonPackage rec {
sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
};
# setuptools.extern.packaging.version.InvalidVersion: Invalid version: '1.7.7-SNAPSHOT'
postPatch = ''
substituteInPlace setup.py \
--replace "1.7.7-SNAPSHOT" "1.7.7"
'';
doCheck = false; # No such file or directory: './run_tests.py
meta = with lib; {

31
pkgs/development/python-modules/ds-store/default.nix
View File

@ -3,24 +3,39 @@
, fetchFromGitHub
, mac_alias
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "ds_store";
version = "1.3.0";
pname = "ds-store";
version = "1.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "al45tair";
repo = pname;
rev = "v${version}";
sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0";
repo = "ds_store";
rev = "refs/tags/v${version}";
hash = "sha256-45lmkE61uXVCBUMyVVzowTJoALY1m9JI68s7Yb0vCks=";
};
propagatedBuildInputs = [ mac_alias ];
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [ pytestCheckHook ];
propagatedBuildInputs = [
mac_alias
];
pythonImportsCheck = [ "ds_store" ];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"ds_store"
];
meta = with lib; {
homepage = "https://github.com/al45tair/ds_store";

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dtschema";
version = "2022.12";
version = "2023.04";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "devicetree-org";
repo = "dt-schema";
rev = "refs/tags/v${version}";
sha256 = "sha256-+wF6WdonZrkZEnlq/P6QeT3X7CMinxbapLa7q0t2zUc=";
sha256 = "sha256-w9TsRdiDTdExft7rdb2hYcvxP6hxOFZKI3hITiNSwgw=";
};
patches = [

1
pkgs/development/python-modules/pyscf/default.nix
View File

@ -83,6 +83,7 @@ buildPythonPackage rec {
-e test_finite_diff_uks_eph \
-e test_pipek \
-e test_n3_cis_ewald \
-e test_veff \
-I test_kuccsd_supercell_vs_kpts\.py \
-I test_kccsd_ghf\.py \
-I test_h_.*\.py \

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

@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "skl2onnx";
version = "1.13";
version = "1.14.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-XzUva5uFX/rGMFpwfwLH1Db0Nok47pBJCSqVo1ZcJz0=";
hash = "sha256-gF+XOgAILSlM+hU1s3Xz+zD7nPtwW9a0mOHp8rxthnY=";
};
propagatedBuildInputs = [

47
pkgs/development/python-modules/sonos-websocket/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "sonos-websocket";
version = "0.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jjlawren";
repo = "sonos-websocket";
rev = "refs/tags/${version}";
hash = "sha256-Pb+L+823Clka0IjVMVEx4A0tJsI1IUhrFbx5Jy+xkgg=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"sonos_websocket"
];
meta = with lib; {
description = "Library to communicate with Sonos devices over websockets";
homepage = "https://github.com/jjlawren/sonos-websocket";
changelog = "https://github.com/jjlawren/sonos-websocket/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -34,13 +34,13 @@
buildPythonPackage rec {
pname = "spsdk";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "NXPmicro";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-UBiylZB6/0n1FQMMg0coXkYh9S6gLz2LaoKk2HoWu7c=";
hash = "sha256-KJUtAWENS3+VAs3Iai1aKYzMYtfetMeI0MHeQ6NraNY=";
};
nativeBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.58.0";
version = "0.58.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-yUf5X124jtUip5hGbZrdbSQzO8WJp9BJ96/QtdMBFvM=";
hash = "sha256-phwGnAosPuH9zj3lS8o78bQohGAllICpbn1cNgRmh0Y=";
};
nativeBuildInputs = [

4
pkgs/development/tools/misc/cvise/default.nix
View File

@ -16,14 +16,14 @@
buildPythonApplication rec {
pname = "cvise";
version = "2.7.0";
version = "2.8.0";
format = "other";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "refs/tags/v${version}";
sha256 = "sha256-j4s1xH0vO+/NNafQf1Jei7fgebSQ53WJKA+kYxuG2zQ=";
hash = "sha256-9HFCFgpRXqefFJLulwvi6nx0fl0G6IXI9gSinekJXRU=";
};
patches = [

6
pkgs/development/tools/misc/grcov/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "grcov";
version = "0.8.13";
version = "0.8.18";
src = fetchFromGitHub {
owner = "mozilla";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fyITsOlkBY1f9AjQqUII7G1Onm0i0FIqNspPi8J+eOM=";
sha256 = "sha256-IC5ROi4kwZLCX7/kFb7VgOzQtsj74hujQ5IrrFneFTA=";
};
cargoSha256 = "sha256-qbxJJGwJ7hRNIujud10AYnM2NaNwjBB5zhOxXp/5z/k=";
cargoHash = "sha256-DcPidu3WFyVWBS4EVavxFhy9wwqP4rGmaALKnfxua2E=";
# tests do not find grcov path correctly
checkFlags = let

6
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "14.27.0";
version = "15.4.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-aOUhKETwrPJWPvxkuLdpmSbD38RxMeQywmKq6j617Dk=";
hash = "sha256-xrSMR16KvS97/pfQPwOfETvVvTxqZMdNR7xG9QxuelA=";
};
vendorHash = "sha256-MM6WwEs2BMkfpTsDFIqwpIROMs8zbbT5OsP6FXwRvy8=";
vendorHash = "sha256-4exLY24baDjgGIDS1P7BIK38O4b+KeqNTMzA6wap05k=";
sourceRoot = "source/src";

4
pkgs/games/unciv/default.nix
View File

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "4.6.5";
version = "4.6.7";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-+PXRNVLGCJmxIZSwuuRA4f1v0AxxPYesxby/wEOWR8Q=";
hash = "sha256-aaCGo/vogi5HV0hM0Lz4Gw/IRbLp5U7eqAhfL7ztDos=";
};
dontUnpack = true;

4
pkgs/games/wesnoth/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.16.8";
version = "1.16.9";
src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
hash = "sha256-P7OUiKJxJZ0rGdesnxpQMbRBgCHsLpyt8+pRDh27JYQ=";
hash = "sha256-KtAPc2nsqSoHNsLTLom/yaUECn+IWBdBFpiMclrUHxM=";
};
nativeBuildInputs = [ cmake pkg-config ];

25
pkgs/os-specific/solo5/0001-Fix-test.patch
View File

@ -1,25 +0,0 @@
From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001
From: Lana Black <lana@illuminati.industries>
Date: Sat, 11 Feb 2023 11:53:21 +0000
Subject: [PATCH] Fix test.
---
tests/tests.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tests.bats b/tests/tests.bats
index c542b7a..98520ee 100644
--- a/tests/tests.bats
+++ b/tests/tests.bats
@@ -196,7 +196,7 @@ xen_expect_abort() {
run test_hello/test_hello.hvt
case "${CONFIG_HOST}" in
Linux)
- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]]
+ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]])
;;
FreeBSD)
# XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not
--
2.39.0

6
pkgs/os-specific/solo5/default.nix
View File

@ -2,7 +2,7 @@
, pkg-config, qemu, syslinux, util-linux }:
let
version = "0.7.5";
version = "0.8.0";
# list of all theoretically available targets
targets = [
"genode"
@ -21,11 +21,9 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw=";
sha256 = "sha256-t80VOZ8Tr1Dq+mJfRPVLGqYprCaqegcQtDqdoHaSXW0=";
};
patches = [ ./0001-Fix-test.patch ];
hardeningEnable = [ "pie" ];
configurePhase = ''

4
pkgs/servers/frr/default.nix
View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "frr";
version = "8.5";
version = "8.5.1";
src = fetchFromGitHub {
owner = "FRRouting";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-v3mmTkNQQLUmnkgcEV/hYLtc4FbhDFz/SW67w7C/zZA=";
hash = "sha256-dK6eVYj9OIVChnR90FDTB7ow93nLLNRaOG8YEXxh8UQ=";
};
nativeBuildInputs = [

4
pkgs/servers/sql/postgresql/ext/pg_cron.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_cron";
version = "1.5.1";
version = "1.5.2";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = pname;
rev = "v${version}";
hash = "sha256-EBmydzzT0GB1TaGpnxwj1Cq1vvnDlZ+wqJ5Dc3KDT38=";
hash = "sha256-+quVWbKJy6wXpL/zwTk5FF7sYwHA7I97WhWmPO/HSZ4=";
};
installPhase = ''

4
pkgs/servers/web-apps/netbox/default.nix
View File

@ -23,8 +23,8 @@ in
};
netbox = callPackage generic {
version = "3.4.7";
hash = "sha256-pWHGyzLc0tqfehWbCMF1l96L1pewb5FXBUkw9EqPtP8=";
version = "3.5.0";
hash = "sha256-LsUitX/e+ec/9mRBw+cbGOG2Idl9ZQwf/vxIC3YS5LU=";
extraPatches = [
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
./config.patch

23
pkgs/servers/web-apps/netbox/generic.nix
View File

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3
, version
, hash
@ -13,6 +14,23 @@
py = python3 // {
pkgs = python3.pkgs.overrideScope (self: super: {
django = super.django_4;
drf-nested-routers = super.drf-nested-routers.overridePythonAttrs (_oldAttrs: {
patches = [
# all for django 4 compat
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff";
hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff";
hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff";
hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";
})
];
});
});
};
@ -35,6 +53,7 @@
propagatedBuildInputs = with py.pkgs; [
bleach
boto3
django_4
django-cors-headers
django-debug-toolbar
@ -49,8 +68,12 @@
django-taggit
django-timezone-field
djangorestframework
drf-spectacular
drf-spectacular-sidecar
drf-yasg
dulwich
swagger-spec-validator # from drf-yasg[validation]
feedparser
graphene-django
jinja2
markdown

20
pkgs/tools/filesystems/apfs-fuse/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }:
{ lib, stdenv, fetchFromGitHub, fuse, fuse3, bzip2, zlib, attr, cmake }:
stdenv.mkDerivation {
pname = "apfs-fuse-unstable";
@ -12,9 +12,23 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
buildInputs = [ fuse3 bzip2 zlib attr ];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace "/usr/local/lib/libosxfuse.dylib" "fuse"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [
(if stdenv.isDarwin then fuse else fuse3)
bzip2
zlib
] ++ lib.optional stdenv.isLinux attr;
cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FUSE3=OFF";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DUSE_FUSE2";
postFixup = ''
ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse
'';
@ -24,7 +38,7 @@ stdenv.mkDerivation {
description = "FUSE driver for APFS (Apple File System)";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ealasu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gcsfuse";
version = "0.42.3";
version = "0.42.4";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
hash = "sha256-011QEWEnQBskn7xvdP6mbWeBIyUy94sF2T44gobiICg=";
hash = "sha256-Yv2IY+ZSyZDcgEpMGYZxqxKc6twmMh/18HlTKdyUGbk=";
};
vendorHash = null;

4
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
View File

@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus-typing-booster";
version = "2.22.3";
version = "2.22.4";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
hash = "sha256-C5WF3yS2TLPnDT+gQljt2KHYB5TqkFkLvb4XZHFKz50=";
hash = "sha256-AOCFdjQ5xz/B5Nx0+QVv5GdJyQEo0eH3in5Yaak9Sww=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];

4
pkgs/tools/misc/calamares/default.nix
View File

@ -7,12 +7,12 @@
mkDerivation rec {
pname = "calamares";
version = "3.2.61";
version = "3.2.62";
# release including submodule
src = fetchurl {
url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-dZG5tgc4vbp7neK42lRiqyEAbbBqAG8N0hrFuDJxHdI=";
sha256 = "sha256-oPvOwqQ4aTdT/BdCIDVhGa1624orGcMXUYqhywJdbdA=";
};
patches = lib.optionals nixos-extensions [

4
pkgs/tools/misc/infracost/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "infracost";
version = "0.10.20";
version = "0.10.21";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-KHXboxaLHA5CErBLPpX5WudwBCBw6dCW2ZXi1WlTs84=";
sha256 = "sha256-9fb3Q0DzTE+cAtMTAn5F1IvaslaACdsPz9mVvxoNdjY=";
};
vendorHash = "sha256-6GGSFnCbg7HZZQvBVBbwKwy+ng/NNX5oOquuBFXpN/s=";

4
pkgs/tools/misc/yutto/default.nix
View File

@ -9,14 +9,14 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "yutto";
version = "2.0.0b21";
version = "2.0.0b24";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-x1ncWaNZ0MQ4hYCGnfwR4pU0Hp1IgiruxU8HMFL9dnk=";
hash = "sha256-ZnRDGgJu78KoSHvznYhBNEDJihUm9rUdlb5tXmcpuTc=";
};
nativeBuildInputs = [

4
pkgs/tools/networking/haproxy/default.nix
View File

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.7.6";
version = "2.7.7";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-Ez81fds/z8WtgUnvPXTLtdtrtKWrZyic4LCraGzet08=";
sha256 = "sha256-0PicsyRPx72Ttqbpqr/FZPIThoZyiLXdkxYJE+bMS4k=";
};
buildInputs = [ openssl zlib libxcrypt ]

2
pkgs/top-level/python-packages.nix
View File

@ -11085,6 +11085,8 @@ self: super: with self; {
sonarr = callPackage ../development/python-modules/sonarr { };
sonos-websocket = callPackage ../development/python-modules/sonos-websocket { };
sopel = callPackage ../development/python-modules/sopel { };
sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { };