nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 19:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-01 00:02:46 +00:00 committed by GitHub
commit fa2258cd02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 1353 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/gallery-dl/default.nix
View File

@ -2,13 +2,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "gallery-dl"; pname = "gallery-dl";
version = "1.25.2"; version = "1.25.3";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "gallery_dl"; pname = "gallery_dl";
sha256 = "sha256-T9PzvjOdcLaO7iTxBZxucQdiAPVpk1+9wDfcpShIBdM="; sha256 = "sha256-aosaA8F8TVBnY0Mz+TbRYQjVW5FUDiSiohl/7vqXwis=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/applications/misc/pdfstudio/common.nix
View File

@ -5,7 +5,6 @@
, version , version
, desktopName , desktopName
, longDescription , longDescription
, broken ? false
, buildFHSEnv , buildFHSEnv
, extraBuildInputs ? [ ] , extraBuildInputs ? [ ]
, jdk , jdk
@ -95,7 +94,6 @@ buildFHSEnv {
]; ];
license = licenses.unfree; license = licenses.unfree;
platforms = platforms.linux; platforms = platforms.linux;
inherit broken;
mainProgram = pname; mainProgram = pname;
maintainers = [ maintainers.pwoelfel ]; maintainers = [ maintainers.pwoelfel ];
}; };

14
pkgs/applications/misc/pdfstudio/default.nix
View File

@ -31,17 +31,15 @@ in
{ {
pdfstudioviewer = callPackage ./common.nix rec { pdfstudioviewer = callPackage ./common.nix rec {
inherit desktopName pname program year; inherit desktopName pname program year;
version = "${year}.2.2"; version = "${year}.2.4";
longDescription = '' longDescription = ''
PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
''; '';
src = fetchurl { src = fetchurl {
url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb";
sha256 = "sha256-cc8YjrMsYZqgmwp5+AA+HsqzjxzFcTT/ga31NQz/OWc="; sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg=";
}; };
jdk = jdk11; jdk = jdk17;
broken = true; # Bad hash, probably unstable
}; };
pdfstudio2021 = callPackage ./common.nix rec { pdfstudio2021 = callPackage ./common.nix rec {
@ -59,16 +57,14 @@ in
pdfstudio2022 = callPackage ./common.nix rec { pdfstudio2022 = callPackage ./common.nix rec {
inherit desktopName longDescription pname program year; inherit desktopName longDescription pname program year;
version = "${year}.2.2"; version = "${year}.2.4";
src = fetchurl { src = fetchurl {
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
sha256 = "sha256-CP2cCmvedQJ/xjZWQ4wj6UZRqCsU5qK3Ta83TUVJyts="; sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ=";
}; };
extraBuildInputs = [ extraBuildInputs = [
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
]; ];
jdk = jdk17; jdk = jdk17;
broken = true; # URL 404s, probably unstable
}; };
}.${pname} }.${pname}

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubergrunt"; pname = "kubergrunt";
version = "0.11.1"; version = "0.11.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = "kubergrunt"; repo = "kubergrunt";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pg0D3zTSJirH+NNtbun7VoAILR/C32VstkNGbwpfoNo="; sha256 = "sha256-HVIPKfoAfBZH8wA2GMabhTkYxDLvP15XoZuTVSy2i8M=";
}; };
vendorHash = "sha256-K/Cw7Sh/2OqTbWQPEsoQbj/ejyaXcLxFT8Rg5Ore5DE="; vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";
# Disable tests since it requires network access and relies on the # Disable tests since it requires network access and relies on the
# presence of certain AWS infrastructure # presence of certain AWS infrastructure

2
pkgs/applications/networking/lieer/default.nix
View File

@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec {
''; '';
homepage = "https://lieer.gaute.vetsj.com/"; homepage = "https://lieer.gaute.vetsj.com/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ flokli kaiha ]; maintainers = with maintainers; [ flokli ];
}; };
} }

4
pkgs/applications/radio/flwrap/default.nix
View File

@ -7,12 +7,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.3.5"; version = "1.3.6";
pname = "flwrap"; pname = "flwrap";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg"; sha256 = "sha256-g1V7bOcgVHpD+Ndn02Nj4I3rGItuQ2qLGlrZZshfGP8=";
}; };
buildInputs = [ buildInputs = [

6
pkgs/applications/science/logic/elan/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "elan"; pname = "elan";
version = "1.4.2"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leanprover"; owner = "leanprover";
repo = "elan"; repo = "elan";
rev = "v${version}"; rev = "v${version}";
sha256 = "1aq06d66y622n0bbd57dx8s0ajz6cdv1vzaz25wvi4i62sg4x21x"; sha256 = "sha256-KCRKVVNC2tJZWgqdQ8NPUzJHPexhF58cuO8Iyx81UJo=";
}; };
cargoSha256 = "sha256-RzeewQzsV5F5E0xwJF1MpzzQ8usyfQjzlDInOJqZdO8="; cargoHash = "sha256-nFaDWDmDskZ0TKFG5KZk/vLn6ZzU3+mPD6y1wFxhLXg=";
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];

31
pkgs/build-support/setup-hooks/patch-ppd-files/default.nix
View File

@ -4,22 +4,15 @@
, callPackage , callPackage
}: }:
let makeSetupHook {
patchPpdFilesHook = makeSetupHook name = "patch-ppd-files";
{ substitutions = {
name = "patch-ppd-files"; which = lib.getBin which;
substitutions.which = lib.attrsets.getBin which; awkscript = ./patch-ppd-lines.awk;
substitutions.awkscript = ./patch-ppd-lines.awk; };
} passthru.tests.test = callPackage ./test.nix {};
./patch-ppd-hook.sh; meta = {
in description = "setup hook to patch executable paths in ppd files";
maintainers = [ lib.maintainers.yarny ];
patchPpdFilesHook.overrideAttrs ( };
lib.trivial.flip } ./patch-ppd-hook.sh
lib.attrsets.recursiveUpdate
{
passthru.tests.test = callPackage ./test.nix {};
meta.description = "setup hook to patch executable paths in ppd files";
meta.maintainers = [ lib.maintainers.yarny ];
}
)

24
pkgs/desktops/mate/atril/default.nix
View File

@ -25,15 +25,13 @@
, mateUpdateScript , mateUpdateScript
}: }:
with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "atril"; pname = "atril";
version = "1.26.0"; version = "1.26.1";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pz44k3axhjhhwfrfvnwvxak1dmjkwqs63rhrbcaagyymrp7cpki"; sha256 = "pTphOsuXAaGK1nG/WQJU0c6Da6CuG+LAvYlI/fa0kaQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -54,18 +52,18 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
texlive.bin.core # for synctex, used by the pdf back-end texlive.bin.core # for synctex, used by the pdf back-end
] ]
++ optionals enableDjvu [ djvulibre ] ++ lib.optionals enableDjvu [ djvulibre ]
++ optionals enableEpub [ webkitgtk ] ++ lib.optionals enableEpub [ webkitgtk ]
++ optionals enablePostScript [ libspectre ] ++ lib.optionals enablePostScript [ libspectre ]
++ optionals enableXps [ libgxps ] ++ lib.optionals enableXps [ libgxps ]
; ;
configureFlags = [ ] configureFlags = [ ]
++ optionals (enableDjvu) [ "--enable-djvu" ] ++ lib.optionals (enableDjvu) [ "--enable-djvu" ]
++ optionals (enableEpub) [ "--enable-epub" ] ++ lib.optionals (enableEpub) [ "--enable-epub" ]
++ optionals (enablePostScript) [ "--enable-ps" ] ++ lib.optionals (enablePostScript) [ "--enable-ps" ]
++ optionals (enableXps) [ "--enable-xps" ] ++ lib.optionals (enableXps) [ "--enable-xps" ]
++ optionals (enableImages) [ "--enable-pixbuf" ]; ++ lib.optionals (enableImages) [ "--enable-pixbuf" ];
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

5
pkgs/development/compilers/cudatoolkit/redist/extension.nix
View File

@ -1,7 +1,7 @@
final: prev: let final: prev: let
inherit (final) callPackage; inherit (final) callPackage;
inherit (prev) cudaVersion lib pkgs; inherit (prev) cudaVersion lib;
### Cuda Toolkit Redist ### Cuda Toolkit Redist
@ -14,6 +14,7 @@ final: prev: let
"11.7" = ./manifests/redistrib_11.7.0.json; "11.7" = ./manifests/redistrib_11.7.0.json;
"11.8" = ./manifests/redistrib_11.8.0.json; "11.8" = ./manifests/redistrib_11.8.0.json;
"12.0" = ./manifests/redistrib_12.0.1.json; "12.0" = ./manifests/redistrib_12.0.1.json;
"12.1" = ./manifests/redistrib_12.1.1.json;
}; };
# Function to build a single cudatoolkit redist package # Function to build a single cudatoolkit redist package
@ -24,8 +25,6 @@ final: prev: let
attrs = lib.filterAttrs (key: value: key != "release_date") (lib.importJSON manifest); attrs = lib.filterAttrs (key: value: key != "release_date") (lib.importJSON manifest);
in lib.mapAttrs buildCudaToolkitRedistPackage attrs; in lib.mapAttrs buildCudaToolkitRedistPackage attrs;
redistExists = cudaToolkitRedistManifests ? "${cudaVersion}";
# All cudatoolkit redist packages for the current cuda version # All cudatoolkit redist packages for the current cuda version
cudaToolkitRedistPackages = if cudaToolkitRedistPackages = if
lib.hasAttr cudaVersion cudaToolkitRedistManifests lib.hasAttr cudaVersion cudaToolkitRedistManifests

1127
pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.1.1.json Normal file
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/compilers/cudatoolkit/versions.toml
View File

@ -77,3 +77,9 @@ version = "12.0.1"
url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run" url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run"
sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=" sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s="
gcc = "gcc12" gcc = "gcc12"
["12.1"]
version = "12.1.1"
url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run"
sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4="
gcc = "gcc12"

5
pkgs/development/libraries/lasso/default.nix
View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lasso"; pname = "lasso";
version = "2.8.1"; version = "2.8.2";
src = fetchurl { src = fetchurl {
url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
hash = "sha256-t9DJj2xmFPruspKhjy2DbAvDeNWaXXSB6BC7bGnsnd8="; hash = "sha256-ahgxv9v49CTHUIq6R7BF1RNB7A/ekSLziwuGsJbvUz4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://lasso.entrouvert.org/"; homepage = "https://lasso.entrouvert.org/";
description = "Liberty Alliance Single Sign-On library"; description = "Liberty Alliance Single Sign-On library";
changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${version}/ChangeLog";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ womfoo ]; maintainers = with maintainers; [ womfoo ];

28
pkgs/development/libraries/science/math/cudnn/extension.nix
View File

@ -43,21 +43,8 @@ final: prev: let
cudnnReleases = lists.reverseList (builtins.import ./releases.nix); cudnnReleases = lists.reverseList (builtins.import ./releases.nix);
# Check whether a CUDNN release supports our CUDA version # Check whether a CUDNN release supports our CUDA version
# supportedReleases :: NonEmptyList Release # supportedReleases :: List Release
supportedReleases = let supportedReleases = builtins.filter isSupported cudnnReleases;
filtered = builtins.filter isSupported cudnnReleases;
nonEmptyFiltered =
trivial.throwIf (filtered == [])
''
CUDNN does not support your cuda version ${cudaVersion}
''
filtered;
in
nonEmptyFiltered;
# The latest release is the first element of the list and will be our default choice
# latestReleaseName :: String
latestReleaseName = computeName (builtins.head supportedReleases).version;
# Function to transform our releases into build attributes # Function to transform our releases into build attributes
# toBuildAttrs :: Release -> { name: String, value: Derivation } # toBuildAttrs :: Release -> { name: String, value: Derivation }
@ -70,9 +57,14 @@ final: prev: let
# allBuilds :: AttrSet String Derivation # allBuilds :: AttrSet String Derivation
allBuilds = builtins.listToAttrs (builtins.map toBuildAttrs supportedReleases); allBuilds = builtins.listToAttrs (builtins.map toBuildAttrs supportedReleases);
# The latest release will be our default build defaultBuild = attrsets.optionalAttrs (supportedReleases != []) {
# defaultBuild :: AttrSet String Derivation cudnn = let
defaultBuild.cudnn = allBuilds.${latestReleaseName}; # The latest release is the first element of the list and will be our default choice
# latestReleaseName :: String
latestReleaseName = computeName (builtins.head supportedReleases).version;
in
allBuilds.${latestReleaseName};
};
# builds :: AttrSet String Derivation # builds :: AttrSet String Derivation
builds = allBuilds // defaultBuild; builds = allBuilds // defaultBuild;

1
pkgs/development/libraries/science/math/cudnn/releases.nix
View File

@ -1,3 +1,4 @@
# NOTE: Check https://docs.nvidia.com/deeplearning/cudnn/archives/index.html for support matrices.
[ [
{ {
version = "7.4.2.24"; version = "7.4.2.24";

17
pkgs/development/python-modules/agate/default.nix
View File

@ -14,21 +14,20 @@
, pytimeparse , pytimeparse
, pythonOlder , pythonOlder
, pytz , pytz
, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "agate"; pname = "agate";
version = "1.6.3"; version = "1.7.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wireservice"; owner = "wireservice";
repo = pname; repo = pname;
rev = version; rev = "refs/tags/${version}";
hash = "sha256-tuUoLvztCYHIPJTBgw1eByM0zfaHDyc+h7SWsxutKos="; hash = "sha256-7Ew9bgeheymCL8xXSW5li0LdFvGYb/7gPxmC4w6tHvM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -38,7 +37,6 @@ buildPythonPackage rec {
parsedatetime parsedatetime
python-slugify python-slugify
pytimeparse pytimeparse
six
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
@ -50,12 +48,6 @@ buildPythonPackage rec {
pytz pytz
]; ];
postPatch = ''
# No Python 2 support, thus constraint is not needed
substituteInPlace setup.py \
--replace "'parsedatetime>=2.1,!=2.5,!=2.6'," "'parsedatetime>=2.1',"
'';
checkPhase = '' checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests tests LC_ALL="en_US.UTF-8" nosetests tests
''; '';
@ -67,6 +59,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python data analysis library that is optimized for humans instead of machines"; description = "Python data analysis library that is optimized for humans instead of machines";
homepage = "https://github.com/wireservice/agate"; homepage = "https://github.com/wireservice/agate";
changelog = "https://github.com/wireservice/agate/blob/${version}/CHANGELOG.rst";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ vrthra ]; maintainers = with maintainers; [ vrthra ];
}; };

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dbutils"; pname = "dbutils";
version = "3.0.2"; version = "3.0.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "DBUtils"; pname = "DBUtils";
hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM="; hash = "sha256-jkhWWxKtK0sfIU3gKU3utLKFePWyq7QNaMKSS2TX4Ac=";
}; };
nativeCheckInputs = [ nativeCheckInputs = [

5
pkgs/development/python-modules/deepl/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "deepl"; pname = "deepl";
version = "1.13.0"; version = "1.14.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Rq7L/rgfJJ3ZspuL1IfZv+x60t8cZRPkrVryJf12WLk="; hash = "sha256-jUHxyx+b1OICJHAs8lh5NVtl+MExyEYM/yfs2qz6fv4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "A language translation API that allows other computer programs to send texts and documents to DeepL's servers and receive high-quality translations"; description = "A language translation API that allows other computer programs to send texts and documents to DeepL's servers and receive high-quality translations";
homepage = "https://github.com/DeepLcom/deepl-python"; homepage = "https://github.com/DeepLcom/deepl-python";
changelog = "https://github.com/DeepLcom/deepl-python/blob/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ MaskedBelgian ]; maintainers = with maintainers; [ MaskedBelgian ];
}; };

