swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-07-15 18:02:01 +00:00 committed by GitHub
parent 192e3d44ac 9f53d5cc15
commit 8eb75b850f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 894 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -3733,6 +3733,12 @@
githubId = 1897147;
name = "Elijah Caine";
};
Elinvention = {
email = "elia@elinvention.ovh";
github = "Elinvention";
githubId = 5737945;
name = "Elia Argentieri";
};
elitak = {
email = "elitak@gmail.com";
github = "elitak";

2
nixos/modules/services/display-managers/greetd.nix
View file

@ -54,7 +54,7 @@ in
config = mkIf cfg.enable {
services.greetd.settings.terminal.vt = mkDefault cfg.vt;
services.greetd.settings.default_session = mkDefault "greeter";
services.greetd.settings.default_session.user = mkDefault "greeter";
security.pam.services.greetd = {
allowNullPassword = true;

2
nixos/modules/services/monitoring/netdata.nix
View file

@ -201,7 +201,7 @@ in {
serviceConfig = {
ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
ExecPostStart = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
TimeoutStopSec = 60;
Restart = "on-failure";

4
pkgs/applications/audio/sonixd/default.nix
View file

@ -5,11 +5,11 @@
appimageTools.wrapType2 rec {
pname = "sonixd";
version = "0.15.1";
version = "0.15.3";
src = fetchurl {
url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage";
sha256 = "sha256-23WU1nwvrzyw0J+Pplm3JbsScjJxu+RhmwVoe/PjozY=";
sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw=";
};
extraInstallCommands = ''

2
pkgs/applications/editors/android-studio/common.nix
View file

@ -196,7 +196,7 @@ in runCommand
{
startScript = ''
#!${bash}/bin/bash
${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@"
'';
preferLocalBuild = true;
allowSubstitutes = false;

48
pkgs/applications/editors/mle/default.nix
View file

@ -1,26 +1,53 @@
{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3, makeWrapper, installShellFiles }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pcre
, uthash
, lua5_4
, makeWrapper
, installShellFiles
}:
stdenv.mkDerivation rec {
pname = "mle";
version = "1.4.3";
version = "1.5.0";
src = fetchFromGitHub {
owner = "adsr";
repo = "mle";
rev = "v${version}";
sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1";
sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0";
};
# Fix location of Lua 5.3 header and library
# Bug fixes found after v1.5.0 release
patches = [
(fetchpatch {
name = "skip_locale_dep_test.patch";
url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch";
sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw=";
})
(fetchpatch {
name = "fix_input_trail.patch";
url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch";
sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ=";
})
];
# Fix location of Lua 5.4 header and library
postPatch = ''
substituteInPlace Makefile --replace "-llua5.3" "-llua";
substituteInPlace mle.h --replace "<lua5.3/" "<";
substituteInPlace Makefile --replace "-llua5.4" "-llua";
substituteInPlace mle.h --replace "<lua5.4/" "<";
patchShebangs tests/*
'';
# Use select(2) instead of poll(2) (poll is returning POLLINVAL on macOS)
# Enable compiler optimization
CFLAGS = "-DTB_OPT_SELECT -O2";
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = [ termbox pcre uthash lua5_3 ];
buildInputs = [ pcre uthash lua5_4 ];
doCheck = true;
@ -30,13 +57,8 @@ stdenv.mkDerivation rec {
installManPage mle.1
'';
postFixup = lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/mle --prefix DYLD_LIBRARY_PATH : ${termbox}/lib
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Small, flexible terminal-based text editor";
description = "Small, flexible, terminal-based text editor";
homepage = "https://github.com/adsr/mle";
license = licenses.asl20;
platforms = platforms.unix;

6
pkgs/applications/graphics/hydrus/default.nix
View file

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "488d";
version = "491";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs=";
sha256 = "sha256-ceKawn2jyfZPP4HzhkB1jIQoStCPRO/Ni/+Ys1R2FJQ=";
};
nativeBuildInputs = [
@ -42,7 +42,7 @@ python3Packages.buildPythonPackage rec {
pyopenssl
pyside2
pysocks
pythonPackages.mpv
python3Packages.mpv
pyyaml
qtpy
requests

16
pkgs/applications/misc/solaar/default.nix
View file

@ -10,18 +10,21 @@
}:
# Although we copy in the udev rules here, you probably just want to use
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
# `logitech-udev-rules`, which is an alias to `udev` output of this derivation,
# instead of adding this to `services.udev.packages` on NixOS,
python3Packages.buildPythonApplication rec {
pname = "solaar";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "pwr-Solaar";
repo = "Solaar";
rev = version;
hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s=";
hash = "sha256-nDfVF7g0M54DRpkH1rnZB8o+nCV4A6b1uKMOMRQ3GbI=";
};
outputs = [ "out" "udev" ];
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
buildInputs = [ libappindicator librsvg ];
@ -41,12 +44,9 @@ python3Packages.buildPythonApplication rec {
postInstall = ''
ln -s $out/bin/solaar $out/bin/solaar-cli
install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules
install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
'';
# No tests
doCheck = false;
meta = with lib; {
description = "Linux devices manager for the Logitech Unifying Receiver";
longDescription = ''
@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
'';
homepage = "https://pwr-solaar.github.io/Solaar/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ spinus ysndr ];
maintainers = with maintainers; [ spinus ysndr oxalica ];
platforms = platforms.linux;
};
}

4
pkgs/applications/misc/themechanger/default.nix
View file

@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "themechanger";
version = "0.11.0";
version = "0.11.1";
format = "other";
src = fetchFromGitHub {
owner = "ALEX11BR";
repo = "ThemeChanger";
rev = "v${version}";
sha256 = "sha256-umRkGPeNDZOmx6pjWLU9rRdHX6QFuHY/dsuQ8oI2YLI=";
sha256 = "sha256-zSbh+mqCKquOyQASwVUW6hghmUc37nTuoa8pWCHM/a8=";
};
nativeBuildInputs = [

8
pkgs/applications/networking/cluster/helm/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubernetes-helm";
version = "3.9.0";
gitCommit = "7ceeda6c585217a19a1131663d8cd1f7d641b2a7";
version = "3.9.1";
gitCommit = "a7c043acb5ff905c261cfdc923a35776ba5e66e4";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-pdWFCepVGSJmlYnvcJCaNaGSllbeh/oCdosrab8jA4s=";
sha256 = "sha256-bhd8SyxiJ/8XrZpVwqvHSRe5gvE2VVEwmvUbVPsSC/4=";
};
vendorSha256 = "sha256-r0a38ZB6VlyzKB66+OAllRLXhqwO0qbksZjOrBWdjqM=";
vendorSha256 = "sha256-v6jY90ht1S1tmO/Z9VGWDOz4zOSF0G77NSIqwAsktFo=";
subPackages = [ "cmd/helm" ];
ldflags = [

32
pkgs/applications/networking/cluster/kubectl-node-shell/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ stdenvNoCC, lib, fetchFromGitHub, bash }:
stdenvNoCC.mkDerivation rec {
pname = "kubectl-node-shell";
version = "1.6.0";
src = fetchFromGitHub {
owner = "kvaps";
repo = "kubectl-node-shell";
rev = "v${version}";
sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E=";
};
strictDeps = true;
buildInputs = [ bash ];
installPhase = ''
runHook preInstall
install -m755 ./kubectl-node_shell -D $out/bin/kubectl-node_shell
runHook postInstall
'';
meta = with lib; {
description = "Exec into node via kubectl";
homepage = "https://github.com/kvaps/kubectl-node-shell";
license = licenses.asl20;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

6
pkgs/applications/networking/cluster/nomad/1.2.nix
View file

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.2.8";
sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8";
vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5";
version = "1.2.9";
sha256 = "05pd4y5aq91ac73447aqr0pk56rx5qhqzzp5cw4w06yh5iry0bmn";
vendorSha256 = "08nqqd3dz8bzxnh729kckvg59wnvmixmsh8g74nlxk90gq07zsn4";
}

6
pkgs/applications/networking/cluster/nomad/1.3.nix
View file

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.3.1";
sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7";
vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh";
version = "1.3.2";
sha256 = "0vrcdm0xjimi5z1j180wigf4gd806w73jxvrzclv2d2pr7pab6qq";
vendorSha256 = "139bzvaw0nyl0whvs74m2hj2xww08zfd615wkn2y10c8f5h69arj";
}

7
pkgs/applications/networking/instant-messengers/discord/default.nix
View file

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.18";
ptb = "0.0.29";
canary = "0.0.135";
canary = "0.0.136";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@ -28,9 +28,8 @@ let
sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";
};
canary = fetchurl {
url =
"https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-dmG+3BWS1BMHHQAv4fsXuObVeAJBeD+TqnyQz69AMac=";
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-OrGg4jXziesHBhQORxREN/wq776RgNGaTyjJNV4pSAU=";
};
};
x86_64-darwin = {

11
pkgs/applications/science/electronics/vhd2vl/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, bison
, flex
, verilog
@ -18,8 +19,12 @@ stdenv.mkDerivation rec {
};
patches = lib.optionals (!stdenv.isAarch64) [
# fix build with verilog 11.0
./test.patch
# fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15
# for some strange reason, this is not needed for aarch64
(fetchpatch {
url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch";
sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf";
})
];
nativeBuildInputs = [
@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -D -m755 src/vhd2vl $out/bin/vdh2vl
install -D -m755 src/vhd2vl $out/bin/vhd2vl
runHook postInstall
'';

35
pkgs/applications/science/electronics/vhd2vl/test.patch
View file

@ -1,35 +0,0 @@
--- a/translated_examples/fifo.v 1970-01-01 00:00:01.000000000 +0000
+++ a/temp/verilog/fifo.v 2022-05-11 03:44:43.173604945 +0000
@@ -107,7 +107,7 @@
//--- Read address counter --------------
//---------------------------------------
assign add_RD_CE = (iempty == 1'b1) ? 1'b0 : (RD == 1'b0) ? 1'b0 : 1'b1;
- assign n_add_RD = (add_RD) + 4'h1;
+ assign n_add_RD = add_RD + 4'h1;
always @(posedge clk_RD, posedge rst) begin
if((rst == 1'b1)) begin
add_RD <= {5{1'b0}};
diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/test.v temp/verilog/test.v
--- a/translated_examples/test.v 1970-01-01 00:00:01.000000000 +0000
+++ a/temp/verilog/test.v 2022-05-11 03:44:43.189604945 +0000
@@ -125,7 +125,7 @@
endcase
end
- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
// Asynch process
always @(we, addr, config1, bip) begin
if(we == 1'b1) begin
diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/withselect.v temp/verilog/withselect.v
--- a/translated_examples/withselect.v 1970-01-01 00:00:01.000000000 +0000
+++ a/temp/verilog/withselect.v 2022-05-11 03:44:43.193604945 +0000
@@ -33,7 +33,7 @@
endcase
end
- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
assign foo = {(((1 + 1))-((0))+1){1'b0}};
assign egg = {78{1'b0}};
assign baz = {(((bus_width * 4))-((bus_width * 3 - 1))+1){1'b1}};

4
pkgs/applications/version-management/gitea/default.nix
View file

@ -14,12 +14,12 @@
buildGoPackage rec {
pname = "gitea";
version = "1.16.8";
version = "1.16.9";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-W/AbRfnEQfnTjXJ8wTKEFOTld4rFsBvJiXnYK8Ugoj0=";
sha256 = "sha256-LxPYUSyRSfDlGwCC2IFPEISP4wsRJsUbwi9F7sxbMOE=";
};
unpackPhase = ''

8
pkgs/applications/video/anime-downloader/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3, aria2, mpv, nodejs, fetchFromGitHub }:
{ lib, python3, aria2, mpv, nodejs, qt5, fetchFromGitHub }:
python3.pkgs.buildPythonApplication rec {
pname = "anime-downloader";
@ -11,6 +11,8 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
};
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = [
aria2
mpv
@ -31,6 +33,10 @@ python3.pkgs.buildPythonApplication rec {
tabulate
]);
preFixup = ''
wrapQtApp "$out/bin/anime" --prefix PATH : ${lib.makeBinPath propagatedBuildInputs}
'';
doCheck = false;
# FIXME: checks must be disabled because they are lacking the qt env.
# They fail like this, even if built and wrapped with all Qt and runtime dependencies.

1
pkgs/applications/video/obs-studio/plugins/default.nix
View file

@ -9,5 +9,6 @@
wlrobs = callPackage ./wlrobs.nix {};
looking-glass-obs = callPackage ./looking-glass-obs.nix {};
obs-nvfbc = callPackage ./obs-nvfbc.nix {};
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix {};
obs-vkcapture = callPackage ./obs-vkcapture.nix {};
}

32
pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, ninja
, obs-studio
, pipewire
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "obs-pipewire-audio-capture";
version = "1.0.4";
src = fetchFromGitHub {
owner = "dimtpap";
repo = pname;
rev = "${version}";
sha256 = "OX27NTUsceEC8kHqlM+oeGjPxguake6lwaXFYsoEqKU=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ obs-studio pipewire ];
meta = with lib; {
description = " Audio device and application capture for OBS Studio using PipeWire ";
homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture";
maintainers = with maintainers; [ Elinvention ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

4
pkgs/development/libraries/draco/default.nix
View file

@ -16,14 +16,14 @@ let
cmakeBool = b: if b then "ON" else "OFF";
in
stdenv.mkDerivation rec {
version = "1.5.2";
version = "1.5.3";
pname = "draco";
src = fetchFromGitHub {
owner = "google";
repo = "draco";
rev = version;
sha256 = "sha256-o6KQJFrnxx2kz6g3vXk1w435OmaJhAJjzsKM/gmVJ2M=";
sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ=";
fetchSubmodules = true;
};

28
pkgs/development/libraries/quictls/default.nix
View file

@ -7,17 +7,18 @@
# This will cause c_rehash to refer to perl via the environment, but otherwise
# will produce a perfectly functional openssl binary and library.
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
, removeReferencesTo
}:
stdenv.mkDerivation rec {
pname = "quictls";
version = "3.0.3+quick_unstable-2022-05.04";
version = "3.0.5+quick_unstable-2022-07.05";
src = fetchFromGitHub {
owner = "quictls";
repo = "openssl";
rev = "368c9d581b17f0bbe425f8dedeaa7b864a7b29ce";
sha256 = "sha256-W3bILxhyeziWQNZUHUg/D9eV8LnmHJqEFwyzWjJrRuc=";
rev = "75e940831d0570d6b020cfebf128ae500f424867";
sha256 = "sha256-1HBGKafcCbM0RZWLvyl3vpSfGBsAcGDgjz1Nm/qclWM=";
};
patches = [
@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
!(stdenv.hostPlatform.useLLVM or false) &&
stdenv.cc.isGNU;
nativeBuildInputs = [ perl ];
nativeBuildInputs = [ perl removeReferencesTo ];
buildInputs = lib.optional withCryptodev cryptodev
# perl is included to allow the interpreter path fixup hook to set the
# correct interpreter in c_rehash.
@ -68,6 +69,12 @@ stdenv.mkDerivation rec {
x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
riscv64-linux = "./Configure linux64-riscv64";
mips64el-linux =
if stdenv.hostPlatform.isMips64n64
then "./Configure linux64-mips64"
else if stdenv.hostPlatform.isMips64n32
then "./Configure linux-mips64"
else throw "unsupported ABI for ${stdenv.hostPlatform.system}";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"
@ -105,7 +112,11 @@ stdenv.mkDerivation rec {
# OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list of configuration options.
++ lib.optional static "no-shared";
++ lib.optional static "no-shared"
# This introduces a reference to the CTLOG_FILE which is undesired when
# trying to build binaries statically.
++ lib.optional static "no-ct"
;
makeFlags = [
"MANDIR=$(man)/share/man"
@ -118,13 +129,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = lib.optionalString (!static) ''
postInstall = (if static then ''
# OPENSSLDIR has a reference to self
${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a
'' else ''
# If we're building dynamic libraries, then don't install static
# libraries.
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
rm "$out/lib/"*.a
fi
'' + lib.optionalString (!stdenv.hostPlatform.isWindows)
'') + lib.optionalString (!stdenv.hostPlatform.isWindows)
# Fix bin/c_rehash's perl interpreter line
#
# - openssl 1_0_2: embeds a reference to buildPackages.perl

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.24.1";
version = "3.25.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-srM5VX0QXZMLmYmqKttcB8W8oMlGz64e6dQh04OQq8Q=";
hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24=";
};
nativeBuildInputs = [

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aioftp";
version = "0.21.2";
version = "0.21.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JWzeBdCPXLYMmKkvCqQQF/mHoRbdRvj0vKVF4+D8LSI=";
sha256 = "sha256-xtrlCzqgfwlbLZOoN9Y23ZPyNaqv5Ure+Cvg+OVWf9I=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asn1";
version = "2.5.0";
version = "2.6.0";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "andrivet";
repo = "python-asn1";
rev = "v${version}";
sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo=";
sha256 = "sha256-oz9xZhFU4himXttVtfW6tTn7lfB0c7MlgxtbKxdJtUA=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/awslambdaric/default.nix
View file

@ -49,6 +49,11 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
disabledTests = [
# Test fails with: Assertion error
"test_handle_event_request_fault_exception_logging_syntax_error"
];
pythonImportsCheck = [ "awslambdaric" "runtime_client" ];
meta = with lib; {

32
pkgs/development/python-modules/dicttoxml2/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "dicttoxml2";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8/Zbv8WxDP5Bn4hgd7hTstmYv7amTlTxhQoKvzYrG/I=";
};
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"dicttoxml2"
];
meta = with lib;{
description = "Converts a Python dictionary or other native data type into a valid XML string";
homepage = "https://pypi.org/project/dicttoxml2/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
};
}

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

@ -16,7 +16,7 @@ let
in
buildPythonPackage rec {
pname = "iso4217";
version = "1.9";
version = "1.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dahlia";
repo = pname;
rev = version;
hash = "sha256-7VrXAP/Qyzy2BDTmFwDlxHvF7HhndJsDMt/qHcsmhzs=";
hash = "sha256-zJYtEIrsuHKPwnSoRjyZC/0rgAZoNMZ0Oh8gQcIb20Q=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "msldap";
version = "0.3.38";
version = "0.3.40";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc=";
hash = "sha256-4sIqbjlrTX1l1zhj7URhISDo4lcP+JW1Qh3fajUAhbs=";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/pyialarm/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, dicttoxml
, dicttoxml2
, fetchFromGitHub
, pythonOlder
, xmltodict
@ -8,25 +8,27 @@
buildPythonPackage rec {
pname = "pyialarm";
version = "2.0.0";
version = "2.2.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "RyuzakiKK";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rJS6KgEy4iuiY6QRue6K6woyGefuTN7/4RLCu8cb8M4=";
hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU=";
};
propagatedBuildInputs = [
dicttoxml
dicttoxml2
xmltodict
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyialarm" ];
pythonImportsCheck = [
"pyialarm"
];
meta = with lib; {
description = "Python library to interface with Antifurto365 iAlarm systems";

9
pkgs/development/python-modules/pylint-django/default.nix
View file

@ -33,12 +33,11 @@ buildPythonPackage rec {
];
disabledTests = [
# Skip outdated tests and the one with a missing dependency (django_tables2)
# AttributeError, AssertionError
"external_django_tables2_noerror_meta_class"
"external_factory_boy_noerror"
"func_noerror_foreign_key_attributes"
"func_noerror_foreign_key_key_cls_unbound"
"test_everything"
"external_tastypie_noerror_foreign_key"
"func_noerror_model_unicode_lambda"
"0001_noerror_initial"
];
pythonImportsCheck = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "62.6.1";
version = "63.2.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-r/2WijpyGOHJbxgG60V/QCfqyAOzyq3cz5ik5XdrFyQ=";
sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ=";
};
# Module doesn't have tests

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "unifi-discovery";
version = "1.1.4";
version = "1.1.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-+af1boeJtTI89ZJqgXXsxXQXGDhG4ewgukfKDdhWl9g=";
hash = "sha256-WO1oLD09fokMR7lVCqs1Qeodjc+Yg431otl9rohtmPo=";
};
nativeBuildInputs = [

9
pkgs/development/python-modules/venstarcolortouch/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "venstarcolortouch";
version = "0.17";
version = "0.18";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HgUtGC2lXJ6BFhOnFK7DF4b/IooXIFPGcpJ4ru3kPNs=";
sha256 = "sha256-ucz0Ejpgiss8boF8dzt45FwpieNoJ6S3DUvtay6FDrw=";
};
propagatedBuildInputs = [
@ -19,7 +19,10 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "venstarcolortouch" ];
pythonImportsCheck = [
"venstarcolortouch"
];
meta = with lib; {
description = "Python interface for Venstar ColorTouch thermostats Resources";

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "weconnect-mqtt";
version = "0.37.2";
version = "0.38.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-mqtt";
rev = "refs/tags/v${version}";
hash = "sha256-CzdQ5aYaxOZ2rE5vMP53u66OvBBWhi6yXvzGbbCHEuc=";
hash = "sha256-ybSslUdOlD87Kl6dkNRO/pHLBmQB3ioT/3p4uHYssBI=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/weconnect/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "weconnect";
version = "0.44.2";
version = "0.45.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-python";
rev = "v${version}";
hash = "sha256-Sbo8KfcwmFjbQ0/MTMLO7HYVTksBI5kNjxQhHvgy/p4=";
hash = "sha256-iAKw05vMaGTQ/V1uwqbkO2AZOOtsMOfSnponnE5AdXE=";
};
propagatedBuildInputs = [
@ -43,7 +43,7 @@ buildPythonPackage rec {
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
substituteInPlace image_extra_requirements.txt \
--replace "pillow~=9.0.1" "pillow"
--replace "pillow~=9.2.0" "pillow"
substituteInPlace pytest.ini \
--replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""

2
pkgs/development/tools/gemstash/Gemfile Normal file
View file

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'gemstash'

64
pkgs/development/tools/gemstash/Gemfile.lock Normal file
View file

@ -0,0 +1,64 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.6.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
concurrent-ruby (1.1.9)
dalli (2.7.11)
faraday (0.17.5)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
gemstash (2.1.0)
activesupport (>= 4.2, < 6)
dalli (~> 2.7)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
lru_redux (~> 1.1)
puma (~> 4.0)
sequel (~> 5.0)
server_health_check-rack (~> 0.1)
sinatra (>= 1.4, < 3.0)
sqlite3 (~> 1.3)
thor (~> 0.20)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
lru_redux (1.1.0)
minitest (5.15.0)
multipart-post (2.1.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nio4r (2.5.8)
puma (4.3.11)
nio4r (~> 2.0)
rack (2.2.3)
rack-protection (2.2.0)
rack
ruby2_keywords (0.0.5)
sequel (5.54.0)
server_health_check (1.0.2)
server_health_check-rack (0.1.0)
server_health_check (~> 1.0, >= 1.0.1)
sinatra (2.2.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.2.0)
tilt (~> 2.0)
sqlite3 (1.4.2)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.9)
thread_safe (~> 0.1)
PLATFORMS
ruby
DEPENDENCIES
gemstash
BUNDLED WITH
2.1.4

16
pkgs/development/tools/gemstash/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ lib, bundlerApp, bundlerUpdateScript }:
bundlerApp rec {
pname = "gemstash";
gemdir = ./.;
exes = [ pname ];
passthru.updateScript = bundlerUpdateScript pname;
meta = with lib; {
description = "A cache for RubyGems.org and a private gem server";
homepage = "https://github.com/rubygems/gemstash";
license = licenses.mit;
maintainers = [ maintainers.viraptor ];
};
}

313
pkgs/development/tools/gemstash/gemset.nix Normal file
View file

@ -0,0 +1,313 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775";
type = "gem";
};
target_platform = "ruby";
version = "5.2.6.2";
};
concurrent-ruby = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
target_platform = "ruby";
version = "1.1.9";
};
dalli = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0br39scmr187w3ifl5gsddl2fhq6ahijgw6358plqjdzrizlg764";
type = "gem";
};
target_platform = "ruby";
version = "2.7.11";
};
faraday = {
dependencies = ["multipart-post"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bs2lm0wd273kwq8nk1p8pk43n1wrizv4c1bdywkpcm9g2f5sp6p";
type = "gem";
};
target_platform = "ruby";
version = "0.17.5";
};
faraday_middleware = {
dependencies = ["faraday"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc";
type = "gem";
};
target_platform = "ruby";
version = "0.14.0";
};
gemstash = {
dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "thor"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fimbc5xnsxq1g2zb7kn4qf3rp4klx7fxbigg34gr9i9apq8qfrc";
type = "gem";
};
target_platform = "ruby";
version = "2.1.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
target_platform = "ruby";
version = "1.10.0";
};
lru_redux = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf";
type = "gem";
};
target_platform = "ruby";
version = "1.1.0";
};
minitest = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
type = "gem";
};
target_platform = "ruby";
version = "5.15.0";
};
multipart-post = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
target_platform = "ruby";
version = "2.1.1";
};
mustermann = {
dependencies = ["ruby2_keywords"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
type = "gem";
};
target_platform = "ruby";
version = "1.1.1";
};
nio4r = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v";
type = "gem";
};
target_platform = "ruby";
version = "2.5.8";
};
puma = {
dependencies = ["nio4r"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm";
type = "gem";
};
target_platform = "ruby";
version = "4.3.11";
};
rack = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
type = "gem";
};
target_platform = "ruby";
version = "2.2.3";
};
rack-protection = {
dependencies = ["rack"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2";
type = "gem";
};
target_platform = "ruby";
version = "2.2.0";
};
ruby2_keywords = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
target_platform = "ruby";
version = "0.0.5";
};
sequel = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf";
type = "gem";
};
target_platform = "ruby";
version = "5.54.0";
};
server_health_check = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06chz92parchhj1457lf5lbj3hrmvqpq6mfskxcnj5f4qa14n5wd";
type = "gem";
};
target_platform = "ruby";
version = "1.0.2";
};
server_health_check-rack = {
dependencies = ["server_health_check"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cgqr94x18f60n27sk9lgg471c6vk6qy132z7i1ppp32kvmjfphs";
type = "gem";
};
target_platform = "ruby";
version = "0.1.0";
};
sinatra = {
dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y";
type = "gem";
};
target_platform = "ruby";
version = "2.2.0";
};
sqlite3 = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
type = "gem";
};
target_platform = "ruby";
version = "1.4.2";
};
thor = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
type = "gem";
};
target_platform = "ruby";
version = "0.20.3";
};
thread_safe = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
target_platform = "ruby";
version = "0.3.6";
};
tilt = {
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
target_platform = "ruby";
version = "2.0.10";
};
tzinfo = {
dependencies = ["thread_safe"];
gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
type = "gem";
};
target_platform = "ruby";
version = "1.2.9";
};
}

17
pkgs/development/tools/mysql-shell/default.nix
View file

@ -31,14 +31,12 @@
, CoreServices
, developer_cmds
, DarwinTools
, makeWrapper
}:
let
pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ];
site = ''
import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}])
'';
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps;
in
stdenv.mkDerivation rec{
pname = "mysql-shell";
@ -62,12 +60,9 @@ stdenv.mkDerivation rec{
substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
# For python dependencies
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 makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
buildInputs = [
boost
@ -121,6 +116,10 @@ stdenv.mkDerivation rec{
CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
postFixup = ''
wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}"
'';
meta = with lib; {
homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/";
description = "A new command line scriptable shell for MySQL";

8
pkgs/development/tools/rust/cargo-embed/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-embed";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "probe-rs";
repo = pname;
rev = "v${version}";
sha256 = "1is58n8y5lvnvzkbnh3gfk3r3f2r1w4l2qjdp2k8373apxzjxdvr";
sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0=";
};
cargoSha256 = "0kalwigck9lf734zdpzg01sf2zzyrgdgq2rg3qj7hy94gfxlsk63";
cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs=";
nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://probe.rs/";
changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ fooker ];
maintainers = with maintainers; [ fooker newam ];
};
}

8
pkgs/development/tools/rust/cargo-flash/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-flash";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "probe-rs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bd0TY8bdpLHLCdDQgJeJvqjAcSF67+LGSNx8yafYbys=";
sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30=";
};
cargoSha256 = "sha256-bx2N8zP7BmqU6oM/7Nf2i9S1uNWItReQMD59vtG1RKE=";
cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg=";
nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://probe.rs/";
changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ fooker ];
maintainers = with maintainers; [ fooker newam ];
};
}

34
pkgs/development/tools/rust/cargo-public-api/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchCrate
, pkg-config
, openssl
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.12.2";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-ZpzR6A9mV6ARz2+SedVtLjNANOEj8Ks09AWcQooltug=";
};
cargoSha256 = "sha256-8BZ1fPzRSJysyLCmoMxk+8xOfmfIs7viHFCeSfnxvt8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
# Tests fail
doCheck = false;
meta = with lib; {
description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations";
homepage = "https://github.com/Enselic/cargo-public-api";
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
};
}

6
pkgs/development/tools/rust/svd2rust/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "svd2rust";
version = "0.24.0";
version = "0.24.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ=";
sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k=";
};
cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE=";
cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

4
pkgs/games/ddnet/default.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.2.1";
version = "16.2.2";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
sha256 = "sha256-xDUvBsiQk7qZN9HEMCrCfxJSCZ/PruEdS5EjnHFufTA=";
sha256 = "sha256-MrCPMtWdEsWUuvKaPWZK4Mh6nhPcKpsxkFKkWugdz8A=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];

40
pkgs/games/openrct2/default.nix
View file

@ -1,29 +1,50 @@
{ lib, stdenv, fetchFromGitHub
, SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU
, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config
, speexdsp, zlib
, SDL2
, cmake
, curl
, discord-rpc
, duktape
, flac
, fontconfig
, freetype
, gbenchmark
, icu
, jansson
, libGLU
, libiconv
, libogg
, libpng
, libpthreadstubs
, libvorbis
, libzip
, nlohmann_json
, openssl
, pkg-config
, speexdsp
, zlib
}:
let
openrct2-version = "0.4.0";
openrct2-version = "0.4.1";
# Those versions MUST match the pinned versions within the CMakeLists.txt
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
objects-version = "1.2.7";
objects-version = "1.3.2";
title-sequences-version = "0.4.0";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${openrct2-version}";
sha256 = "sha256-4MDOLOPsKzk1vb1o/G90/NTyYJWBSrGRX6ZJETbBIaI=";
sha256 = "sha256-fMs0zrMzv9jXreZE4QyYIdvWUU/FUFVPuo4EzAF/2rU=";
};
objects-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "objects";
rev = "v${objects-version}";
sha256 = "sha256-R4+rEdGdvYwFrkm/S3+zXmU+UDam51dI/pWKmFXNrbE=";
sha256 = "sha256-BG0IRiNb2l6/3P7tvuUqMoYNh1zkOS0lCFDDh7m9Q7Y=";
};
title-sequences-src = fetchFromGitHub {
@ -47,15 +68,20 @@ stdenv.mkDerivation {
buildInputs = [
SDL2
curl
discord-rpc
duktape
flac
fontconfig
freetype
gbenchmark
icu
jansson
libGLU
libiconv
libogg
libpng
libpthreadstubs
libvorbis
libzip
nlohmann_json
openssl

6
pkgs/os-specific/linux/firmware/linux-firmware/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20220610";
version = "20220708";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
sha256 = "sha256-vsMkuTafr//ryivdBphTGZPoTsmTuvp+BFp3lKo3YYI=";
sha256 = "sha256-jsmbBxQ4RHBySBq2lks5tJ6YTwwlkvVe2Xc0CDJY8IE=";
};
installFlags = [ "DESTDIR=$(out)" ];
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-qJoaJacxb60ugdk5s1oZ9CLGjWKDnT5jWZEwHPnK50Y=";
outputHash = "sha256-FNYZMJnqR2waODUXisch3ObdEjwQN94QSiBE2dDW4sk=";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";

14
pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
View file

@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "xow_dongle-firmware";
version = "2017-07";
dontUnpack = true;
dontInstall = true;
dontConfigure = true;
dontBuild = true;
src = fetchurl {
url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab";
@ -14,10 +14,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cabextract ];
buildPhase = ''
sourceRoot = "./.";
unpackCmd = ''
cabextract -F FW_ACC_00U.bin ${src}
mkdir -p $out/lib/firmware
cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin
'';
installPhase = ''
install -Dm644 FW_ACC_00U.bin ${placeholder "out"}/lib/firmware/xow_dongle.bin
'';
meta = with lib; {

19
pkgs/os-specific/linux/logitech-udev-rules/default.nix
View file

@ -1,19 +0,0 @@
{ lib, stdenv, solaar }:
# ltunifi and solaar both provide udev rules but solaar's rules are more
# up-to-date so we simply use that instead of having to maintain our own rules
stdenv.mkDerivation {
pname = "logitech-udev-rules";
inherit (solaar) version;
buildCommand = ''
install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules
'';
meta = with lib; {
description = "udev rules for Logitech devices";
inherit (solaar.meta) homepage license platforms;
maintainers = with maintainers; [ peterhoeg ];
};
}

6
pkgs/os-specific/linux/rtl8192eu/default.nix
View file

@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
pname = "rtl8192eu";
version = "${kernel.version}-4.4.1.20220313";
version = "${kernel.version}-4.4.1.20220614";
src = fetchFromGitHub {
owner = "Mange";
repo = "rtl8192eu-linux-driver";
rev = "e0f967cea1d0037c730246c572f7fef000865ff7";
sha256 = "sha256-Wgp1MZ/z8AxbZPYsmR6t7Q4nsL0TFEqTEsrkkWPI6gI=";
rev = "6ba1f320963376f15ea216238c0b62ff3e71fa82";
sha256 = "sha256-c5swRxSjWT1tCcR7tfFKdAdVVmAEYgMZuOwUxGYYESI=";
};
hardeningDisable = [ "pic" ];

6
pkgs/os-specific/linux/vmware/default.nix
View file

@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mkubecek";
repo = "vmware-host-modules";
rev = "w${vmware-workstation.version}-k5.17";
sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0=";
rev = "w${vmware-workstation.version}-k5.18";
sha256 = "sha256-sAeCjaSrBXGP5szfCY5CpMrGwzCw4aM67EN+YfA3AWA=";
};
hardeningDisable = [ "pic" ];
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mkubecek/vmware-host-modules";
license = licenses.gpl2Only;
platforms = [ "x86_64-linux" ];
broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.18";
broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.19";
maintainers = with maintainers; [ deinferno ];
};
}

48
pkgs/servers/openafs/1.8/module.nix
View file

@ -38,14 +38,9 @@ stdenv.mkDerivation {
buildInputs = [ libkrb5 ];
patches = [
# Add autoconf-archive to src/external
(fetchBase64Patch {
url = "https://gerrit.openafs.org/changes/14942/revisions/006616bd8e88b2d386a5ddc23973cf3e625cb80d/patch";
hash = "sha256-55sc2sKy5XkQHAv6ysVxi69+0xVsHnN2TS144UTeLHU=";
})
# Import of code from autoconf-archive
(fetchBase64Patch {
url = "https://gerrit.openafs.org/changes/14943/revisions/d3782b1d4e6fd81c5432e95112eb44305f07f272/patch";
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=d8205bbb482554812fbe66afa3c337d991a247b6";
hash = "sha256-ohkjSux+S3+6slh6uZIw5UJXlvhy9UUDpDlP0YFRwmw=";
})
# Use autoconf-archive m4 from src/external
@ -53,6 +48,11 @@ stdenv.mkDerivation {
url = "https://gerrit.openafs.org/changes/14944/revisions/ea2a0e128d71802f61b8da2e44de3c6325c5f328/patch";
hash = "sha256-PAUk/MXL5p8xwhn40/UGmo3UIhvl1PB2FwgqhmqsjJ4=";
})
# cf: Use common macro to test compiler flags
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=790824ff749b6ee01c4d7101493cbe8773ef41c6";
hash = "sha256-Zc7AjCsH7eTmZJWCrx7ci1tBjEAgcFXS9lY1YBeboLA=";
})
# Linux-5.17: kernel func complete_and_exit renamed
(fetchBase64Patch {
url = "https://gerrit.openafs.org/changes/14945/revisions/a714e865efe41aa1112f6f9c8479112660dacd6f/patch";
@ -63,6 +63,36 @@ stdenv.mkDerivation {
url = "https://gerrit.openafs.org/changes/14946/revisions/449d1faf87e2841e80be38cf2b4a5cf5ff4df2d8/patch";
hash = "sha256-3bRTHYeMRIleLhob56m2Xt0dWzIMDo3QrytY0K1/q7c=";
})
# afs: Introduce afs_IsDCacheFresh
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=0d8ce846ab2e6c45166a61f04eb3af271cbd27db";
hash = "sha256-+xgRYVXz8XpT5c4Essc4VEn9Fj53vasAYhcFkK0oCBc=";
})
# LINUX: Don't panic on some file open errors
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=af73b9a3b1fc625694807287c0897391feaad52d";
hash = "sha256-k0d+Gav1LApU24SaMI0pmR3gGfWyicqdCpTpVJLcx7U=";
})
# Linux-5.18 replace set_page_dirty with dirty_folio
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=6aa129e743e882cf30c35afd67eabf82274c5fca";
hash = "sha256-8R0rdKYs7+Zl1sdizOZzpBjy6e9J+42R9HzsNUa/PQ4=";
})
# afs: introduce afs_alloc_ncr/afs_free_ncr
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=209eb92448001e59525413610356070d8e4f10a0";
hash = "sha256-t455gTaK5U+m0qcyKjTqnWTOb4qz6VN/JYZzRAAV8kM=";
})
# afs: introduce get_dcache_readahead
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=44e24ae5d7dc41e54d23638d5f64ab2e81e43ad0";
hash = "sha256-gtUNDSHAq+RY1Rm17YcxcUALy7FEBQf9k8/ELQlPORU=";
})
# Linux-5.18: replace readpages with readahead
(fetchBase64Patch {
url = "https://gerrit.openafs.org/changes/14953/revisions/0497b0cd7bffb6335ab9bcbf5a1310b8c6a4b299/patch";
hash = "sha256-a5pd+CHHPr1mGxsF7tSlaBqoiKw2IGr1mJ7EaDHDJSw=";
})
];
hardeningDisable = [ "pic" ];
@ -102,7 +132,7 @@ stdenv.mkDerivation {
homepage = "https://www.openafs.org";
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = with maintainers; [ maggesi spacefrogg ];
broken = kernel.isHardened || kernel.kernelAtLeast "5.18";
maintainers = with maintainers; [ andersk maggesi spacefrogg ];
broken = kernel.isHardened || kernel.kernelAtLeast "5.19";
};
}

4
pkgs/servers/web-apps/snipe-it/default.nix
View file

@ -18,13 +18,13 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.0.5";
version = "6.0.7";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb";
sha256 = "09jvkz7j2qb79mjnyrz75015xpgf8l483yha3ma14pzk4pibn620";
};
meta = with lib; {

25
pkgs/tools/bluetooth/bluetuith/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ buildGoModule, fetchFromGitHub, lib, stdenv }:
buildGoModule rec {
pname = "bluetuith";
version = "0.0.3";
src = fetchFromGitHub {
owner = "darkhz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7JqpF9iga6RO+/r2JK0N9gjieVRUNkHhGNsfVFfKfRY=";
};
vendorSha256 = "sha256-MsVrhEG2DOFJAXvt5rvfctGUbb3hQsBJ7cjOSzWA+bc=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "TUI-based bluetooth connection manager";
homepage = "https://github.com/darkhz/bluetuith";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ thehedgeh0g ];
};
}

12
pkgs/tools/misc/dt-shell-color-scripts/default.nix
View file

@ -1,22 +1,23 @@
{ stdenv
, lib
, fetchFromGitLab
, installShellFiles
, runtimeShell
, makeWrapper
}:
stdenv.mkDerivation {
pname = "dt-shell-color-scripts";
version = "unstable-2022-02-22";
version = "unstable-2022-07-25";
src = fetchFromGitLab {
owner = "dwt1";
repo = "shell-color-scripts";
rev = "fcd013ea2e1ff80e01adbcea9d0eaf9c73db94c0";
sha256 = "sha256-bd3NBf99rCiADUKQb6fzCBDaKBmYaZHcO4qokm/39do=";
rev = "da2e3c512b94f312ee54a38d5cde131b0511ad01";
sha256 = "sha256-cdTgBbtsbJHaJuLIcZh0g0jKOrQyFx3P6QhYNx8hz0U=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper installShellFiles ];
installPhase = ''
runHook preInstall
@ -25,6 +26,9 @@ stdenv.mkDerivation {
mkdir -p $out/bin
mkdir -p $out/opt/shell-color-scripts/
cp -r colorscripts $out/opt/shell-color-scripts/colorscripts
installManPage colorscript.1
installShellCompletion --fish completions/colorscript.fish
installShellCompletion --zsh completions/_colorscript
chmod +x colorscript.sh
cp colorscript.sh $out/bin/colorscript
substituteInPlace $out/bin/colorscript \

16
pkgs/tools/misc/unicode/default.nix
View file

@ -1,19 +1,19 @@
{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }:
{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles, gitUpdater }:
python3Packages.buildPythonApplication rec {
pname = "unicode";
version = "2.7";
version = "2.9";
src = fetchFromGitHub {
owner = "garabik";
repo = "unicode";
rev = "v${version}";
sha256 = "15d9yvarxsiy0whx1mxzsjnnkrjdm3ga4qv2yy398mk0jh763q9v";
sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY=";
};
ucdtxt = fetchurl {
url = "https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt";
sha256 = "1fz8fcd23lxyl97ay8h42zvkcgcg8l81b2dm05nklkddr2zzpgxx";
url = "https://www.unicode.org/Public/14.0.0/ucd/UnicodeData.txt";
sha256 = "sha256-NgGOaGV/3LNIX2NmMP/oyFMuAcl3cD0oA/W4nWxf6vs=";
};
nativeBuildInputs = [ installShellFiles ];
@ -27,6 +27,12 @@ python3Packages.buildPythonApplication rec {
installManPage paracode.1 unicode.1
'';
passthru.updateScript = gitUpdater {
inherit version;
pname = "unicode-paracode";
rev-prefix = "v";
};
meta = with lib; {
description = "Display unicode character properties";
homepage = "https://github.com/garabik/unicode";

41
pkgs/tools/security/pinentry-rofi/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ stdenv
, lib
, fetchFromGitHub
, pkg-config
, autoreconfHook
, autoconf-archive
, guile
, texinfo
, rofi
}:
stdenv.mkDerivation rec {
pname = "pinentry-rofi";
version = "2.0.3";
src = fetchFromGitHub {
owner = "plattfot";
repo = pname;
rev = version;
sha256 = "sha256-EzbeMAhdn9SuSmE+aMHeyuje3s74isIKRDTrFO3bX04=";
};
nativeBuildInputs = [
autoconf-archive
autoreconfHook
pkg-config
texinfo
];
buildInputs = [ guile ];
propagatedBuildInputs = [ rofi ];
meta = with lib; {
description = "Rofi frontend to pinentry";
homepage = "https://github.com/plattfot/pinentry-rofi";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ seqizz ];
};
}

16
pkgs/top-level/all-packages.nix
View file

@ -4701,6 +4701,8 @@ with pkgs;
blueman = callPackage ../tools/bluetooth/blueman { };
bluetuith = callPackage ../tools/bluetooth/bluetuith { };
bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
bogofilter = callPackage ../tools/misc/bogofilter { };
@ -6145,6 +6147,8 @@ with pkgs;
frr = callPackage ../servers/frr { };
gemstash = callPackage ../development/tools/gemstash { };
hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { };
libbsd = callPackage ../development/libraries/libbsd { };
@ -9620,6 +9624,8 @@ with pkgs;
pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
pinentry-rofi = callPackage ../tools/security/pinentry-rofi { };
pingtcp = callPackage ../tools/networking/pingtcp { };
pinnwand = callPackage ../servers/pinnwand { };
@ -14172,6 +14178,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
crate2nix = callPackage ../development/tools/rust/crate2nix { };
convco = callPackage ../development/tools/convco {
@ -18395,6 +18403,8 @@ with pkgs;
iso-flags = callPackage ../data/icons/iso-flags { };
isort = with python3Packages; toPythonApplication isort;
ispc = callPackage ../development/compilers/ispc {
inherit (llvmPackages) stdenv;
};
@ -24956,7 +24966,9 @@ with pkgs;
logiops = callPackage ../misc/drivers/logiops { };
logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules { };
# ltunifi and solaar both provide udev rules but solaar's rules are more
# up-to-date so we simply use that instead of having to maintain our own rules
logitech-udev-rules = solaar.udev;
# lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi
# lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia
@ -28122,6 +28134,8 @@ with pkgs;
kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { };
kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { };
kubelogin = callPackage ../applications/networking/cluster/kubelogin { };

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

@ -2280,6 +2280,8 @@ in {
dicttoxml = callPackage ../development/python-modules/dicttoxml { };
dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { };
diff-cover = callPackage ../development/python-modules/diff-cover { };
diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };