Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit 10e916e60e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 31
      nixos/modules/hardware/video/nvidia.nix
  2. 2
      pkgs/applications/graphics/gimp/default.nix
  3. 4
      pkgs/applications/misc/logseq/default.nix
  4. 4
      pkgs/applications/networking/instant-messengers/chatterino2/default.nix
  5. 36
      pkgs/applications/networking/instant-messengers/pond/default.nix
  6. 47
      pkgs/applications/networking/instant-messengers/pond/deps.nix
  7. 25
      pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
  8. 20
      pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix
  9. 2
      pkgs/applications/networking/remote/teamviewer/default.nix
  10. 4
      pkgs/applications/science/robotics/mavproxy/default.nix
  11. 17
      pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
  12. 20
      pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix
  13. 16
      pkgs/desktops/gnome/misc/geary/default.nix
  14. 6
      pkgs/development/python-modules/asyncstdlib/default.nix
  15. 4
      pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
  16. 21
      pkgs/development/python-modules/datadiff/default.nix
  17. 4
      pkgs/development/python-modules/eventlet/default.nix
  18. 4
      pkgs/development/python-modules/google-cloud-bigtable/default.nix
  19. 4
      pkgs/development/python-modules/google-cloud-secret-manager/default.nix
  20. 4
      pkgs/development/python-modules/hahomematic/default.nix
  21. 4
      pkgs/development/python-modules/marshmallow/default.nix
  22. 7
      pkgs/development/python-modules/selenium/default.nix
  23. 4
      pkgs/development/python-modules/types-requests/default.nix
  24. 1
      pkgs/development/python2-modules/pygtk/default.nix
  25. 4
      pkgs/development/tools/analysis/checkov/default.nix
  26. 14
      pkgs/development/tools/buf/default.nix
  27. 27
      pkgs/development/tools/corgi/default.nix
  28. 47
      pkgs/development/tools/corgi/deps.nix
  29. 17
      pkgs/development/tools/go-repo-root/default.nix
  30. 20
      pkgs/development/tools/go-repo-root/deps.nix
  31. 6
      pkgs/development/tools/pypi-mirror/default.nix
  32. 38
      pkgs/os-specific/linux/nvidia-x11/default.nix
  33. 12
      pkgs/servers/etcd/3.5.nix
  34. 12
      pkgs/tools/admin/pgadmin/default.nix
  35. 4
      pkgs/tools/cd-dvd/ventoy-bin/default.nix
  36. 9
      pkgs/tools/misc/entr/default.nix
  37. 4
      pkgs/tools/misc/exa/default.nix
  38. 23
      pkgs/tools/misc/gawp/default.nix
  39. 29
      pkgs/tools/misc/gawp/deps.nix
  40. 2
      pkgs/tools/misc/gparted/default.nix
  41. 24
      pkgs/tools/misc/i3cat/default.nix
  42. 11
      pkgs/tools/misc/i3cat/deps.nix
  43. 27
      pkgs/tools/misc/ical2org/default.nix
  44. 11
      pkgs/tools/misc/ical2org/deps.nix
  45. 32
      pkgs/tools/networking/curl-unix-socket/default.nix
  46. 24
      pkgs/tools/networking/goklp/default.nix
  47. 56
      pkgs/tools/networking/goklp/deps.nix
  48. 11
      pkgs/top-level/aliases.nix
  49. 24
      pkgs/top-level/all-packages.nix

@ -163,8 +163,19 @@ in
'';
};
hardware.nvidia.forceFullCompositionPipeline = lib.mkOption {
default = false;
type = types.bool;
description = ''
Whether to force-enable the full composition pipeline.
This sometimes fixes screen tearing issues.
This has been reported to reduce the performance of some OpenGL applications and may produce issues in WebGL.
It also drastically increases the time the driver needs to clock down after load.
'';
};
hardware.nvidia.package = lib.mkOption {
type = lib.types.package;
type = types.package;
default = config.boot.kernelPackages.nvidiaPackages.stable;
defaultText = literalExpression "config.boot.kernelPackages.nvidiaPackages.stable";
description = ''
@ -255,13 +266,18 @@ in
''
BusID "${pCfg.nvidiaBusId}"
${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
${optionalString cfg.powerManagement.finegrained "Option \"NVreg_DynamicPowerManagement=0x02\""}
'';
screenSection =
''
Option "RandRRotation" "on"
${optionalString syncCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
'';
'' + optionalString syncCfg.enable ''
Option "AllowEmptyInitialConfiguration"
'' + optionalString cfg.forceFullCompositionPipeline ''
Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
Option "AllowIndirectGLXProtocol" "off"
Option "TripleBuffer" "on"
''
;
};
services.xserver.serverLayoutSection = optionalString syncCfg.enable ''
@ -367,7 +383,8 @@ in
RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}"
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
'' + optionalString cfg.powerManagement.finegrained ''
'' + optionalString cfg.powerManagement.finegrained (
optionalString (versionOlder config.boot.kernelPackages.kernel.version "5.5") ''
# Remove NVIDIA USB xHCI Host Controller devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"
@ -376,7 +393,7 @@ in
# Remove NVIDIA Audio devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1"
'' + ''
# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
@ -384,7 +401,7 @@ in
# Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"
'';
'');
boot.extraModprobeConfig = mkIf cfg.powerManagement.finegrained ''
options nvidia "NVreg_DynamicPowerManagement=0x02"

@ -115,6 +115,8 @@ in stdenv.mkDerivation rec {
libwebp
libheif
python
# Duplicated here because python.withPackages does not expose the dev output with pkg-config files
python2.pkgs.pygtk
libexif
xorg.libXpm
glib-networking

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.6.9";
version = "0.7.0";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "sha256-ubhGDx5T1AAJjU6Ka1Pqy5kL8HPa097QhhK5Sp3HWEo=";
sha256 = "sha256-oXNSd0ZU2ZsMK51tq8iq2sfuLg0ZHaiXhpJpWZkEmeY=";
name = "${pname}-${version}.AppImage";
};

@ -2,12 +2,12 @@
mkDerivation rec {
pname = "chatterino2";
version = "2.3.4";
version = "2.3.5";
src = fetchFromGitHub {
owner = "Chatterino";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZmUM56+YNH98J3XE/mWOOIfb0qBld2n4iuHpImbrU4o=";
sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI=";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];

@ -1,36 +0,0 @@
{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3,
fetchFromGitHub }:
let
gui = true; # Might be implemented with nixpkgs config.
in
buildGoPackage rec {
pname = "pond";
version = "unstable-2015-08-30";
goPackagePath = "github.com/agl/pond";
src = fetchFromGitHub {
owner = "agl";
repo = "pond";
rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y=";
};
goDeps = ./deps.nix;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ trousers gtk3 gtkspell3 ]
++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi
++ lib.optionals gui [ wrapGAppsHook ];
tags = lib.optionals (!gui) [ "nogui" ];
excludedPackages = [ "appengine" "bn256cgo" ];
postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 ''
grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
-e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
-e "s,bn256\.,bn256cgo.,g"
'';
# https://hydra.nixos.org/build/150102618/nixlog/2
meta.broken = stdenv.isAarch64;
}

@ -1,47 +0,0 @@
[
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
};
}
{
goPackagePath = "github.com/agl/ed25519";
fetch = {
type = "git";
url = "https://github.com/agl/ed25519";
rev = "278e1ec8e8a6e017cd07577924d6766039146ced";
sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "59b73b37c1e45995477aae817e4a653c89a858db";
sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
};
}
{
goPackagePath = "github.com/agl/go-gtk";
fetch = {
type = "git";
url = "https://github.com/agl/go-gtk";
rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15";
sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d";
};
}
]

@ -1,25 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "xmpp-client";
version = "20160916-${lib.strings.substring 0 7 rev}";
rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e";
goPackagePath = "github.com/agl/xmpp-client";
src = fetchFromGitHub {
owner = "agl";
repo = "xmpp-client";
inherit rev;
sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "An XMPP client with OTR support";
homepage = "https://github.com/agl/xmpp-client";
license = licenses.bsd3;
maintainers = with maintainers; [ codsl ];
};
}

@ -1,20 +0,0 @@
[
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
};
}
]

@ -6,6 +6,8 @@
mkDerivation rec {
pname = "teamviewer";
# teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
outputs = [ "out" "dev" ];
version = "15.29.4";
src = fetchurl {

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.49";
version = "1.8.50";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ=";
sha256 = "sha256-dTdXmhm6sWZphLhcoKRDQ2Ir0hcu0ev0xCul2O9hAXg=";
};
postPatch = ''

@ -1,17 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "git-annex-remote-b2";
version = "unstable-2015-12-12";
goPackagePath = "github.com/encryptio/git-annex-remote-b2";
src = fetchFromGitHub {
owner = "encryptio";
repo = "git-annex-remote-b2";
rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ=";
};
goDeps = ./deps.nix;
}

@ -1,20 +0,0 @@
[
{
goPackagePath = "github.com/pquerna/ffjson";
fetch = {
type = "git";
url = "https://github.com/pquerna/ffjson";
rev = "674bc015b5b3f50f9bb2561179778586b9af68c5";
sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a";
};
}
{
goPackagePath = "gopkg.in/kothar/go-backblaze.v0";
fetch = {
type = "git";
url = "https://gopkg.in/kothar/go-backblaze.v0";
rev = "373819725fc560fa962c6cd883b533d2ebec4844";
sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx";
};
}
]

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, gtk3
, vala
@ -54,6 +55,21 @@ stdenv.mkDerivation rec {
sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik";
};
patches = [
# Fix accessibility issues with initializer of constants (Fix build with vala 0.56)
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch";
sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw=";
})
# Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56)
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch";
sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI=";
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asyncstdlib";
version = "3.10.4";
version = "3.10.5";
format = "flit";
disabled = pythonOlder "3.7";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "maxfischer2781";
repo = pname;
rev = "v${version}";
hash = "sha256-zPWXI5iHMCkSVjyNRcXplTadobYCeMv3Unjt+QVF8D8=";
rev = "refs/tags/v${version}";
hash = "sha256-ILb+iWg2xYWBEQY1a4jPITm4QCPO8qfVCPgO3YWIVAQ=";
};
propagatedBuildInputs = [

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-applicationinsights";
version = "3.0.0";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-K46J0WqQt4vwr1CE4yjxKUT/Atds5BLs0k8EjOA4yzA=";
sha256 = "sha256-mFUKupq4IXywGs6aQQYFYSNNH9PCNxicS1mRneSdhHU=";
};
propagatedBuildInputs = [

@ -1,25 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, pythonOlder
}:
buildPythonPackage rec {
pname = "datadiff";
version = "1.1.6";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543";
hash = "sha256-VASUQKiW3lJH7i57eqVCX5OayDLDftshAfjTA26Jyqg=";
};
buildInputs = [ nose ];
# Tests are not part of the PyPI releases
doCheck = false;
pythonImportsCheck = [
"datadiff"
];
meta = with lib; {
description = "DataDiff";
description = "Library to provide human-readable diffs of Python data structures";
homepage = "https://sourceforge.net/projects/datadiff/";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "eventlet";
version = "0.33.0";
version = "0.33.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "eventlet";
repo = pname;
rev = "v${version}";
hash = "sha256-kE/eYBbaTt1mPGoUIMhonvFBlQOdAfPU5GvCvPaRHvs=";
hash = "sha256-8tIvvTTCcIG56VaPZMhdzAKnFRsYV3YC9xcf47nh838=";
};
propagatedBuildInputs = [

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.8.1";
version = "2.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Gy/CS06uGQyQoPLjm8ChR6MkO6CYkpC/n5wM/VncDDs=";
hash = "sha256-nicUpEaPhDBmWU2jP/R01d54xu9tgNUxZVD4gZGAyAw=";
};
propagatedBuildInputs = [

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.10.0";
version = "2.11.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-nQfdej2SveO0Qxam57ZRAyTQ0NnGoyb4nx2YFnqtAhI=";
hash = "sha256-naE1e7T1E0P3MxJCMYc3YZ79v/3VTW19D/LhzRie7jk=";
};
propagatedBuildInputs = [

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "1.7.3";
version = "1.8.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-p1eVlOJQok8Wh9mld6EB2mtAGv97jQ9nf46SqPK8zVs=";
sha256 = "sha256-5nW+IOjBkbgEn1VGHwny1iT771UqWA4BhDLamqS/xAM=";
};
propagatedBuildInputs = [

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "marshmallow";
version = "3.15.0";
version = "3.16.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "marshmallow-code";
repo = pname;
rev = version;
hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc=";
hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME=";
};
propagatedBuildInputs = [

@ -9,7 +9,6 @@
, nixosTests
}:
let
# Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
# absolute paths. Replaced by relative path so it is found when used in nix.
@ -31,15 +30,15 @@ buildPythonPackage rec {
sha256 = "039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy";
};
buildInputs = [xorg.libX11];
buildInputs = [ xorg.libX11 ];
propagatedBuildInputs = [
geckodriver urllib3
];
patchPhase = lib.optionalString stdenv.isLinux ''
postPatch = lib.optionalString stdenv.isLinux ''
cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6"
substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${lib.getLib xorg.libX11}/lib/libX11.so.6"
cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
cc -shared \
-Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.29";
version = "2.27.30";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+0U7OnakjspmOBzqgAT+quoSg16DgZb1x6yHx1xcGe8=";
sha256 = "sha256-yo18xUnD0Q28s8acG1Pj/9EnAInBABplwenhAX615wQ=";
};
propagatedBuildInputs = [

@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "pygtk";
outputs = [ "out" "dev" ];
version = "2.24.0";
disabled = isPy3k;

@ -32,14 +32,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1175";
version = "2.0.1186";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-nLh00DaSpKT6rngiXKa6z0+Ouu1/hMWzIYa54PHPD1k=";
hash = "sha256-5EFB/BgSJny3AdgtgsmIszcM5Wum/dtdmmP/40/sH0Y=";
};
nativeBuildInputs = with py.pkgs; [

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "buf";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cKb9pZYEsO1thgtl/8XFJHpNrO6P3OR8Lox/Gf9ccYk=";
sha256 = "sha256-Jcj1tpcG64mSVn444isGsK9AcITh171ibECukv3bXDI=";
};
vendorSha256 = "sha256-zXLvKEdiIFnmwWQBgbJHCEBe2i7FobgeUOnA3LvHl8w=";
vendorSha256 = "sha256-aHGV8UfPn7xsySPXRSzsEpcaz1Ll49Mj1S9izvaIRWY=";
patches = [
# Skip a test that requires networking to be available to work.
@ -48,13 +48,9 @@ buildGoModule rec {
runHook preInstall
# Binaries
mkdir -p "$out/bin"
# Only install required binaries, don't install testing binaries
for FILE in \
"buf" \
"protoc-gen-buf-breaking" \
"protoc-gen-buf-lint"; do
cp "$GOPATH/bin/$FILE" "$out/bin/"
for FILE in buf protoc-gen-buf-breaking protoc-gen-buf-lint; do
install -D -m 555 -t $out/bin $GOPATH/bin/$FILE
done
# Completions

@ -1,27 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "corgi";
version = "0.2.4";
goPackagePath = "github.com/DrakeW/corgi";
src = fetchFromGitHub {
owner = "DrakeW";
repo = "corgi";
rev = "v${version}";
sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "CLI workflow manager";
longDescription = ''
Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet.
'';
homepage = "https://github.com/DrakeW/corgi";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
};
}

@ -1,47 +0,0 @@
[
{
goPackagePath = "github.com/chzyer/readline";
fetch = {
type = "git";
url = "https://github.com/chzyer/readline";
rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "2d684516a8861da43017284349b7e303e809ac21";
sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "99dc123558852f67743bd0b2caf8383cb3c6d720";
sha256 = "0b2rjgycgpkpvpsqgvilqkr66bfk477lyd6l0jxmgxb1h0za5s25";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "d929dcbb10863323c436af3cf76cb16a6dfc9b29";
sha256 = "1qjmqvszs9cmic7brm7pknq86zjra4hq923bn88blfvr3bap5bc4";
};
}
]

@ -1,17 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "go-repo-root";
version = "unstable-2014-09-11";
goPackagePath = "github.com/cstrahan/go-repo-root";
src = fetchFromGitHub {
owner = "cstrahan";
repo = "go-repo-root";
rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y=";
};
goDeps = ./deps.nix;
}