9
pkgs/development/python-modules/elastic-apm/default.nix
View File

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, aiohttp , aiohttp
, blinker , blinker
, buildPythonPackage , buildPythonPackage
@ -29,7 +30,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elastic-apm"; pname = "elastic-apm";
version = "6.15.0"; version = "6.15.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -38,7 +39,7 @@ buildPythonPackage rec {
owner = "elastic"; owner = "elastic";
repo = "apm-agent-python"; repo = "apm-agent-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Uoybe6Mx7ZLs2GaOnl278Xj6KlTEgrOuNxMRmPpSq8k="; hash = "sha256-s07LZeT2vTtBU/48heGFrW74D1iqkxRaLh+LTD35mu8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -77,6 +78,9 @@ buildPythonPackage rec {
disabledTestPaths = [ disabledTestPaths = [
# Exclude tornado tests # Exclude tornado tests
"tests/contrib/asyncio/tornado/tornado_tests.py" "tests/contrib/asyncio/tornado/tornado_tests.py"
] ++ lib.optionals stdenv.isDarwin [
# Flaky tests on Darwin
"tests/utils/threading_tests.py"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [
@ -89,5 +93,6 @@ buildPythonPackage rec {
changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}"; changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}";
license = with licenses; [ bsd3 ]; license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
mainProgram = "elasticapm-run";
}; };
} }

5
pkgs/development/python-modules/elementpath/default.nix
View File

@ -6,7 +6,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elementpath"; pname = "elementpath";
version = "4.0.1"; version = "4.1.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "sissaschool"; owner = "sissaschool";
repo = "elementpath"; repo = "elementpath";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw="; hash = "sha256-tu0WH/RwLVjGRX7vFlx7yLhmsE4Svg+qoWIoMbJSZjo=";
}; };
# avoid circular dependency with xmlschema which directly depends on this # avoid circular dependency with xmlschema which directly depends on this
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
homepage = "https://github.com/sissaschool/elementpath"; homepage = "https://github.com/sissaschool/elementpath";
changelog = "https://github.com/sissaschool/elementpath/blob/v${version}/CHANGELOG.rst";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
}; };

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

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fe25519"; pname = "fe25519";
version = "1.4.0"; version = "1.4.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-KWHYlHWNG/ATZP8WJ7e2M8ubQbQoT2ritWqSrl+92h0="; hash = "sha256-VwCw/sS8Pzhscoa6yCRGbB9X+CtRVn8xyBEpKfGyhhY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ge25519"; pname = "ge25519";
version = "1.4.0"; version = "1.4.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-QDVhvOyTRwOgB9rCpLTpM4floLKa43hAxS2L0h4+HTU="; hash = "sha256-oOvrfRSpvwfCcmpV7FOxcBOW8Ex89d2+otjORrzX4o0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphene-django"; pname = "graphene-django";
version = "3.0.0"; version = "3.0.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "graphql-python"; owner = "graphql-python";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-wSZm0hRukBmvrmU3bsqFuZSQRXBwwye9J4ojuSz1uzE="; hash = "sha256-bW5P2casSFqM1uR9ERr5fLVvAO7bsbP+oqJ9vqcJp2U=";
}; };
postPatch = '' postPatch = ''
@ -71,7 +71,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Integrate GraphQL into your Django project"; description = "Integrate GraphQL into your Django project";
homepage = "https://github.com/graphql-python/graphene-django"; homepage = "https://github.com/graphql-python/graphene-django";
changelog = "https://github.com/graphql-python/graphene-django/releases/tag/v{version}"; changelog = "https://github.com/graphql-python/graphene-django/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ hexa ]; maintainers = with maintainers; [ hexa ];
}; };

42
pkgs/development/python-modules/keba-kecontact/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, asyncio-dgram
, buildPythonPackage
, fetchFromGitHub
, netifaces
, pythonOlder
}:
buildPythonPackage rec {
pname = "keba-kecontact";
version = "3.0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dannerph";
repo = "keba-kecontact";
rev = "refs/tags/${version}";
hash = "sha256-gR1ut2IjrU/JMy8/ZFv0jQTB6c3A/tZqtXMpQsapuj0=";
};
propagatedBuildInputs = [
asyncio-dgram
netifaces
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"keba_kecontact"
];
meta = with lib; {
description = "Python library for controlling KEBA charging stations";
homepage = "https://github.com/dannerph/keba-kecontact";
changelog = "https://github.com/dannerph/keba-kecontact/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

44
pkgs/development/python-modules/lakeside/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, protobuf
, pycryptodome
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "lakeside";
version = "0.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nkgilley";
repo = "python-lakeside";
rev = "refs/tags/${version}";
hash = "sha256-Y5g78trkwOF3jsbgTv0uVkvfB1HZN+w1T6xIorxGAhg=";
};
propagatedBuildInputs = [
protobuf
pycryptodome
requests
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"lakeside"
];
meta = with lib; {
description = "Library for controlling LED bulbs from Eufy";
homepage = "https://github.com/nkgilley/python-lakeside";
changelog = "https://github.com/nkgilley/python-lakeside/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

14
pkgs/development/python-modules/ld2410-ble/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ld2410-ble"; pname = "ld2410-ble";
version = "0.1.1"; version = "0.2.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -20,9 +20,14 @@ buildPythonPackage rec {
owner = "930913"; owner = "930913";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-D8Z3OXlXWsaN0Ck9gx//J9TCaQmirYDbaXK7aTpI7ns="; hash = "sha256-wQnE2hNT0UOnPJbHq1eayIO8g0XRZvEH6V19DL6RqoA=";
}; };
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" ""
'';
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];
@ -37,11 +42,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [ pythonImportsCheck = [
"ld2410_ble" "ld2410_ble"
]; ];

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pynina"; pname = "pynina";
version = "0.2.0"; version = "0.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "PyNINA"; pname = "PyNINA";
inherit version; inherit version;
hash = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY="; hash = "sha256-5+Mg3dPjMxEL2pgEeuR1TwiicIMHN6RO6G0SgbZm/eM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

8
pkgs/development/python-modules/rdkit/default.nix
View File

@ -21,8 +21,8 @@ let
avalon = fetchFromGitHub { avalon = fetchFromGitHub {
owner = "rohdebe1"; owner = "rohdebe1";
repo = "ava-formake"; repo = "ava-formake";
rev = "AvalonToolkit_2.0.2"; rev = "AvalonToolkit_2.0.4a";
hash = "sha256-YI39OknHiSyArNGqRKrSVzEJnFc1xJ0W3UcTZrTKeME="; hash = "sha256-ZyhrDBBv9XuXe1NY/Djiad86tGIJwCSTrxEMICHgSqk=";
}; };
yaehmop = fetchFromGitHub { yaehmop = fetchFromGitHub {
owner = "greglandrum"; owner = "greglandrum";
@ -40,7 +40,7 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "rdkit"; pname = "rdkit";
version = "2022.09.5"; version = "2023.03.1";
format = "other"; format = "other";
src = src =
@ -51,7 +51,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "Release_${versionTag}"; rev = "Release_${versionTag}";
hash = "sha256-zsiH4gNCAeXDLjHhDsKwZMkTvVCWG9LwAaEKNOuqV2Q="; hash = "sha256-hiDaPWDAWzALRf3+SAfzghu2K706rcajeZ69tMFplhU=";
}; };
unpackPhase = '' unpackPhase = ''