@ -1,20 +0,0 @@
[
{
goPackagePath = "golang.org/x/tools/go/vcs";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
};
}
{
goPackagePath = "code.google.com/p/go.tools/go/vcs";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
};
}
]

@ -4,13 +4,13 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "pypi-mirror";
version = "4.2.0";
version = "5.0.1";
src = fetchFromGitHub {
owner = "montag451";
repo = pname;
rev = "v${version}";
sha256 = "1ci19bqyhig1s5myzw6klkiycd8k0lzhk3yqfx5fjirc2f0xpz5j";
rev = "refs/tags/v${version}";
sha256 = "sha256-x0to3VrnuON1Ghj6LlMOjJfqSVh9eF3Yg6Cdcxtpbc8=";
};
pythonImportsCheck = [ "pypi_mirror" ];

@ -19,21 +19,21 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
version = "510.68.02";
sha256_64bit = "sha256-vSw0SskrL8ErBgQ1kKT+jU6wzLdNDEk1LwBM8tKZ9MU=";
settingsSha256 = "sha256-4TBA/ITpaaBiVDkpj7/Iydei1knRPpruPL4fRrqFAmU=";
persistencedSha256 = "sha256-Q1Rk6dAK4pnm6yDK4kmj5Vg4GRbi034C96ypywHYB2I=";
version = "515.48.07";
sha256_64bit = "sha256-4odkzFsTwy52NwUT2ur8BcKJt37gURVSRQ8aAOMa4eM=";
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
}
else legacy_390;
# see https://www.nvidia.com/en-us/drivers/unix/ "Production branch"
production = legacy_470;
production = stable;
beta = generic {
version = "510.39.01";
sha256_64bit = "sha256-Lj7cOvulhApeuRycIiyYy5kcPv3ZlM8qqpPUWl0bmRs=";
settingsSha256 = "sha256-qlSwNq0wC/twvrbQjY+wSTcDaV5KG4Raq6WkzTizyXw=";
persistencedSha256 = "sha256-UNrl/hfiNXKGACQ7aHpsNcfcHPWVnycQ51yaa3eKXhI=";
version = "515.43.04";
sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc=";
settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY=";
persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo=";
};
# Vulkan developer beta driver
@ -54,21 +54,19 @@ rec {
# Last one supporting Kepler architecture
legacy_470 = generic {
version = "470.103.01";
sha256_64bit = "VsIwn4nCE0Y7DEY2D3siddc3HTxyevP+3IjElu3Ih6U=";
settingsSha256 = "Roc2OFSNEnIGLVwP0D9f8vFTf5v3KkL99S0mZBWN7s0=";
persistencedSha256 = "AVI0j2bpfMCMBTKuQp+BoCewaXIW3Xt4NnV1fjAHOr0=";
version = "470.129.06";
sha256_64bit = "sha256-QQkQtwBuFzBjMnaDKfS1PW+ekcxVXCiJkXWOKo8IqZg=";
settingsSha256 = "sha256-vUS4O/c4IrbC8offzUFGLlMdP/Tlz1GwQIV2geRfj/o=";
persistencedSha256 = "sha256-jCcYUsbhQ77IOQquXqbTZfh1N0IvKQOWrIMU9rEwSW0=";
};
# Last one supporting x86
legacy_390 = generic {
version = "390.147";
sha256_32bit = "00avsns7l0j1ai8bf8gav2qshvphfdngy388bwzz24p61mfv1i1a";
sha256_64bit = "09qcdfn4j5jza3iw59wqwgq4a489qf7kx355yssrcahaw9g87lxz";
settingsSha256 = "16qqw0jy31da65cdi17y3j2kcdhw09vra7g17bkcimaqnf70j0ni";
persistencedSha256 = "1ad81y4qfpxrx0vqsk81a3h0bi1yg8hw5gi5y5d58p76vc8083i9";
broken = kernel.kernelAtLeast "5.17";
version = "390.151";
sha256_32bit = "sha256-lOOZtFllnBKxNE6Mj09e7h7VkV/0WfyLuDHJ4dRGd9s=";
sha256_64bit = "sha256-UibkhCBEz/2Qlt6tr2iTTBM9p04FuAzNISNlhLOvsfw=";
settingsSha256 = "sha256-teXQa0pQctQl1dvddVJtI7U/vVuMu6ER1Xd99Jprpvw=";
persistencedSha256 = "sha256-FxiTXYABplKFcBXr4orhYWiJq4zVePpplMbg2kvEuXk=";
};
legacy_340 = generic {

@ -1,12 +1,12 @@
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin }:
let
etcdVersion = "3.5.1";
etcdVersion = "3.5.4";
etcdSrc = fetchFromGitHub {
owner = "etcd-io";
repo = "etcd";
rev = "v${etcdVersion}";
sha256 = "sha256-Ip7JAWbZBZcc8MXd+Sw05QmTs448fQXpQ5XXo6RW+Gs=";
sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM=";
};
commonMeta = with lib; {
@ -21,7 +21,7 @@ let
pname = "etcdserver";
version = etcdVersion;
vendorSha256 = "sha256-hJzmxCcwN6MTgE0NpjtFlm8pjZ83clQXv1k5YM8Gmes=";
vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw=";
src = etcdSrc;
modRoot = "./server";
@ -45,7 +45,7 @@ let
pname = "etcdutl";
version = etcdVersion;
vendorSha256 = "sha256-My0kzsN2i8DgPm2yIkbql3VyMXPaHmQSeaa/uK/RFxo=";
vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg=";
src = etcdSrc;
modRoot = "./etcdutl";
@ -56,10 +56,10 @@ let
};
etcdctl = buildGoModule rec {
pname = "etcdutl";
pname = "etcdctl";
version = etcdVersion;
vendorSha256 = "sha256-XZKBA95UrhbiefnDvpaXcBA0wUjnpH+Pb6yXp7yc4HQ=";
vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4=";
src = etcdSrc;
modRoot = "./etcdctl";

@ -9,7 +9,6 @@
}:
let
pname = "pgadmin";
version = "6.9";
@ -112,12 +111,17 @@ pythonPackages.buildPythonApplication rec {
postPatch = ''
# patching Makefile, so it doesn't try to build sphinx documentation here
# (will do so later)
substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
substituteInPlace Makefile \
--replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
# fix document which refers a non-existing document and fails
substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" ""
substituteInPlace docs/en_US/contributions.rst \
--replace "code_snippets" ""
patchShebangs .
# relax dependencies
substituteInPlace requirements.txt \
--replace "eventlet==0.33.0" "eventlet>=0.33.0" \
--replace "psycopg2==2.9.*" "psycopg2>=2.9" \
--replace "cryptography==3.*" "cryptography>=3.0" \
--replace "requests==2.25.*" "requests>=2.25.0" \
@ -188,7 +192,7 @@ pythonPackages.buildPythonApplication rec {
passthru.tests = {
standalone = nixosTests.pgadmin4-standalone;
# regression and function tests of the package itself
package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; }));
package = import ../../../../nixos/tests/pgadmin4.nix { inherit pkgs buildDeps; pythonEnv = pythonPackages; };
};
meta = with lib; {

@ -24,7 +24,7 @@ let
}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
in stdenv.mkDerivation rec {
pname = "ventoy-bin";
version = "1.0.74";
version = "1.0.75";
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional withQt5 qt5.wrapQtAppsHook;
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
sha256 = "sha256-raoVbj1+6nSR4knq/FmgVpzXRV71Hrcqd8C6Zsi34Uo=";
sha256 = "64487c11da3be1aa95ae5631c12fcfefbabf3d27c80d8992145e572c5e44a535";
};
patches = [
(fetchpatch {

@ -1,20 +1,17 @@
{ lib, stdenv, fetchurl, coreutils, ncurses, fetchpatch }:
{ lib, stdenv, fetchurl, coreutils }:
stdenv.mkDerivation rec {
pname = "entr";
version = "5.1";
version = "5.2";
src = fetchurl {
url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz";
hash = "sha256-D4f1d7zodkHFJa3bm8xgu6pXn+mB2rdZBD484VVtu5I=";
hash = "sha256-I34wnUawdSEMDky3ib/Qycd37d9sswNBw/49vMZYw4A=";
};
postPatch = ''
substituteInPlace Makefile.bsd --replace /bin/echo echo
substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat
substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.out}/bin/clear
substituteInPlace entr.1 --replace /bin/cat cat
substituteInPlace entr.1 --replace /usr/bin/clear clear
'';
dontAddPrefix = true;
doCheck = true;

@ -18,6 +18,10 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM=";
# FIXME: LTO is broken with rustc 1.61, see https://github.com/rust-lang/rust/issues/97255
# remove this with rustc 1.61.1+
CARGO_PROFILE_RELEASE_LTO = "false";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ];

@ -1,23 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "gawp";
version = "unstable-2016-01-21";
goPackagePath = "github.com/martingallagher/gawp";
src = fetchFromGitHub {
owner = "martingallagher";
repo = "gawp";
rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0=";
};
goDeps = ./deps.nix;
meta = {
homepage = "https://github.com/martingallagher/gawp";
description = "A simple, configurable, file watching, job execution tool";
license = lib.licenses.asl20;
};
}

@ -1,29 +0,0 @@
[
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
};
}
{
goPackagePath = "gopkg.in/fsnotify.v1";
fetch = {
type = "git";
url = "https://gopkg.in/fsnotify.v1";
rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0";
sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
};
}
]

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
})
];
enableParallelBuilding = true;
configureFlags = [ "--disable-doc" ];
buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ];

@ -1,24 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "i3cat";
version = "1.0";
goPackagePath = "github.com/vincent-petithory/i3cat";
src = fetchFromGitHub {
owner = "vincent-petithory";
repo = "i3cat";
rev = "v${version}";
sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q=";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "combine multiple i3bar JSON inputs into one to forward to i3bar";
homepage = "https://vincent-petithory.github.io/i3cat/";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

@ -1,11 +0,0 @@
[
{
goPackagePath = "github.com/vincent-petithory/structfield";
fetch = {
type = "git";
url = "https://github.com/vincent-petithory/structfield";
rev = "01a738558a47fbf16712994d1737fb31c77e7d11";
sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw";
};
}
]

@ -1,27 +0,0 @@
{ lib, fetchFromGitHub, buildGoPackage}:
buildGoPackage rec {
pname = "ical2org";
version="1.1.5";
goPackagePath = "github.com/rjhorniii/ical2org";
src = fetchFromGitHub {
owner = "rjhorniii";
repo = "ical2org";
rev = "v.${version}";
sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm";
fetchSubmodules = true;
};
goDeps = ./deps.nix;
meta = with lib; {
description = "Convert an iCal file to org agenda format, optionally deduplicating entries";
homepage = "https://github.com/rjhorniii/ical2org";
license = licenses.gpl3;
maintainers = with maintainers; [ swflint ];
platforms = platforms.unix;
};
}

@ -1,11 +0,0 @@
[
{
goPackagePath = "github.com/rjhorniii/ics-golang";
fetch = {
type = "git";
url = "https://github.com/rjhorniii/ics-golang";
rev = "da66d6f502fac65073773ea3779cae2959545cb2";
sha256 = "1mm5rssvyjk29n1gq4l5xw26gm8bhvbzrs5c059i41zh9af121px";
};
}
]

@ -1,32 +0,0 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
pname = "curl-unix-socket";
version = "unstable-2015-04-10";
src = fetchFromGitHub {
owner = "Soulou";
repo = "curl-unix-socket";
rev = "a7da90b01ed43e8c0d606f760c9da82f8e3ed307";
sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d";
};
goPackagePath = "github.com/Soulou/curl-unix-socket";
buildPhase = ''
runHook preBuild
(
cd go/src/${goPackagePath}
go build -o $NIX_BUILD_TOP/go/bin/curl-unix-socket
)
runHook postBuild
'';
meta = with lib; {
description = "Run HTTP requests over UNIX socket";
license = licenses.mit;
homepage = "https://github.com/Soulou/curl-unix-socket";
maintainers = with maintainers; [offline];
platforms = platforms.unix;
};
}

@ -1,24 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "goklp";
version = "1.6";
goPackagePath = "github.com/AppliedTrust/goklp";
src = fetchFromGitHub {
owner = "AppliedTrust";
repo = "goklp";
rev = "v${version}";
sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand";
homepage = "https://github.com/AppliedTrust/goklp";
maintainers = with maintainers; [ disassembler ];
license = licenses.bsd2;
};
}

@ -1,56 +0,0 @@
[
{
goPackagePath = "github.com/asaskevich/govalidator";
fetch = {
type = "git";
url = "https://github.com/asaskevich/govalidator";
rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7";
sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w";
};
}
{
goPackagePath = "github.com/docopt/docopt-go";
fetch = {
type = "git";
url = "https://github.com/docopt/docopt-go";
rev = "784ddc588536785e7299f7272f39101f7faccc3f";
sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj";
};
}
{
goPackagePath = "github.com/kardianos/osext";
fetch = {
type = "git";
url = "https://github.com/kardianos/osext";
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
};
}
{
goPackagePath = "github.com/vaughan0/go-ini";
fetch = {
type = "git";
url = "https://github.com/vaughan0/go-ini";
rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
};
}
{
goPackagePath = "gopkg.in/asn1-ber.v1";
fetch = {
type = "git";
url = "https://gopkg.in/asn1-ber.v1";
rev = "379148ca0225df7a432012b8df0355c2a2063ac0";
sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx";
};
}
{
goPackagePath = "gopkg.in/ldap.v2";
fetch = {
type = "git";
url = "https://gopkg.in/ldap.v2";
rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
};
}
]

@ -209,6 +209,7 @@ mapAliases ({
couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12
corgi = throw "corgi has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22
cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30
cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
@ -264,7 +265,7 @@ mapAliases ({
cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04
cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
cutensor_cudatoolkit_10_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04
@ -449,6 +450,7 @@ mapAliases ({
g4py = python3Packages.geant4; # Added 2020-06-06
gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06
gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03
gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22
gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22
@ -457,6 +459,7 @@ mapAliases ({
gfm = throw "gfm has been removed"; # Added 2021-01-15
giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23
giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01
gitAndTools = self // {
@ -509,6 +512,7 @@ mapAliases ({
gobby5 = gobby; # Added 2021-02-01
gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22
gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15
goklp = throw "goklp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21
goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22
gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23
@ -518,6 +522,7 @@ mapAliases ({
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02
gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
@ -571,8 +576,10 @@ mapAliases ({
### I ###
i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22
iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15
icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
@ -1062,6 +1069,7 @@ mapAliases ({
pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24
polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22
polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22
powerdns = pdns; # Added 2022-03-28
portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10
@ -1450,6 +1458,7 @@ mapAliases ({
xineLib = xine-lib; # Added 2021-04-27
xineUI = xine-ui; # Added 2021-04-27
xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22
xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02
xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
xp-pen-g430 = pentablet-driver; # Added 2020-05-03
xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26

@ -262,7 +262,9 @@ with pkgs;
breakpad = callPackage ../development/misc/breakpad { };
buf = callPackage ../development/tools/buf { };
buf = callPackage ../development/tools/buf {
buildGoModule = buildGo118Module;
};
cfn-nag = callPackage ../development/tools/cfn-nag { };
@ -333,8 +335,6 @@ with pkgs;
conftest = callPackage ../development/tools/conftest { };
corgi = callPackage ../development/tools/corgi { };
colmena = callPackage ../tools/admin/colmena { };
colorz = callPackage ../tools/misc/colorz { };
@ -910,8 +910,6 @@ with pkgs;
useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
ical2org = callPackage ../tools/misc/ical2org {};
iconConvTools = callPackage ../build-support/icon-conv-tools {};
validatePkgConfig = makeSetupHook
@ -5033,8 +5031,6 @@ with pkgs;
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };
curlie = callPackage ../tools/networking/curlie { };
cunit = callPackage ../tools/misc/cunit { };
@ -6134,8 +6130,6 @@ with pkgs;
gawkInteractive = gawk.override { interactive = true; };
gawp = callPackage ../tools/misc/gawp { };
gbdfed = callPackage ../tools/misc/gbdfed {
gtk = gtk2-x11;
};
@ -6218,8 +6212,6 @@ with pkgs;
inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
};
git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { };
git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx {
inherit (python3Packages)
buildPythonApplication
@ -6537,8 +6529,6 @@ with pkgs;
godot-server = callPackage ../development/tools/godot/server.nix { };
goklp = callPackage ../tools/networking/goklp {};
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
goofys = callPackage ../tools/filesystems/goofys { };
@ -13140,8 +13130,6 @@ with pkgs;
go = go_1_17;
go-repo-root = callPackage ../development/tools/go-repo-root { };
go-junit-report = callPackage ../development/tools/go-junit-report { };
gobang = callPackage ../development/tools/database/gobang {
@ -27246,8 +27234,6 @@ with pkgs;
i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
i3cat = callPackage ../tools/misc/i3cat { };
i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
i3lock = callPackage ../applications/window-managers/i3/lock.nix {
@ -29086,8 +29072,6 @@ with pkgs;
electron = electron_9;
};
pond = callPackage ../applications/networking/instant-messengers/pond { };
ponymix = callPackage ../applications/audio/ponymix { };
portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { };
@ -30876,8 +30860,6 @@ with pkgs;
xmountains = callPackage ../applications/graphics/xmountains { };
xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
xpra = callPackage ../tools/X11/xpra { };

Loading…
Cancel
Save