4
pkgs/development/python-modules/tplink-omada-client/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tplink-omada-client"; pname = "tplink-omada-client";
version = "1.2.4"; version = "1.2.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "tplink_omada_client"; pname = "tplink_omada_client";
inherit version; inherit version;
hash = "sha256-4kvFlk+4GWFRFVIAirg0wKk5se8g+kvmxQ54RiluuoU="; hash = "sha256-I9lD99IxEq97ANJx0Aeh7YXdPU6izEjWgjJHCaiAWRI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/tools/database/clickhouse-backup/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "clickhouse-backup"; pname = "clickhouse-backup";
version = "2.2.0"; version = "2.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AlexAkulov"; owner = "AlexAkulov";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rIsDoODY8+fi6MXPnco6gB8vAmamtGtz5tE+0Wjjqes="; sha256 = "sha256-sy5R2QSVkxFmfRMiD5KDzkFCol7MpOnfz0/JR++zIX4=";
}; };
vendorHash = "sha256-fdo4mZKDuAxuKi9z34rCiZXawG8q1fjI4FzeJgp3iFs="; vendorHash = "sha256-UY/8fWPoO3d0g1/CN215Q4z744S2cCT7fB4ctpridAI=";
ldflags = [ ldflags = [
"-X main.version=${version}" "-X main.version=${version}"

4
pkgs/development/tools/ddosify/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ddosify"; pname = "ddosify";
version = "0.16.6"; version = "0.16.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YPy/CP0Pt/D6Vu2pDaJcCrJTEorMvTgGx/+9U7RrG88="; sha256 = "sha256-AWYUJalXggNJonYE71c9uH+ebAms1LJTLcYgHzmUzR0=";
}; };
vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg="; vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg=";

14
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View File

@ -99,9 +99,17 @@ in rec {
"" ""
) (builtins.attrNames pkgConfig)); ) (builtins.attrNames pkgConfig));
workspaceJSON = pkgs.writeText # build-time JSON generation to avoid IFD
"${name}-workspace-package.json" # see https://nixos.wiki/wiki/Import_From_Derivation
(builtins.toJSON { private = true; workspaces = ["deps/**"]; resolutions = packageResolutions; }); # scoped packages need second splat workspaceJSON = pkgs.runCommand "${name}-workspace-package.json"
{
nativeBuildInputs = [ pkgs.jq ];
inherit packageJSON;
passAsFile = [ "baseJSON" ];
baseJSON = builtins.toJSON { private = true; workspaces = [ "deps/**" ]; resolutions = packageResolutions; };
} ''
jq --slurpfile packageJSON "$packageJSON" '.resolutions = $packageJSON[0].resolutions + .resolutions' <"$baseJSONPath" >$out
'';
workspaceDependencyLinks = lib.concatMapStringsSep "\n" workspaceDependencyLinks = lib.concatMapStringsSep "\n"
(dep: '' (dep: ''

6
pkgs/misc/tmux-plugins/default.nix
View File

@ -92,12 +92,12 @@ in rec {
catppuccin = mkTmuxPlugin { catppuccin = mkTmuxPlugin {
pluginName = "catppuccin"; pluginName = "catppuccin";
version = "unstable-2022-12-14"; version = "unstable-2023-04-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "tmux"; repo = "tmux";
rev = "e2561decc2a4e77a0f8b7c05caf8d4f2af9714b3"; rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
sha256 = "sha256-6UmFGkUDoIe8k+FrzdzsKrDHHMNfkjAk0yyc+HV199M="; sha256 = "sha256-bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
}; };
postInstall = '' postInstall = ''
sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux

10
pkgs/servers/home-assistant/component-packages.nix
View File

@ -1008,7 +1008,8 @@
"etherscan" = ps: with ps; [ "etherscan" = ps: with ps; [
]; # missing inputs: python-etherscan-api ]; # missing inputs: python-etherscan-api
"eufy" = ps: with ps; [ "eufy" = ps: with ps; [
]; # missing inputs: lakeside lakeside
];
"eufylife_ble" = ps: with ps; [ "eufylife_ble" = ps: with ps; [
aioesphomeapi aioesphomeapi
aiohttp-cors aiohttp-cors
@ -1821,7 +1822,8 @@
"kankun" = ps: with ps; [ "kankun" = ps: with ps; [
]; ];
"keba" = ps: with ps; [ "keba" = ps: with ps; [
]; # missing inputs: keba-kecontact keba-kecontact
];
"keenetic_ndms2" = ps: with ps; [ "keenetic_ndms2" = ps: with ps; [
ndms2-client ndms2-client
]; ];
@ -1961,11 +1963,12 @@
esphome-dashboard-api esphome-dashboard-api
fnvhash fnvhash
ifaddr ifaddr
ld2410-ble
pyserial pyserial
pyudev pyudev
sqlalchemy sqlalchemy
zeroconf zeroconf
]; # missing inputs: ld2410-ble ];
"led_ble" = ps: with ps; [ "led_ble" = ps: with ps; [
aioesphomeapi aioesphomeapi
aiohttp-cors aiohttp-cors
@ -4680,6 +4683,7 @@
"launch_library" "launch_library"
"laundrify" "laundrify"
"lcn" "lcn"
"ld2410_ble"
"led_ble" "led_ble"
"lg_soundbar" "lg_soundbar"
"lidarr" "lidarr"

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtprotoproxy"; pname = "mtprotoproxy";
version = "1.1.0"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexbers"; owner = "alexbers";
repo = "mtprotoproxy"; repo = "mtprotoproxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "15svvramxzl8q8xzs8g62gg8czdn46fjy6jhs5hqf5p83ycxsygz"; sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs=";
}; };
nativeBuildInputs = [ wrapPython ]; nativeBuildInputs = [ wrapPython ];

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "steampipe"; pname = "steampipe";
version = "0.19.4"; version = "0.19.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "turbot"; owner = "turbot";
repo = "steampipe"; repo = "steampipe";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-VfSCm+p702HgFgiKRjcRHiBOd6Dx9ld8T27U9jmuC+8="; sha256 = "sha256-eF6LlQTSCscReTHUZzFI/gR1E/pNs52m68gnJmKnfGk=";
}; };
vendorHash = "sha256-XrEdaNLG46BwMEF/vhAk9+A6vH4mpbtH7vWXd01Y7ME="; vendorHash = "sha256-XrEdaNLG46BwMEF/vhAk9+A6vH4mpbtH7vWXd01Y7ME=";

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

@ -6561,6 +6561,7 @@ with pkgs;
cudaPackages_11 = cudaPackages_11_7; cudaPackages_11 = cudaPackages_11_7;
cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; }; cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; };
cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; };
cudaPackages_12 = cudaPackages_12_0; cudaPackages_12 = cudaPackages_12_0;
# TODO: try upgrading once there is a cuDNN release supporting CUDA 12. No # TODO: try upgrading once there is a cuDNN release supporting CUDA 12. No

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

@ -5281,6 +5281,8 @@ self: super: with self; {
kconfiglib = callPackage ../development/python-modules/kconfiglib { }; kconfiglib = callPackage ../development/python-modules/kconfiglib { };
keba-kecontact = callPackage ../development/python-modules/keba-kecontact { };
keep = callPackage ../development/python-modules/keep { }; keep = callPackage ../development/python-modules/keep { };
keepalive = callPackage ../development/python-modules/keepalive { }; keepalive = callPackage ../development/python-modules/keepalive { };
@ -5374,6 +5376,8 @@ self: super: with self; {
labmath = callPackage ../development/python-modules/labmath { }; labmath = callPackage ../development/python-modules/labmath { };
lakeside = callPackage ../development/python-modules/lakeside { };
langcodes = callPackage ../development/python-modules/langcodes { }; langcodes = callPackage ../development/python-modules/langcodes { };
langdetect = callPackage ../development/python-modules/langdetect { }; langdetect = callPackage ../development/python-modules/langdetect { };
@ -5422,6 +5426,8 @@ self: super: with self; {
lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { };
ld2410-ble = callPackage ../development/python-modules/ld2410-ble { };
ldap3 = callPackage ../development/python-modules/ldap3 { }; ldap3 = callPackage ../development/python-modules/ldap3 { };
ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { };