7e43296...master · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

135 files changed+1199−1292

since splitsnapshots

unifiedsplit

maintainers/maintainer-list.nix+6

@@ -1409,6 +1409,12 @@

14091409 githubId = 164148;

14101410 name = "Ben Darwin";

14111411 };

1412+ bdd = {

1413+ email = "bdd@mindcast.org";

1414+ github = "bdd";

1415+ githubId = 11135;

1416+ name = "Berk D. Demir";

1417+ };

14121418 bdesham = {

14131419 email = "benjamin@esham.io";

14141420 github = "bdesham";

nixos/maintainers/scripts/lxd/lxd-image.nix+1−1

@@ -27,7 +27,7 @@ with lib;

2727 networking.useDHCP = false;

2828 networking.interfaces.eth0.useDHCP = true;

2929

30− # As this is intended as a stadalone image, undo some of the minimal profile stuff

30+ # As this is intended as a standalone image, undo some of the minimal profile stuff

3131 documentation.enable = true;

3232 documentation.nixos.enable = true;

3333 environment.noXlibs = false;

nixos/modules/programs/nm-applet.nix+1−1

@@ -23,7 +23,7 @@

2323 description = "Network manager applet";

2424 wantedBy = [ "graphical-session.target" ];

2525 partOf = [ "graphical-session.target" ];

26− serviceConfig.ExecStart = "${pkgs.networkmanager-applet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";

26+ serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}";

2727 };

2828

2929 services.dbus.packages = [ pkgs.gcr ];

nixos/modules/security/pam.nix+3−3

@@ -492,7 +492,7 @@ let

492492 auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}

493493 '') +

494494 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''

495− auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

495+ auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

496496 '') +

497497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''

498498 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}

@@ -1131,7 +1131,7 @@ in

11311131 ++ optional config.services.sssd.enable pkgs.sssd

11321132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]

11331133 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]

1134− ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]

1134+ ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ]

11351135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]

11361136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];

11371137

@@ -1221,7 +1221,7 @@ in

12211221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,

12221222 '' +

12231223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''

1224− "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,

1224+ "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,

12251225 '' +

12261226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''

12271227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,

nixos/modules/services/x11/desktop-managers/cinnamon.nix+1−1

@@ -136,7 +136,7 @@ in

136136 # session requirements

137137 cinnamon-screensaver

138138 # cinnamon-killer-daemon: provided by cinnamon-common

139− networkmanager-applet # session requirement - also nm-applet not needed

139+ networkmanagerapplet # session requirement - also nm-applet not needed

140140

141141 # For a polkit authentication agent

142142 polkit_gnome

nixos/tests/all-tests.nix−1

@@ -284,7 +284,6 @@ in

284284 loki = handleTest ./loki.nix {};

285285 lvm2 = handleTest ./lvm2 {};

286286 lxd = handleTest ./lxd.nix {};

287− lxd-image = handleTest ./lxd-image.nix {};

288287 lxd-nftables = handleTest ./lxd-nftables.nix {};

289288 lxd-image-server = handleTest ./lxd-image-server.nix {};

290289 #logstash = handleTest ./logstash.nix {};

nixos/tests/common/lxd/config.yamlnew file+24

@@ -0,0 +1,24 @@

1+storage_pools:

2+ - name: default

3+ driver: dir

4+ config:

5+ source: /var/lxd-pool

7+networks:

8+ - name: lxdbr0

9+ type: bridge

10+ config:

11+ ipv4.address: auto

12+ ipv6.address: none

13+

14+profiles:

15+ - name: default

16+ devices:

17+ eth0:

18+ name: eth0

19+ network: lxdbr0

20+ type: nic

21+ root:

22+ path: /

23+ pool: default

24+ type: disk

nixos/tests/lxd-image-server.nix+15−48

@@ -1,54 +1,21 @@

1−import ./make-test-python.nix ({ pkgs, ...} :

1+import ./make-test-python.nix ({ pkgs, lib, ... } :

33let

4− # Since we don't have access to the internet during the tests, we have to

5− # pre-fetch lxd containers beforehand.

6− #

7− # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

8− # generally, sufficient for our tests.

9− alpine-meta = pkgs.fetchurl {

10− url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11− hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12− };

13−

14− alpine-rootfs = pkgs.fetchurl {

15− url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

16− hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

4+ lxd-image = import ../release.nix {

5+ configuration = {

6+ # Building documentation makes the test unnecessarily take a longer time:

7+ documentation.enable = lib.mkForce false;

8+ };

179 };

1810

19− lxd-config = pkgs.writeText "config.yaml" ''

20− storage_pools:

21− - name: default

22− driver: dir

23− config:

24− source: /var/lxd-pool

25−

26− networks:

27− - name: lxdbr0

28− type: bridge

29− config:

30− ipv4.address: auto

31− ipv6.address: none

32−

33− profiles:

34− - name: default

35− devices:

36− eth0:

37− name: eth0

38− network: lxdbr0

39− type: nic

40− root:

41− path: /

42− pool: default

43− type: disk

44− '';

45−

11+ lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

12+ lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

4613

4714in {

4815 name = "lxd-image-server";

4916

5017 meta = with pkgs.lib.maintainers; {

51− maintainers = [ mkg20001 ];

18+ maintainers = [ mkg20001 patryk27 ];

5219 };

5320

5421 nodes.machine = { lib, ... }: {

@@ -100,20 +67,20 @@ in {

10067 # lxd expects the pool's directory to already exist

10168 machine.succeed("mkdir /var/lxd-pool")

10269

103−

10470 machine.succeed(

105− "cat ${lxd-config} | lxd init --preseed"

71+ "cat ${./common/lxd/config.yaml} | lxd init --preseed"

10672 )

10773

10874 machine.succeed(

109− "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

75+ "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

11076 )

11177

112− loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"

78+ loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1"

11379

11480 with subtest("push image to server"):

115− machine.succeed("lxc launch alpine test")

116− machine.succeed("lxc stop test")

81+ machine.succeed("lxc launch nixos test")

82+ machine.sleep(5)

83+ machine.succeed("lxc stop -f test")

11784 machine.succeed("lxc publish --public test --alias=testimg")

11885 machine.succeed("lxc image export testimg")

11986 machine.succeed("ls >&2")

nixos/tests/lxd-image.nixdeleted−89

@@ -1,89 +0,0 @@

1−# This test ensures that the nixOS lxd images builds and functions properly

2−# It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software

3−

4−import ./make-test-python.nix ({ pkgs, ...} : let

5− release = import ../release.nix {

6− /* configuration = {

7− environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works

8− }; */

9− };

10−

11− metadata = release.lxdMeta.${pkgs.system};

12− image = release.lxdImage.${pkgs.system};

13−

14− lxd-config = pkgs.writeText "config.yaml" ''

15− storage_pools:

16− - name: default

17− driver: dir

18− config:

19− source: /var/lxd-pool

20−

21− networks:

22− - name: lxdbr0

23− type: bridge

24− config:

25− ipv4.address: auto

26− ipv6.address: none

27−

28− profiles:

29− - name: default

30− devices:

31− eth0:

32− name: eth0

33− network: lxdbr0

34− type: nic

35− root:

36− path: /

37− pool: default

38− type: disk

39− '';

40−in {

41− name = "lxd-image";

42−

43− meta = with pkgs.lib.maintainers; {

44− maintainers = [ mkg20001 ];

45− };

46−

47− nodes.machine = { lib, ... }: {

48− virtualisation = {

49− # disk full otherwise

50− diskSize = 2048;

51−

52− lxc.lxcfs.enable = true;

53− lxd.enable = true;

54− };

55− };

56−

57− testScript = ''

58− machine.wait_for_unit("sockets.target")

59− machine.wait_for_unit("lxd.service")

60− machine.wait_for_file("/var/lib/lxd/unix.socket")

61−

62− # It takes additional second for lxd to settle

63− machine.sleep(1)

64−

65− # lxd expects the pool's directory to already exist

66− machine.succeed("mkdir /var/lxd-pool")

67−

68− machine.succeed(

69− "cat ${lxd-config} | lxd init --preseed"

70− )

71−

72− # TODO: test custom built container aswell

73−

74− with subtest("importing container works"):

75− machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos")

76−

77− with subtest("launching container works"):

78− machine.succeed("lxc launch nixos machine -c security.nesting=true")

79− # make sure machine boots up properly

80− machine.sleep(5)

81−

82− with subtest("container shell works"):

83− machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -")

84− machine.succeed("lxc exec machine /run/current-system/sw/bin/true")

85−

86− # with subtest("rebuilding works"):

87− # machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch")

88− '';

89−})

nixos/tests/lxd.nix+40−94

@@ -1,79 +1,18 @@

1−import ./make-test-python.nix ({ pkgs, ...} :

1+import ./make-test-python.nix ({ pkgs, lib, ... } :

33let

4− # Since we don't have access to the internet during the tests, we have to

5− # pre-fetch lxd containers beforehand.

6− #

7− # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

8− # generally, sufficient for our tests.

9− alpine-meta-x86 = pkgs.fetchurl {

10− url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11− hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12− };

13− alpine-meta-for = arch: pkgs.stdenv.mkDerivation {

14− name = "alpine-meta-${arch}";

15− version = "3.12";

16− unpackPhase = "true";

17− buildPhase = ''

18− runHook preBuild

19−

20− tar xvf ${alpine-meta-x86}

21− sed -i 's/architecture: .*/architecture: ${arch}/' metadata.yaml

22−

23− runHook postBuild

24− '';

25− installPhase = ''

26− runHook preInstall

27−

28− tar czRf $out *

29−

30− runHook postInstall

31− '';

32− };

4+ lxd-image = import ../release.nix {

5+ configuration = {

6+ # Building documentation makes the test unnecessarily take a longer time:

7+ documentation.enable = lib.mkForce false;

338

34− alpine-meta = {

35− x86_64-linux = alpine-meta-x86;

36− aarch64-linux = alpine-meta-for "aarch64";

37− }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

38−

39− alpine-rootfs = {

40− x86_64-linux = pkgs.fetchurl {

41− url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

42− hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

43− };

44− aarch64-linux = pkgs.fetchurl {

45− url = "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/aarch64/alpine-minirootfs-3.15.4-aarch64.tar.gz";

46− hash = "sha256-9kBz8Jwmo8XepJhTMt5zilCaHHpflnUH7y9+0To39Us=";

9+ # Our tests require `grep` & friends:

10+ environment.systemPackages = with pkgs; [ busybox ];

4711 };

48− }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

49−

50− lxd-config = pkgs.writeText "config.yaml" ''

51− storage_pools:

52− - name: default

53− driver: dir

54− config:

55− source: /var/lxd-pool

56−

57− networks:

58− - name: lxdbr0

59− type: bridge

60− config:

61− ipv4.address: auto

62− ipv6.address: none

63−

64− profiles:

65− - name: default

66− devices:

67− eth0:

68− name: eth0

69− network: lxdbr0

70− type: nic

71− root:

72− path: /

73− pool: default

74− type: disk

75− '';

12+ };

7613

14+ lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

15+ lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

7716

7817in {

7918 name = "lxd";

@@ -84,6 +23,8 @@ in {

8423

8524 nodes.machine = { lib, ... }: {

8625 virtualisation = {

26+ diskSize = 2048;

27+

8728 # Since we're testing `limits.cpu`, we've gotta have a known number of

8829 # cores to lean on

8930 cores = 2;

@@ -108,61 +49,66 @@ in {

10849 machine.succeed("mkdir /var/lxd-pool")

10950

11051 machine.succeed(

111− "cat ${lxd-config} | lxd init --preseed"

52+ "cat ${./common/lxd/config.yaml} | lxd init --preseed"

11253 )

11354

11455 machine.succeed(

115− "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

56+ "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

11657 )

11758

118− with subtest("Containers can be launched and destroyed"):

119− machine.succeed("lxc launch alpine test")

120− machine.succeed("lxc exec test true")

121− machine.succeed("lxc delete -f test")

59+ with subtest("Container can be managed"):

60+ machine.succeed("lxc launch nixos container")

61+ machine.sleep(5)

62+ machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")

63+ machine.succeed("lxc exec container true")

64+ machine.succeed("lxc delete -f container")

12265

123− with subtest("Containers are being mounted with lxcfs inside"):

124− machine.succeed("lxc launch alpine test")

66+ with subtest("Container is mounted with lxcfs inside"):

67+ machine.succeed("lxc launch nixos container")

68+ machine.sleep(5)

12569

12670 ## ---------- ##

12771 ## limits.cpu ##

12872

129− machine.succeed("lxc config set test limits.cpu 1")

130− machine.succeed("lxc restart test")

73+ machine.succeed("lxc config set container limits.cpu 1")

74+ machine.succeed("lxc restart container")

75+ machine.sleep(5)

13176

132− # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort

133− # to the primal methods

13477 assert (

13578 "1"

136− == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

79+ == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

13780 )

13881

139− machine.succeed("lxc config set test limits.cpu 2")

140− machine.succeed("lxc restart test")

82+ machine.succeed("lxc config set container limits.cpu 2")

83+ machine.succeed("lxc restart container")

84+ machine.sleep(5)

14185

14286 assert (

14387 "2"

144− == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

88+ == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

14589 )

14690

14791 ## ------------- ##

14892 ## limits.memory ##

14993

150− machine.succeed("lxc config set test limits.memory 64MB")

151− machine.succeed("lxc restart test")

94+ machine.succeed("lxc config set container limits.memory 64MB")

95+ machine.succeed("lxc restart container")

96+ machine.sleep(5)

15297

15398 assert (

15499 "MemTotal: 62500 kB"

155− == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

100+ == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

156101 )

157102

158− machine.succeed("lxc config set test limits.memory 128MB")

159− machine.succeed("lxc restart test")

103+ machine.succeed("lxc config set container limits.memory 128MB")

104+ machine.succeed("lxc restart container")

105+ machine.sleep(5)

160106

161107 assert (

162108 "MemTotal: 125000 kB"

163− == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

109+ == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

164110 )

165111

166− machine.succeed("lxc delete -f test")

112+ machine.succeed("lxc delete -f container")

167113 '';

168114})

nixos/tests/pam/pam-oath-login.nix+1−1

@@ -7,7 +7,7 @@ let

77 # how many passwords have been made. In this env, we'll always be on

88 # the 0th counter, so the password is static.

99 #

10− # Generated in nix-shell -p oathToolkit

10+ # Generated in nix-shell -p oath-toolkit

1111 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3

1212 # and picking a the first 4:

1313 oathSnakeOilPassword1 = "143349";

pkgs/applications/misc/tut/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "tut";

5− version = "0.0.42";

5+ version = "0.0.46";

77 src = fetchFromGitHub {

88 owner = "RasmusLindroth";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc=";

11+ sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w=";

1212 };

1313

1414 vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";

pkgs/applications/misc/udiskie/default.nix+30−25

@@ -1,42 +1,47 @@

11{ lib

2+, asciidoc

23, fetchFromGitHub

3−, buildPythonApplication

4−, asciidoc-full

5−, docopt

6−, gettext

74, gobject-introspection

85, gtk3

9−, keyutils

6+, installShellFiles

107, libappindicator-gtk3

118, libnotify

129, librsvg

13−, nose

14−, pygobject3

15−, pyyaml

10+, python3

1611, udisks2

1712, wrapGAppsHook

1813}:

1914

20−buildPythonApplication rec {

15+python3.pkgs.buildPythonApplication rec {

2116 pname = "udiskie";

22− version = "2.4.0";

17+ version = "2.4.2";

18+

19+ format = "setuptools";

2320

2421 src = fetchFromGitHub {

2522 owner = "coldfix";

2623 repo = "udiskie";

2724 rev = "v${version}";

28− hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";

25+ hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";

2926 };

3027

31− outputs = [ "out" "man" ];

28+ patches = [

29+ ./locale-path.patch

30+ ];

31+

32+ postPatch = ''

33+ substituteInPlace udiskie/locale.py --subst-var out

34+ '';

3235

3336 nativeBuildInputs = [

34− asciidoc-full # Man page

35− gettext

37+ asciidoc # Man page

3638 gobject-introspection

39+ installShellFiles

3740 wrapGAppsHook

3841 ];

3942

43+ dontWrapGApps = true;

44+

4045 buildInputs = [

4146 gobject-introspection

4247 gtk3

@@ -46,8 +51,9 @@ buildPythonApplication rec {

4651 udisks2

4752 ];

4853

49− propagatedBuildInputs = [

54+ propagatedBuildInputs = with python3.pkgs; [

5055 docopt

56+ keyutils

5157 pygobject3

5258 pyyaml

5359 ];

@@ -57,21 +63,20 @@ buildPythonApplication rec {

5763 '';

5864

5965 postInstall = ''

60− mkdir -p $man/share/man/man8

61− cp -v doc/udiskie.8 $man/share/man/man8/

66+ installManPage doc/udiskie.8

6267 '';

6368

64− checkInputs = [

65− keyutils

66− nose

67− ];

68−

69− checkPhase = ''

70− nosetests

69+ preFixup = ''

70+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

7171 '';

7272

73+ checkInputs = with python3.pkgs; [

74+ pytestCheckHook

75+ ];

76+

7377 meta = with lib; {

7478 homepage = "https://github.com/coldfix/udiskie";

79+ changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";

7580 description = "Removable disk automounter for udisks";

7681 longDescription = ''

7782 udiskie is a udisks2 front-end that allows to manage removeable media such

@@ -88,6 +93,6 @@ buildPythonApplication rec {

8893 - password caching (requires python keyutils 0.3)

8994 '';

9095 license = licenses.mit;

91− maintainers = with maintainers; [ AndersonTorres ];

96+ maintainers = with maintainers; [ AndersonTorres dotlambda ];

9297 };

9398}

pkgs/applications/misc/udiskie/locale-path.patchnew file+17

@@ -0,0 +1,17 @@

1+diff --git a/udiskie/locale.py b/udiskie/locale.py

2+index f12bea9..450e38b 100644

3+--- a/udiskie/locale.py

4++++ b/udiskie/locale.py

5+@@ -10,10 +10,8 @@ from gettext import translation

6+ testdirs = [

7+ # manual override:

8+ os.environ.get('TEXTDOMAINDIR'),

9+- # editable installation:

10+- os.path.join(os.path.dirname(__file__), '../build/locale'),

11+- # user or virtualenv installation:

12+- os.path.join(sys.prefix, 'share/locale'),

13++ # Nix installation:

14++ os.path.join('@out@', 'share/locale'),

15+ ]

16+ testfile = 'en_US/LC_MESSAGES/udiskie.mo'

17+ localedir = next(

pkgs/applications/misc/upwork/default.nix+3−3

@@ -6,11 +6,11 @@

77stdenv.mkDerivation rec {

88 pname = "upwork";

9− version = "5.6.10.7";

9+ version = "5.6.10.13";

1010

1111 src = fetchurl {

12− url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";

13− sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";

12+ url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";

13+ sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";

1414 };

1515

1616 nativeBuildInputs = [

pkgs/applications/misc/xpdf/default.nix+2−2

@@ -12,11 +12,11 @@ assert enablePrinting -> cups != null;

1212

1313stdenv.mkDerivation rec {

1414 pname = "xpdf";

15− version = "4.03";

15+ version = "4.04";

1616

1717 src = fetchzip {

1818 url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz";

19− sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6";

19+ hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY=";

2020 };

2121

2222 # Fix "No known features for CXX compiler", see

pkgs/applications/networking/browsers/brave/default.nix+8−5

@@ -49,6 +49,9 @@

4949, pulseSupport ? stdenv.isLinux

5050, libpulseaudio

5151

52+# For GPU acceleration support on Wayland (without the lib it doesn't seem to work)

53+, libGL

54+

5255# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)

5356, libvaSupport ? stdenv.isLinux

5457, libva

@@ -66,7 +69,7 @@ let

6669

6770 deps = [

6871 alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat

69− fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11

72+ fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL

7073 libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

7174 libXext libXfixes libXi libXrandr libXrender libxshmfence

7275 libXtst libuuid mesa nspr nss pango pipewire udev wayland

@@ -128,9 +131,9 @@ stdenv.mkDerivation rec {

128131 ln -sf $BINARYWRAPPER $out/bin/brave

129132

130133 for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do

131− patchelf \

132− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

133− --set-rpath "${rpath}" $exe

134+ patchelf \

135+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

136+ --set-rpath "${rpath}" $exe

134137 done

135138

136139 # Fix paths

@@ -170,10 +173,10 @@ stdenv.mkDerivation rec {

170173 ${optionalString (disableFeatures != []) ''

171174 --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"

172175 ''}

173− --add-flags ${escapeShellArg commandLineArgs}

174176 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"

175177 ${optionalString vulkanSupport ''

176178 --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"

179+ --add-flags ${escapeShellArg commandLineArgs}

177180 ''}

178181 )

179182 '';

pkgs/applications/networking/browsers/chromium/upstream-info.json+5−5

@@ -45,9 +45,9 @@

4545 }

4646 },

4747 "ungoogled-chromium": {

48− "version": "101.0.4951.41",

49− "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",

50− "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",

48+ "version": "101.0.4951.54",

49+ "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",

50+ "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",

5151 "deps": {

5252 "gn": {

5353 "version": "2022-03-14",

@@ -56,8 +56,8 @@

5656 "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"

5757 },

5858 "ungoogled-patches": {

59− "rev": "101.0.4951.41-1",

60− "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"

59+ "rev": "101.0.4951.54-1",

60+ "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"

6161 }

6262 }

6363 }

pkgs/applications/networking/browsers/microsoft-edge/default.nix+6−6

@@ -1,20 +1,20 @@

11{

22 beta = import ./browser.nix {

33 channel = "beta";

4− version = "99.0.1150.16";

4+ version = "101.0.1210.19";

55 revision = "1";

6− sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";

6+ sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";

77 };

88 dev = import ./browser.nix {

99 channel = "dev";

10− version = "100.0.1163.1";

10+ version = "102.0.1227.0";

1111 revision = "1";

12− sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";

12+ sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";

1313 };

1414 stable = import ./browser.nix {

1515 channel = "stable";

16− version = "98.0.1108.56";

16+ version = "100.0.1185.44";

1717 revision = "1";

18− sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";

18+ sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";

1919 };

2020}

pkgs/applications/networking/cloudflared/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "cloudflared";

5− version = "2022.4.1";

5+ version = "2022.5.0";

77 src = fetchFromGitHub {

88 owner = "cloudflare";

99 repo = "cloudflared";

1010 rev = version;

11− hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";

11+ hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";

1212 };

1313

1414 vendorSha256 = null;

pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+3−3

@@ -1,13 +1,13 @@

11{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:

22let

3− ver = "1.2.54.0";

3+ ver = "1.2.312.0";

44 source =

55 if stdenv.isDarwin then {

66 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";

7− sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";

7+ sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";

88 } else {

99 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";

10− sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";

10+ sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";

1111 };

1212 archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";

1313in

pkgs/applications/networking/firewalld/default.nix+2−2

@@ -12,7 +12,7 @@

1212, libnotify

1313, libxml2

1414, libxslt

15−, networkmanager-applet

15+, networkmanagerapplet

1616, pkg-config

1717, python3

1818, wrapGAppsNoGuiHook

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {

5454 done

5555 '' + lib.optionalString withGui ''

5656 substituteInPlace src/firewall-applet.in \

57− --replace "/usr/bin/nm-connection-editor" "${networkmanager-applet}/bin/nm-conenction-editor"

57+ --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"

5858 '';

5959

6060 nativeBuildInputs = [

pkgs/applications/networking/instant-messengers/caprine-bin/default.nix+3−3

@@ -1,7 +1,7 @@

11{ lib, callPackage, stdenvNoCC }:

22let

33 pname = "caprine";

4− version = "2.55.2";

4+ version = "2.55.4";

55 metaCommon = with lib; {

66 description = "An elegant Facebook Messenger desktop app";

77 homepage = "https://sindresorhus.com/caprine";

@@ -10,11 +10,11 @@ let

1010 };

1111 x86_64-appimage = callPackage ./build-from-appimage.nix {

1212 inherit pname version metaCommon;

13− sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4=";

13+ sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";

1414 };

1515 x86_64-dmg = callPackage ./build-from-dmg.nix {

1616 inherit pname version metaCommon;

17− sha256 = "du/9N1BFq1s7spPiEDgDbjjcnkA0x1ExhAEpQvmO3aA=";

17+ sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";

1818 };

1919in

2020(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {

pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2

@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;

4343

4444mkDerivation rec {

4545 pname = "psi-plus";

46− version = "1.5.1615";

46+ version = "1.5.1618";

4747

4848 src = fetchFromGitHub {

4949 owner = "psi-plus";

5050 repo = "psi-plus-snapshots";

5151 rev = version;

52− sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI=";

52+ sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A=";

5353 };

5454

5555 cmakeFlags = [

pkgs/applications/networking/irc/senpai/default.nix+4−4

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "senpai";

5− version = "unstable-2021-12-14";

5+ version = "unstable-2022-04-29";

77 src = fetchFromSourcehut {

88 owner = "~taiite";

99 repo = "senpai";

10− rev = "8091752a67781273944e7a79a803b7a671378313";

11− sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I=";

10+ rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";

11+ sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg=";

1212 };

1313

14− vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";

14+ vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";

1515

1616 subPackages = [

1717 "cmd/senpai"

pkgs/applications/networking/modem-manager-gui/default.nix+15

@@ -2,6 +2,7 @@

22, pkg-config

33, python3

44, fetchFromGitLab

5+, fetchpatch

56, gtk3

67, glib

78, gdbm

@@ -44,6 +45,20 @@ stdenv.mkDerivation rec {

4445 libayatana-appindicator-gtk3

4546 ];

4647

48+ patches = [

49+ # Fix missing tray icon

50+ (fetchpatch {

51+ url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch";

52+ sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8=";

53+ })

54+ # Fix build with meson 0.61

55+ # appdata/meson.build:3:5: ERROR: Function does not take positional arguments.

56+ (fetchpatch {

57+ url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch";

58+ sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";

59+ })

60+ ];

61+

4762 postPatch = ''

4863 patchShebangs man/manhelper.py

4964 '';

pkgs/applications/networking/newsreaders/liferea/default.nix+2−2

@@ -23,11 +23,11 @@

2323

2424stdenv.mkDerivation rec {

2525 pname = "liferea";

26− version = "1.12.9";

26+ version = "1.13.8";

2727

2828 src = fetchurl {

2929 url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";

30− sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q";

30+ sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h";

3131 };

3232

3333 nativeBuildInputs = [

pkgs/applications/networking/p2p/twister/default.nixdeleted−70

@@ -1,70 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2

2−, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly

3−}:

4−

5−let

6− twisterHTML = srcOnly {

7− name = "twister-html";

8− src = fetchFromGitHub {

9− owner = "miguelfreitas";

10− repo = "twister-html";

11− rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";

12− sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";

13− };

14− };

15−

16− boostPython = boost.override {

17− enablePython = true;

18− python = python2;

19− };

20−

21−in stdenv.mkDerivation rec {

22− pname = "twister";

23− version = "2019-08-19";

24−

25− src = fetchFromGitHub {

26− owner = "miguelfreitas";

27− repo = "twister-core";

28− rev = "31faf3f63e461ea0a9b23081567a4a552cf06873";

29− sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp";

30− };

31−

32− configureFlags = [

33− "--with-libgeoip"

34− "--with-libiconv"

35− "--disable-deprecated-functions"

36− "--enable-tests"

37− "--enable-python-binding"

38− "--with-boost-libdir=${boostPython.out}/lib"

39− ];

40−

41− nativeBuildInputs = [ pkg-config automake autoconf ];

42− buildInputs = [

43− libtool python2

44− boostPython db openssl geoip miniupnpc libiconv

45− ];

46−

47− postPatch = ''

48− sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \

49− src/init.cpp

50− sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \

51− src/util.cpp

52− '';

53−

54− preConfigure = ''

55− sh autotool.sh

56− '';

57−

58− installPhase = ''

59− install -vD twisterd "$out/bin/twisterd"

60− '';

61−

62− enableParallelBuilding = true;

63−

64− meta = {

65− homepage = "http://www.twister.net.co/";

66− description = "Peer-to-peer microblogging";

67− license = lib.licenses.mit;

68− platforms = lib.platforms.linux;

69− };

70−}

pkgs/applications/networking/seafile-client/default.nix+3−1

@@ -9,7 +9,9 @@ mkDerivation rec {

99 src = fetchFromGitHub {

1010 owner = "haiwen";

1111 repo = "seafile-client";

12− rev = "v${version}";

12+ # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state

13+ # that fails to link properly

14+ rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd";

1315 sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

1416 };

1517

pkgs/applications/networking/sync/onedrive/default.nix+2−2

@@ -14,13 +14,13 @@

1414

1515stdenv.mkDerivation rec {

1616 pname = "onedrive";

17− version = "2.4.16";

17+ version = "2.4.17";

1818

1919 src = fetchFromGitHub {

2020 owner = "abraunegg";

2121 repo = pname;

2222 rev = "v${version}";

23− sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I=";

23+ hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA=";

2424 };

2525

2626 nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

pkgs/applications/networking/zerobin/default.nix+1−1

@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {

4040 # relax version constraints of some dependencies

4141 substituteInPlace setup.cfg \

4242 --replace "clize==4.1.1" "clize" \

43− --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \

43+ --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \

4444 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \

4545 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"

4646 '';

pkgs/applications/office/qownnotes/default.nix+2−2

@@ -5,13 +5,13 @@

66mkDerivation rec {

77 pname = "qownnotes";

8− version = "22.4.1";

8+ version = "22.5.0";

1010 src = fetchurl {

1111 url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";

1212 # Fetch the checksum of current version with curl:

1313 # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256

14− sha256 = "b9ce77ecd5bb48bd6534068b0582dfaa3b828f800b19ddec80387a84e00766da";

14+ sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd";

1515 };

1616

1717 nativeBuildInputs = [ qmake qttools ];

pkgs/applications/science/biology/bwa/default.nix+2

@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {

1717 sed -i '/^CC/d' Makefile

1818 '';

1919

20+ makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

21+

2022 # it's unclear which headers are intended to be part of the public interface

2123 # so we may find ourselves having to add more here over time

2224 installPhase = ''

pkgs/applications/science/biology/megahit/default.nix+3

@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {

1414 nativeBuildInputs = [ cmake ];

1515 buildInputs = [ zlib ];

1616

17+ cmakeFlags = lib.optional stdenv.hostPlatform.isStatic [

18+ "-DSTATIC_BUILD=ON"

19+ ];

1720 meta = with lib; {

1821 description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";

1922 license = licenses.gpl3;

pkgs/applications/science/biology/samtools/default.nix+8−1

@@ -22,8 +22,15 @@ stdenv.mkDerivation rec {

2222

2323 buildInputs = [ zlib ncurses htslib ];

2424

25+ preConfigure = lib.optional stdenv.hostPlatform.isStatic ''

26+ export LIBS="-lz -lbz2 -llzma"

27+ '';

28+ makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

29+

2530 configureFlags = [ "--with-htslib=${htslib}" ]

26− ++ lib.optional (ncurses == null) "--without-curses";

31+ ++ lib.optional (ncurses == null) "--without-curses"

32+ ++ lib.optional stdenv.hostPlatform.isStatic ["--without-curses" ]

33+ ;

2734

2835 preCheck = ''

2936 patchShebangs test/

pkgs/applications/science/logic/easycrypt/default.nixnew file+50

@@ -0,0 +1,50 @@

1+{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }:

3+stdenv.mkDerivation rec {

4+ pname = "easycrypt";

5+ version = "2022.04";

7+ src = fetchFromGitHub {

8+ owner = pname;

9+ repo = pname;

10+ rev = "r${version}";

11+ sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7";

12+ };

13+

14+ nativeBuildInputs = with ocamlPackages; [

15+ dune_3

16+ findlib

17+ menhir

18+ ocaml

19+ ];

20+ buildInputs = with ocamlPackages; [

21+ batteries

22+ dune-build-info

23+ inifiles

24+ yojson

25+ zarith

26+ ];

27+

28+ propagatedBuildInputs = [ why3 ];

29+

30+ strictDeps = true;

31+

32+ postPatch = ''

33+ substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})'

34+ '';

35+

36+ installPhase = ''

37+ runHook preInstall

38+ dune install --prefix $out ${pname}

39+ rm $out/bin/ec-runtest

40+ runHook postInstall

41+ '';

42+

43+ meta = {

44+ license = lib.licenses.mit;

45+ maintainers = [ lib.maintainers.vbgl ];

46+ platforms = lib.platforms.all;

47+ homepage = "https://easycrypt.info/";

48+ description = "Computer-Aided Cryptographic Proofs";

49+ };

50+}

pkgs/applications/science/logic/easycrypt/runtest.nixnew file+24

@@ -0,0 +1,24 @@

1+{ python3Packages, easycrypt }:

3+python3Packages.buildPythonApplication rec {

4+ inherit (easycrypt) src version;

6+ pname = "easycrypt-runtest";

8+ dontConfigure = true;

9+ dontBuild = true;

10+ doCheck = false;

11+

12+ pythonPath = with python3Packages; [ pyyaml ];

13+

14+ installPhase = ''

15+ runHook preInstall

16+ mkdir -p $out/bin

17+ cp scripts/testing/runtest $out/bin/ec-runtest

18+ runHook postInstall

19+ '';

20+

21+ meta = easycrypt.meta // {

22+ description = "Testing program for EasyCrypt formalizations";

23+ };

24+}

pkgs/applications/science/misc/snakemake/default.nix+3−3

@@ -5,14 +5,14 @@

66python3.pkgs.buildPythonApplication rec {

77 pname = "snakemake";

8− version = "7.5.0";

8+ version = "7.6.1";

99 format = "setuptools";

1010

1111 src = fetchFromGitHub {

1212 owner = "snakemake";

1313 repo = pname;

14− rev = "v${version}";

15− hash = "sha256-KIKuV6DVHn3dDY/rJG1zNWM79tdDB6GGVH9/kYn6XaE=";

14+ rev = "refs/tags/v${version}";

15+ hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM=";

1616 };

1717

1818 propagatedBuildInputs = with python3.pkgs; [

pkgs/applications/video/vlc/default.nix+2−2

@@ -82,11 +82,11 @@ let

8282in

8383stdenv.mkDerivation rec {

8484 pname = "${optionalString onlyLibVLC "lib"}vlc";

85− version = "3.0.17";

85+ version = "3.0.17.3";

8686

8787 src = fetchurl {

8888 url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";

89− sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA=";

89+ sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ=";

9090 };

9191

9292 # VLC uses a *ton* of libraries for various pieces of functionality, many of

pkgs/desktops/gnome/core/gnome-control-center/default.nix+2−3

@@ -42,7 +42,7 @@

4242, modemmanager

4343, mutter

4444, networkmanager

45−, networkmanager-applet

45+, networkmanagerapplet

4646, libnma-gtk4

4747, ninja

4848, pkg-config

@@ -76,9 +76,8 @@ stdenv.mkDerivation rec {

7676 src = ./paths.patch;

7777 gcm = gnome-color-manager;

7878 gnome_desktop = gnome-desktop;

79− networkmanagerapplet = networkmanager-applet;

8079 inherit glibc libgnomekbd tzdata;

81− inherit cups;

80+ inherit cups networkmanagerapplet;

8281 })

8382

8483 # Fix Online Accounts configuration on X11

pkgs/desktops/gnome/default.nix+1−1

@@ -379,7 +379,7 @@ lib.makeScope pkgs.newScope (self: with self; {

379379

380380 dconf = throw "The ‘gnome.dconf’ alias was removed on 2022-01-13. Please use ‘pkgs.dconf’ directly."; # added 2019-11-30

381381

382− networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanager-applet’ directly."; # added 2019-12-12

382+ networkmanagerapplet = throw "The ‘gnome.networkmanagerapplet’ alias was removed on 2022-01-13. Please use ‘pkgs.networkmanagerapplet’ directly."; # added 2019-12-12

383383

384384 glade = throw "The ‘gnome.glade’ alias was removed on 2022-01-13. Please use ‘pkgs.glade’ directly."; # added 2020-05-15

385385

pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix+2−2

@@ -11,7 +11,7 @@

1111, granite

1212, gtk3

1313, networkmanager

14−, networkmanager-applet

14+, networkmanagerapplet

1515, libnma

1616, switchboard

1717}:

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

3030 patches = [

3131 (substituteAll {

3232 src = ./fix-paths.patch;

33− networkmanagerapplet = networkmanager-applet;

33+ inherit networkmanagerapplet;

3434 })

3535 ];

3636

pkgs/development/compilers/hare/hare.nix+2

@@ -68,6 +68,8 @@ stdenv.mkDerivation rec {

6868 "PREFIX=${placeholder "out"}"

6969 ];

7070

71+ doCheck = true;

72+

7173 postInstall =

7274 let

7375 binPath = lib.makeBinPath [

pkgs/development/compilers/purescript/purescript/default.nix+2−4

@@ -1,4 +1,4 @@

1−{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }:

1+{ stdenv, pkgs, fetchurl, zlib, gmp, lib }:

33# from justinwoo/easy-purescript-nix

44# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix

@@ -35,9 +35,7 @@ in stdenv.mkDerivation rec {

3535 };

3636

3737

38− buildInputs = [ zlib

39− gmp

40− ncurses5 ];

38+ buildInputs = [ zlib gmp ];

4139 libPath = lib.makeLibraryPath buildInputs;

4240 dontStrip = true;

4341

pkgs/development/interpreters/pixie/default.nixdeleted−94

@@ -1,94 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,

2− pypy, libffi, libedit, libuv, boost, zlib,

3− variant ? "jit", buildWithPypy ? false }:

4−

5−let

6− commit-count = "1364";

7− common-flags = "--thread --gcrootfinder=shadowstack --continuation";

8− variants = {

9− jit = { flags = "--opt=jit"; target = "target.py"; };

10− jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };

11− no-jit = { flags = ""; target = "target.py"; };

12− no-jit-preload = { flags = ""; target = "target_preload.py"; };

13− };

14− pixie-src = fetchFromGitHub {

15− owner = "pixie-lang";

16− repo = "pixie";

17− rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";

18− sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";

19− };

20− pypy-tag = "91db1a9";

21− pypy-src = fetchurl {

22− name = "pypy-src-${pypy-tag}";

23− url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";

24− sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";

25− };

26− libs = [ libffi libedit libuv boost.dev boost.out zlib ];

27− include-path = lib.concatStringsSep ":"

28− (map (p: "${p}/include") libs);

29− library-path = lib.concatStringsSep ":"

30− (map (p: "${p}/lib") libs);

31− bin-path = lib.concatStringsSep ":"

32− (map (p: "${p}/bin") [ gcc ]);

33− build = {flags, target}: stdenv.mkDerivation rec {

34− pname = "pixie";

35− version = "0-r${commit-count}-${variant}";

36− nativeBuildInputs = [ makeWrapper pkg-config ];

37− buildInputs = libs;

38− PYTHON = if buildWithPypy

39− then "${pypy}/pypy-c/pypy-c"

40− else python2.interpreter;

41− unpackPhase = ''

42− cp -R ${pixie-src} pixie-src

43− mkdir pypy-src

44− (cd pypy-src

45− tar --strip-components=1 -xjf ${pypy-src})

46− chmod -R +w pypy-src pixie-src

47− '';

48− patchPhase = ''

49− (cd pixie-src

50− patch -p1 < ${./load_paths.patch}

51− libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'

52− export libraryPaths

53− substituteAllInPlace ./pixie/ffi-infer.pxi)

54− '';

55− buildPhase = ''(

56− PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";

57− RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";

58− cd pixie-src

59− $PYTHON $RPYTHON ${common-flags} ${target}

60− find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;

61− )'';

62− LD_LIBRARY_PATH = library-path;

63− C_INCLUDE_PATH = include-path;

64− LIBRARY_PATH = library-path;

65− PATH = bin-path;

66− installPhase = ''

67− mkdir -p $out/share $out/bin

68− cp pixie-src/pixie-vm $out/share/pixie-vm

69− cp -R pixie-src/pixie $out/share/pixie

70− makeWrapper $out/share/pixie-vm $out/bin/pixie \

71− --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \

72− --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \

73− --prefix LIBRARY_PATH : ${LIBRARY_PATH} \

74− --prefix PATH : ${PATH}

75− '';

76− doCheck = true;

77− checkPhase = ''

78− RES=$(./pixie-src/pixie-vm -e "(print :ok)")

79− if [ "$RES" != ":ok" ]; then

80− echo "ERROR Unexpected output: '$RES'"

81− return 1

82− else

83− echo "$RES"

84− fi

85− '';

86− meta = {

87− description = "A clojure-like lisp, built with the pypy vm toolkit";

88− homepage = "https://github.com/pixie-lang/pixie";

89− license = lib.licenses.lgpl3;

90− platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];

91− maintainers = with lib.maintainers; [ bendlas ];

92− };

93− };

94−in build (builtins.getAttr variant variants)

pkgs/development/interpreters/pixie/dust.nixdeleted−46

@@ -1,46 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub

2−, pixie, rlwrap

3−}:

4−

5−stdenv.mkDerivation rec {

6− pname = "dust";

7− version = "0-91";

8−

9− src = fetchFromGitHub {

10− owner = "pixie-lang";

11− repo = "dust";

12− rev = "efe469661e749a71e86858fd006f61464810575a";

13− sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";

14− };

15−

16− buildInputs = [ pixie ];

17−

18− patches = [ ./make-paths-configurable.patch ];

19−

20− configurePhase = ''

21− pixiePath="${pixie}/bin/pixie" \

22− basePath="$out/share/dust" \

23− rlwrapPath="${rlwrap}/bin/rlwrap" \

24− substituteAll dust.in dust

25− chmod +x dust

26− '';

27−

28− # FIXME: AOT for dust

29− # buildPhase = ''

30− # find . -name "*.pxi" -exec pixie-vm -c {} \;

31− # '';

32−

33− installPhase = ''

34− mkdir -p $out/bin $out/share/dust

35− cp -a src/ run.pxi $out/share/dust

36− mv dust $out/bin/dust

37− '';

38−

39− meta = with lib; {

40− description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";

41− homepage = src.meta.homepage;

42− maintainers = with maintainers; [ ];

43− license = licenses.lgpl3;

44− platforms = platforms.unix;

45− };

46−}

pkgs/development/interpreters/pixie/load_paths.patchdeleted−25

@@ -1,25 +0,0 @@

1−diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi

2−index 9f13ac7..74301c2 100644

3−--- a/pixie/ffi-infer.pxi

4−+++ b/pixie/ffi-infer.pxi

5−@@ -1,15 +1,12 @@

6− (ns pixie.ffi-infer

7− (:require [pixie.io-blocking :as io]))

8−

9−+(defn -add-library-path [p]

10−+ (swap! load-paths conj (str p "/include"))

11−+ (swap! load-paths conj (str p "/lib")))

12−

13−-(defn -add-rel-path [rel]

14−- (swap! load-paths conj (str (first @load-paths) "/" rel)))

15−-

16−-(-add-rel-path "lib")

17−-(-add-rel-path "include")

18−-(-add-rel-path "../lib")

19−-(-add-rel-path "../include")

20−-

21−+(doseq [lp @libraryPaths@]

22−+ (-add-library-path lp))

23−

24− (def *config* nil)

25− (set-dynamic! (var *config*))

pkgs/development/interpreters/pixie/make-paths-configurable.patchdeleted−119

@@ -1,119 +0,0 @@

1−From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001

2−From: Herwig Hochleitner <herwig@bendlas.net>

3−Date: Sun, 28 Feb 2016 16:34:14 +0100

4−Subject: [PATCH] make paths configurable

5−

6−---

7− dust | 52 ----------------------------------------------------

8− dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++

9− 2 files changed, 43 insertions(+), 52 deletions(-)

10− delete mode 100755 dust

11− create mode 100755 dust.in

12−

13−diff --git a/dust b/dust

14−deleted file mode 100755

15−index ffced9b..0000000

16−--- a/dust

17−+++ /dev/null

18−@@ -1,52 +0,0 @@

19−-#!/usr/bin/env bash

20−-

21−-base_path=$0

22−-if [ -L "$base_path" ]; then

23−- base_path=`readlink $base_path`

24−-fi

25−-base_path=`dirname $base_path`

26−-

27−-pixie_path=`which pixie-vm`

28−-if [ -z "$pixie_path" ]; then

29−- echo "Error: 'pixie-vm' must be on your PATH"

30−- exit 1

31−-fi

32−-

33−-function set_load_path() {

34−- load_path=""

35−- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then

36−- load_path="`cat .load-path`"

37−- fi

38−-}

39−-

40−-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then

41−- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."

42−- echo "To start you can run the following command:"

43−- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"

44−- echo

45−-fi

46−-

47−-set_load_path

48−-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"

49−-

50−-case $1 in

51−- ""|"repl")

52−- rlwrap_cmd=""

53−- if [ -n "`which rlwrap`" ]; then

54−- rlwrap_cmd="rlwrap -aignored -n"

55−- fi

56−- $rlwrap_cmd $pixie_path $load_path

57−- ;;

58−- "run")

59−- shift

60−- file=$1

61−- shift

62−- $pixie_path $load_path $file $@

63−- ;;

64−- -h|--help)

65−- $run_dust help

66−- ;;

67−- *)

68−- $run_dust $@

69−- ;;

70−-esac

71−diff --git a/dust.in b/dust.in

72−new file mode 100755

73−index 0000000..44a7fbd

74−--- /dev/null

75−+++ b/dust.in

76−@@ -0,0 +1,40 @@

77−+#!/usr/bin/env bash

78−+

79−+base_path=@basePath@

80−+pixie_path=@pixiePath@

81−+rlwrap_cmd=@rlwrapPath@

82−+

83−+function set_load_path() {

84−+ load_path=""

85−+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then

86−+ load_path="`cat .load-path`"

87−+ fi

88−+}

89−+

90−+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then

91−+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."

92−+ echo "To start you can run the following command:"

93−+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"

94−+ echo

95−+fi

96−+

97−+set_load_path

98−+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"

99−+

100−+case $1 in

101−+ ""|"repl")

102−+ $rlwrap_cmd -aignored -n $pixie_path $load_path

103−+ ;;

104−+ "run")

105−+ shift

106−+ file=$1

107−+ shift

108−+ $pixie_path $load_path $file $@

109−+ ;;

110−+ -h|--help)

111−+ $run_dust help

112−+ ;;

113−+ *)

114−+ $run_dust $@

115−+ ;;

116−+esac

117−--

118−2.7.1

119−

pkgs/development/libraries/docopt_cpp/default.nix+10−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, cmake, python2 }:

1+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }:

33stdenv.mkDerivation rec {

44 version = "0.6.3";

@@ -11,7 +11,15 @@ stdenv.mkDerivation rec {

1111 sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";

1212 };

1313

14− nativeBuildInputs = [ cmake python2 ];

14+ patches = [

15+ (fetchpatch {

16+ name = "python3-for-tests";

17+ url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch";

18+ hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o=";

19+ })

20+ ];

21+

22+ nativeBuildInputs = [ cmake python3 ];

1523

1624 cmakeFlags = ["-DWITH_TESTS=ON"];

1725

pkgs/development/libraries/goocanvas/2.x.nix+2−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }:

1+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }:

33stdenv.mkDerivation rec {

44 pname = "goocanvas";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";

1212 };

1313

14− nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];

14+ nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ];

1515 buildInputs = [ gtk3 cairo glib gobject-introspection ];

1616

1717 configureFlags = [

pkgs/development/libraries/libdeltachat/default.nix+3−3

@@ -16,13 +16,13 @@

1616

1717stdenv.mkDerivation rec {

1818 pname = "libdeltachat";

19− version = "1.78.0";

19+ version = "1.79.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "deltachat";

2323 repo = "deltachat-core-rust";

2424 rev = version;

25− hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";

25+ hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ=";

2626 };

2727

2828 patches = [

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

3232 cargoDeps = rustPlatform.fetchCargoTarball {

3333 inherit src;

3434 name = "${pname}-${version}";

35− hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";

35+ hash = "sha256-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU=";

3636 };

3737

3838 nativeBuildInputs = [

pkgs/development/libraries/libinjection/default.nix+12−4

@@ -1,5 +1,5 @@

1−{ lib, stdenv, fetchFromGitHub

2−, python2

1+{ lib, stdenv, fetchFromGitHub, fetchpatch

2+, python3

33}:

55stdenv.mkDerivation rec {

@@ -13,11 +13,19 @@ stdenv.mkDerivation rec {

1313 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";

1414 };

1515

16− nativeBuildInputs = [ python2 ];

16+ nativeBuildInputs = [ python3 ];

1717

1818 strictDeps = true;

1919

20− patchPhase = ''

20+ patches = [

21+ (fetchpatch {

22+ name = "support-python3-for-building";

23+ url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff";

24+ hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM=";

25+ })

26+ ];

27+

28+ postPatch = ''

2129 patchShebangs src

2230 substituteInPlace src/Makefile \

2331 --replace /usr/local $out

pkgs/development/libraries/science/biology/htslib/default.nix+18−2

@@ -14,9 +14,25 @@ stdenv.mkDerivation rec {

1414

1515 buildInputs = [ zlib bzip2 xz curl ];

1616

17− configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended

17+ configureFlags = if ! stdenv.hostPlatform.isStatic

18+ then [ "--enable-libcurl" ] # optional but strongly recommended

19+ else [ "--disable-libcurl" "--disable-plugins" ];

1820

19− installFlags = [ "prefix=$(out)" ];

21+

22+ # In the case of static builds, we need to replace the build and install phases

23+ buildPhase = lib.optional stdenv.hostPlatform.isStatic ''

24+ make AR=$AR lib-static

25+ make LDFLAGS=-static bgzip htsfile tabix

26+ '';

27+

28+ installPhase = lib.optional stdenv.hostPlatform.isStatic ''

29+ install -d $out/bin

30+ install -d $out/lib

31+ install -d $out/include/htslib

32+ install -D libhts.a $out/lib

33+ install -m644 htslib/*h $out/include/htslib

34+ install -D bgzip htsfile tabix $out/bin

35+ '';

2036

2137 preCheck = ''

2238 patchShebangs test/

pkgs/development/libraries/science/math/caffe2/default.nixdeleted−151

@@ -1,151 +0,0 @@

1−{ stdenv, lib, config, fetchFromGitHub

2−, cmake

3−, glog, gflags, gtest

4−, protobuf, snappy

5−, python, future, six, python-protobuf, numpy, pydot

6−, eigen

7−, doxygen

8−, useCuda ? (config.cudaSupport or false), cudaPackages ? {}

9−, useCudnn ? (config.cudnnSupport or false)

10−, useOpenmp ? false, openmp ? null

11−, useOpencv3 ? true, opencv3 ? null

12−, useLeveldb ? false, leveldb ? null

13−, useLmdb ? true, lmdb ? null

14−, useRocksdb ? false, rocksdb ? null

15−, useZeromq ? false, zeromq ? null

16−, useMpi ? false, mpi ? null

17−# TODO: distributed computations

18−#, useGloo ? false

19−#, useNccl ? false

20−#, useNnpack ? false

21−}:

22−

23−let

24− inherit (cudaPackages) cudatoolkit cudnn;

25−in

26−

27−assert useCuda -> cudatoolkit != null;

28−assert useCudnn -> (useCuda && cudnn != null);

29−assert useOpencv3 -> opencv3 != null;

30−assert useLeveldb -> leveldb != null;

31−assert useLmdb -> lmdb != null;

32−assert useRocksdb -> rocksdb != null;

33−assert useZeromq -> zeromq != null;

34−assert useMpi -> mpi != null;

35−

36−let

37− # Third party modules that caffe2 holds as git submodules.

38− # Download them and create symlinks from caffe2/third_party.

39− installExtraSrc = extra: ''

40− rmdir "third_party/${extra.dst}"

41− ln -s "${extra.src}" "third_party/${extra.dst}"

42− '';

43−

44− cub = {

45− src = fetchFromGitHub {

46− owner = "NVlabs";

47− repo = "cub";

48− rev = "v1.7.4";

49− sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66";

50− };

51− dst = "cub";

52− };

53−

54− pybind11 = {

55− src = fetchFromGitHub {

56− owner = "pybind";

57− repo = "pybind11";

58− rev = "86e2ad4f77442c3350f9a2476650da6bee253c52";

59− sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz";

60− };

61− dst = "pybind11";

62− };

63−

64− ccVersion = lib.getVersion stdenv.cc;

65−in

66−

67−stdenv.mkDerivation rec {

68− pname = "caffe2";

69− version = "0.8.1";

70− src = fetchFromGitHub {

71− owner = "caffe2";

72− repo = "caffe2";

73− rev = "v${version}";

74− sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8";

75− };

76−

77− nativeBuildInputs = [ cmake doxygen gtest ];

78− outputs = [ "bin" "out" ];

79− propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle

80−

81− buildInputs = [ glog gflags protobuf snappy eigen ]

82− ++ lib.optional useCuda cudatoolkit

83− ++ lib.optional useCudnn cudnn

84− ++ lib.optional useOpenmp openmp

85− ++ lib.optional useOpencv3 opencv3

86− ++ lib.optional useLeveldb leveldb

87− ++ lib.optional useLmdb lmdb

88− ++ lib.optional useRocksdb rocksdb

89− ++ lib.optional useZeromq zeromq

90− ;

91− propagatedBuildInputs = [ numpy future six python-protobuf pydot ];

92−

93− patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [

94− ./fix_compilation_on_gcc7.patch

95− ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];

96−

97− cmakeFlags = [ "-DBUILD_TEST=OFF"

98− "-DBUILD_PYTHON=ON"

99− ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}''

100− ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}''

101− ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}''

102− ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}''

103− ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}''

104− ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}''

105− ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}''

106− ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}''

107− "-DUSE_GLOO=OFF"

108− "-DUSE_NNPACK=OFF"

109− "-DUSE_NCCL=OFF"

110− "-DUSE_REDIS=OFF"

111− "-DUSE_FFMPEG=OFF"

112− ]

113− ++ lib.optional useCuda [

114− "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}"

115− "-DCUDA_FAST_MATH=ON"

116− "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"

117− ];

118−

119− preConfigure = ''

120− ${installExtraSrc cub}

121− ${installExtraSrc pybind11}

122− # XXX hack

123− export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE"

124− '';

125−

126− postInstall = ''

127− moveToOutput "bin" "$bin"

128− mkdir -p $out/lib/${python.libPrefix}

129− ln -s $out/ $out/${python.sitePackages}

130− '';

131−

132− doCheck = false;

133−

134− meta = {

135− homepage = "https://caffe2.ai/";

136− description = "A new lightweight, modular, and scalable deep learning framework";

137− longDescription = ''

138− Caffe2 aims to provide an easy and straightforward way for you to experiment

139− with deep learning and leverage community contributions of new models and

140− algorithms. You can bring your creations to scale using the power of GPUs in the

141− cloud or to the masses on mobile with Caffe2's cross-platform libraries.

142− '';

143− platforms = with lib.platforms; linux;

144− license = lib.licenses.asl20;

145− maintainers = with lib.maintainers; [ yuriaisaka ];

146− # fails to compile with

147− # error: invalid conversion from 'const char*' to 'char*'

148− # TODO: Remove usage of python2, protobuf overwrite

149− broken = true;

150− };

151−}

pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patchdeleted−46

@@ -1,46 +0,0 @@

1−diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc

2−index dd4fded..5995e8a 100644

3−--- a/caffe2/operators/recurrent_network_op.cc

4−+++ b/caffe2/operators/recurrent_network_op.cc

5−@@ -1,4 +1,4 @@

6−-#include "recurrent_network_op.h"

7−+#include "caffe2/operators/recurrent_network_op.h"

8− #include "caffe2/core/workspace.h"

9−

10− namespace caffe2 {

11−diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h

12−index 55328e5..ea898bc 100644

13−--- a/caffe2/operators/recurrent_network_op.h

14−+++ b/caffe2/operators/recurrent_network_op.h

15−@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator<Context> {

16− USE_OPERATOR_CONTEXT_FUNCTIONS;

17−

18− bool RunOnDevice() override {

19−- const auto t =

20−- OperatorBase::Input<Tensor<CPUContext>>(0).template data<int32_t>()[0];

21−+ const auto& t0 = OperatorBase::Input<Tensor<CPUContext>>(0);

22−+ const auto t = t0.template data<int32_t>()[0];

23− auto& og = Input(1);

24− auto* g = Output(0);

25−

26−diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h

27−index f2c0a33..642343f 100644

28−--- a/caffe2/queue/queue_ops.h

29−+++ b/caffe2/queue/queue_ops.h

30−@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator<Context> {

31− name(operator_def.output().Get(0)) {}

32−

33− bool RunOnDevice() override {

34−- const auto capacity =

35−- OperatorBase::template GetSingleArgument<int>("capacity", 1);

36−- const auto numBlobs =

37−- OperatorBase::template GetSingleArgument<int>("num_blobs", 1);

38−+ const auto capacity = GetSingleArgument("capacity", 1);

39−+ const auto numBlobs = GetSingleArgument("num_blobs", 1);

40− const auto enforceUniqueName =

41−- OperatorBase::template GetSingleArgument<int>(

42−- "enforce_unique_name", false);

43−+ GetSingleArgument("enforce_unique_name", false);

44− const auto fieldNames =

45− OperatorBase::template GetRepeatedArgument<std::string>("field_names");

46− CAFFE_ENFORCE_EQ(this->OutputSize(), 1);

pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patchdeleted−55

@@ -1,55 +0,0 @@

1−diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h

2−index bd06681..00172b7 100644

3−--- a/caffe2/perfkernels/cvtsh_ss_bugfix.h

4−+++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h

5−@@ -1,10 +1,36 @@

6−+/**

8−+ *

9−+ * Licensed under the Apache License, Version 2.0 (the "License");

10−+ * you may not use this file except in compliance with the License.

11−+ * You may obtain a copy of the License at

12−+ *

13−+ * http://www.apache.org/licenses/LICENSE-2.0

14−+ *

15−+ * Unless required by applicable law or agreed to in writing, software

16−+ * distributed under the License is distributed on an "AS IS" BASIS,

17−+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

18−+ * See the License for the specific language governing permissions and

19−+ * limitations under the License.

20−+ */

21−+

22− #pragma once

23−

24−-#if defined(__APPLE__) && (__clang_major__ < 8)

25−+// Apple clang was fixed in 8.1

26−+#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1)))

27−+#define __APPLE_NEED_FIX 1

28−+#endif

29−+

30−+// Regular clang was fixed in 3.9

31−+#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9)

32−+#define __CLANG_NEED_FIX 1

33−+#endif

34−+

35−+#if __APPLE_NEED_FIX || __CLANG_NEED_FIX

36−

37− #include <emmintrin.h>

38−

39−-// This version of apple clang has a bug that _cvtsh_ss is not defined, see

40−+// This version of clang has a bug that _cvtsh_ss is not defined, see

41− // https://reviews.llvm.org/D16177

42− static __inline float

43− __attribute__((__always_inline__, __nodebug__, __target__("f16c")))

44−@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a)

45− return r[0];

46− }

47−

48−-#endif // defined(__APPLE__) && (__clang_major__ < 8)

49−+#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX

50−+

51−+#undef __APPLE_NEED_FIX

52−+#undef __CLANG_NEED_FIX

53−

54− #ifdef _MSC_VER

55−

pkgs/development/libraries/vulkan-loader/default.nix+2−1

@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {

2121

2222 cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]

2323 ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"

24− ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";

24+ ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"

25+ ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";

2526

2627 outputs = [ "out" "dev" ];

2728

pkgs/development/libraries/wolfssl/default.nix+2−2

@@ -7,13 +7,13 @@

88stdenv.mkDerivation rec {

99 pname = "wolfssl";

10− version = "5.2.0";

10+ version = "5.3.0";

1111

1212 src = fetchFromGitHub {

1313 owner = "wolfSSL";

1414 repo = "wolfssl";

1515 rev = "v${version}-stable";

16− sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k";

16+ sha256 = "sha256-KteArWAgDohlqEYaNfzLPuBn6uy5ABA8vV/LRCVIPGA=";

1717 };

1818

1919 postPatch = ''

pkgs/development/libraries/zimg/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "zimg";

5− version = "3.0.4";

5+ version = "3.0.3";

77 src = fetchFromGitHub {

88 owner = "sekrit-twc";

99 repo = "zimg";

1010 rev = "release-${version}";

11− sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00";

11+ sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20";

1212 };

1313

1414 nativeBuildInputs = [ autoreconfHook ];

pkgs/development/python-modules/afsapi/default.nix+3−3

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "afsapi";

14− version = "0.2.3";

14+ version = "0.2.4";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.8";

@@ -19,8 +19,8 @@ buildPythonPackage rec {

1919 src = fetchFromGitHub {

2020 owner = "wlcrs";

2121 repo = "python-afsapi";

22− rev = version;

23− hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY=";

22+ rev = "refs/tags/${version}";

23+ hash = "sha256-pNggrg97GIBBTm4rjtpx0NOZIWCGn9boB/Wss/QwF6U=";

2424 };

2525

2626 SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/aioairzone/default.nix+2−2

@@ -7,7 +7,7 @@

88buildPythonPackage rec {

99 pname = "aioairzone";

10− version = "0.3.4";

10+ version = "0.4.2";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.8";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "Noltari";

1717 repo = pname;

1818 rev = "refs/tags/${version}";

19− hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";

19+ hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/aioslimproto/default.nix+7−2

@@ -7,7 +7,7 @@

88buildPythonPackage rec {

99 pname = "aioslimproto";

10− version = "2.0.0";

10+ version = "2.0.1";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.9";

@@ -16,13 +16,18 @@ buildPythonPackage rec {

1616 owner = "home-assistant-libs";

1717 repo = pname;

1818 rev = version;

19− hash = "sha256-7xFbxWay2aPCBkf3pBUGshROtssbi//PxxsI8ELeS+c=";

19+ hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";

2020 };

2121

2222 checkInputs = [

2323 pytestCheckHook

2424 ];

2525

26+ disabledTests = [

27+ # AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']

28+ "test_msg_instantiation"

29+ ];

30+

2631 pythonImportsCheck = [

2732 "aioslimproto"

2833 ];

pkgs/development/python-modules/androidtv/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "androidtv";

14− version = "0.0.66";

14+ version = "0.0.67";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.7";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "JeffLIrion";

2121 repo = "python-androidtv";

2222 rev = "v${version}";

23− hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo=";

23+ hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/ansible/default.nix+3−2

@@ -20,7 +20,7 @@

2020

2121let

2222 pname = "ansible";

23− version = "5.7.0";

23+ version = "5.7.1";

2424in

2525buildPythonPackage {

2626 inherit pname version;

@@ -30,7 +30,7 @@ buildPythonPackage {

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y=";

33+ sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";

3434 };

3535

3636 postPatch = ''

@@ -78,6 +78,7 @@ buildPythonPackage {

7878 meta = with lib; {

7979 description = "Radically simple IT automation";

8080 homepage = "https://www.ansible.com";

81+ changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst";

8182 license = licenses.gpl3Plus;

8283 maintainers = with maintainers; [ hexa ];

8384 };

pkgs/development/python-modules/async-upnp-client/default.nix+2−2

@@ -14,7 +14,7 @@

1414

1515buildPythonPackage rec {

1616 pname = "async-upnp-client";

17− version = "0.28.0";

17+ version = "0.29.0";

1818 format = "setuptools";

1919

2020 disabled = pythonOlder "3.7";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "StevenLooman";

2424 repo = "async_upnp_client";

2525 rev = version;

26− sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY=";

26+ sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/bleach/default.nix+2−2

@@ -11,12 +11,12 @@

1111

1212buildPythonPackage rec {

1313 pname = "bleach";

14− version = "4.1.0";

14+ version = "5.0.0";

1515 disabled = pythonOlder "3.6";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";

19+ hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/breezy/default.nix+20−5

@@ -3,23 +3,36 @@

33, fetchPypi

44, configobj

55, patiencediff

6−, six

6+, fastbencode

77, fastimport

88, dulwich

99, launchpadlib

1010, testtools

11+, pythonOlder

12+, installShellFiles

1113}:

1214

1315buildPythonPackage rec {

1416 pname = "breezy";

15− version = "3.2.1";

17+ version = "3.2.2";

18+

19+ disabled = pythonOlder "3.5";

1620

1721 src = fetchPypi {

1822 inherit pname version;

19− sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw=";

23+ sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU=";

2024 };

2125

22− propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];

26+ nativeBuildInputs = [ installShellFiles ];

27+

28+ propagatedBuildInputs = [

29+ configobj

30+ fastbencode

31+ patiencediff

32+ fastimport

33+ dulwich

34+ launchpadlib

35+ ];

2336

2437 checkInputs = [ testtools ];

2538

@@ -29,6 +42,8 @@ buildPythonPackage rec {

2942 # symlink for bazaar compatibility

3043 postInstall = ''

3144 ln -s "$out/bin/brz" "$out/bin/bzr"

45+

46+ installShellCompletion --cmd brz --bash contrib/bash/brz

3247 '';

3348

3449 pythonImportsCheck = [ "breezy" ];

@@ -36,7 +51,7 @@ buildPythonPackage rec {

3651 meta = with lib; {

3752 description = "Friendly distributed version control system";

3853 homepage = "https://www.breezy-vcs.org/";

39− license = licenses.gpl2;

54+ license = licenses.gpl2Only;

4055 maintainers = [ maintainers.marsam ];

4156 };

4257}

pkgs/development/python-modules/fastbencode/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ lib, buildPythonPackage, fetchPypi, python, cython }:

3+buildPythonPackage rec {

4+ pname = "fastbencode";

5+ version = "0.0.7";

7+ src = fetchPypi {

8+ inherit pname version;

9+ sha256 = "sha256-tryavlQtBmN5NSlXb0m6iJFQhVT4XQm11tXtevfgxuQ=";

10+ };

11+

12+ nativeBuildInputs = [ cython ];

13+

14+ pythonImportsCheck = [ "fastbencode" ];

15+

16+ checkPhase = ''

17+ ${python.interpreter} -m unittest fastbencode.tests.test_suite

18+ '';

19+

20+ meta = with lib; {

21+ description = "Fast implementation of bencode";

22+ homepage = "https://github.com/breezy-team/fastbencode";

23+ license = licenses.gpl2Only;

24+ maintainers = [ maintainers.marsam ];

25+ };

26+}

pkgs/development/python-modules/gcal-sync/default.nixnew file+46

@@ -0,0 +1,46 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, aiohttp

6+, pydantic

7+, freezegun

8+, pytest-aiohttp

9+, pytest-asyncio

10+, pytestCheckHook

11+}:

12+

13+buildPythonPackage rec {

14+ pname = "gcal-sync";

15+ version = "0.7.1";

16+

17+ disabled = pythonOlder "3.9";

18+

19+ src = fetchFromGitHub {

20+ owner = "allenporter";

21+ repo = "gcal_sync";

22+ rev = version;

23+ hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M=";

24+ };

25+

26+ propagatedBuildInputs = [

27+ aiohttp

28+ pydantic

29+ ];

30+

31+ checkInputs = [

32+ freezegun

33+ pytest-aiohttp

34+ pytest-asyncio

35+ pytestCheckHook

36+ ];

37+

38+ pythonImportsCheck = [ "gcal_sync" ];

39+

40+ meta = {

41+ description = "Python library for syncing Google Calendar to local storage";

42+ homepage = "https://github.com/allenporter/gcal_sync";

43+ license = lib.licenses.asl20;

44+ maintainers = with lib.maintainers; [ dotlambda ];

45+ };

46+}

pkgs/development/python-modules/howdoi/default.nix+16−2

@@ -10,17 +10,21 @@

1010, pyquery

1111, requests

1212, pytestCheckHook

13+, pythonOlder

1314}:

1415

1516buildPythonPackage rec {

1617 pname = "howdoi";

1718 version = "2.0.19";

19+ format = "setuptools";

20+

21+ disabled = pythonOlder "3.7";

1822

1923 src = fetchFromGitHub {

2024 owner = "gleitz";

2125 repo = pname;

2226 rev = "v${version}";

23− sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q";

27+ hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I=";

2428 };

2529

2630 propagatedBuildInputs = [

@@ -46,6 +50,16 @@ buildPythonPackage rec {

4650 # AssertionError: "The...

4751 "test_get_text_with_one_link"

4852 "test_get_text_without_links"

53+ # Those tests are failing in the sandbox

54+ # OSError: [Errno 24] Too many open files

55+ "test_answers"

56+ "test_answers_bing"

57+ "test_colorize"

58+ "test_json_output"

59+ "test_missing_pre_or_code_query"

60+ "test_multiple_answers"

61+ "test_position"

62+ "test_unicode_answer"

4963 ];

5064

5165 pythonImportsCheck = [

@@ -54,7 +68,7 @@ buildPythonPackage rec {

5468

5569 meta = with lib; {

5670 description = "Instant coding answers via the command line";

57− homepage = "https://pypi.python.org/pypi/howdoi";

71+ homepage = "https://github.com/gleitz/howdoi";

5872 license = licenses.mit;

5973 maintainers = with maintainers; [ costrouc ];

6074 };

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

6+buildPythonPackage rec {

7+ pname = "insteon-frontend-home-assistant";

8+ version = "0.1.0";

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf";

13+ };

14+

15+ # upstream has no tests

16+ doCheck = false;

17+

18+ pythonImportsCheck = [ "insteon_frontend" ];

19+

20+ meta = {

21+ description = "The Insteon frontend for Home Assistant";

22+ homepage = "https://github.com/teharris1/insteon-panel";

23+ license = lib.licenses.mit;

24+ maintainers = with lib.maintainers; [ dotlambda ];

25+ };

26+}

pkgs/development/python-modules/meater-python/default.nixnew file+37

@@ -0,0 +1,37 @@

1+{ lib

2+, aiohttp

3+, buildPythonPackage

4+, fetchPypi

5+, pythonOlder

6+}:

8+buildPythonPackage rec {

9+ pname = "meater-python";

10+ version = "0.0.8";

11+ format = "setuptools";

12+

13+ disabled = pythonOlder "3.7";

14+

15+ src = fetchPypi {

16+ inherit pname version;

17+ hash = "sha256-86XJmKOc2MCyU9v0UAZsPCUL/kAXywOlQOIHaykNF1o=";

18+ };

19+

20+ propagatedBuildInputs = [

21+ aiohttp

22+ ];

23+

24+ # Module has no tests

25+ doCheck = false;

26+

27+ pythonImportsCheck = [

28+ "meater"

29+ ];

30+

31+ meta = with lib; {

32+ description = "Library for the Apption Labs Meater cooking probe";

33+ homepage = "https://github.com/Sotolotl/meater-python";

34+ license = licenses.asl20;

35+ maintainers = with maintainers; [ fab ];

36+ };

37+}

pkgs/development/python-modules/nbclient/default.nix+33−10

@@ -1,27 +1,50 @@

1−{ lib, buildPythonPackage, fetchPypi, pythonOlder,

2− async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,

3− pytest, xmltodict, nbconvert, ipywidgets

4−, doCheck ? true

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pythonOlder

5+, async_generator

6+, traitlets

7+, nbformat

8+, nest-asyncio

9+, jupyter-client

10+, pytestCheckHook

11+, xmltodict

12+, nbconvert

13+, ipywidgets

514}:

615

7−buildPythonPackage rec {

16+let nbclient = buildPythonPackage rec {

817 pname = "nbclient";

9− version = "0.5.13";

18+ version = "0.6.2";

19+ format = "setuptools";

20+

1021 disabled = pythonOlder "3.7";

1122

1223 src = fetchPypi {

1324 inherit pname version;

14− sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";

25+ hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";

1526 };

1627

17− inherit doCheck;

18− checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

1928 propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

2029

30+ # circular dependencies if enabled by default

31+ doCheck = false;

32+

33+ checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ];

34+

35+ preCheck = ''

36+ export HOME=$(mktemp -d)

37+ '';

38+

39+ passthru.tests = {

40+ check = nbclient.overridePythonAttrs (_: { doCheck = true; });

41+ };

42+

2143 meta = with lib; {

2244 homepage = "https://github.com/jupyter/nbclient";

2345 description = "A client library for executing notebooks";

2446 license = licenses.bsd3;

2547 maintainers = [ maintainers.erictapen ];

2648 };

27−}

49+};

50+in nbclient

pkgs/development/python-modules/nbconvert/default.nix+8−7

@@ -5,13 +5,11 @@

55, glibcLocales

66, entrypoints

77, bleach

8−, beautifulsoup4

98, mistune

109, nbclient

1110, jinja2

1211, pygments

1312, traitlets

14−, testpath

1513, jupyter_core

1614, jupyterlab-pygments

1715, nbformat

@@ -20,15 +18,18 @@

2018, tornado

2119, jupyter-client

2220, defusedxml

21+, tinycss2

22+, beautifulsoup4

2323}:

2424

2525buildPythonPackage rec {

2626 pname = "nbconvert";

27− version = "6.4.5";

27+ version = "6.5.0";

28+ format = "setuptools";

2829

2930 src = fetchPypi {

3031 inherit pname version;

31− sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";

32+ hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";

3233 };

3334

3435 # Add $out/share/jupyter to the list of paths that are used to search for

@@ -44,10 +45,10 @@ buildPythonPackage rec {

4445 checkInputs = [ pytestCheckHook glibcLocales ];

4546

4647 propagatedBuildInputs = [

47− entrypoints bleach mistune jinja2 pygments traitlets testpath

48+ entrypoints bleach mistune jinja2 pygments traitlets

4849 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client

49− defusedxml beautifulsoup4

50− (nbclient.override { doCheck = false; }) # avoid infinite recursion

50+ defusedxml tinycss2 beautifulsoup4

51+ nbclient

5152 jupyterlab-pygments

5253 ];

5354

pkgs/development/python-modules/peaqevcore/default.nix+2−2

@@ -6,14 +6,14 @@

77buildPythonPackage rec {

88 pname = "peaqevcore";

9− version = "0.0.21";

9+ version = "0.0.22";

1010 format = "setuptools";

1111

1212 disabled = pythonOlder "3.7";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4=";

16+ hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0=";

1717 };

1818

1919 postPatch = ''

pkgs/development/python-modules/pychromecast/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "pychromecast";

13− version = "11.0.0";

13+ version = "12.0.0";

1414 format = "setuptools";

1515

1616 disabled = !isPy3k;

@@ -18,7 +18,7 @@ buildPythonPackage rec {

1818 src = fetchPypi {

1919 pname = "PyChromecast";

2020 inherit version;

21− sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY=";

21+ sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";

2222 };

2323

2424 propagatedBuildInputs = [

pkgs/development/python-modules/pydeconz/default.nix+6−4

@@ -1,6 +1,7 @@

11{ lib

22, aiohttp

33, aioresponses

4+, async-timeout

45, buildPythonPackage

56, fetchFromGitHub

67, pytest-aiohttp

@@ -10,20 +11,21 @@

1011

1112buildPythonPackage rec {

1213 pname = "pydeconz";

13− version = "87";

14+ version = "91";

1415 format = "setuptools";

1516

16− disabled = pythonOlder "3.7";

17+ disabled = pythonOlder "3.9";

1718

1819 src = fetchFromGitHub {

1920 owner = "Kane610";

2021 repo = "deconz";

21− rev = "v${version}";

22− sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";

22+ rev = "refs/tags/v${version}";

23+ hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";

2324 };

2425

2526 propagatedBuildInputs = [

2627 aiohttp

28+ async-timeout

2729 ];

2830

2931 checkInputs = [

pkgs/development/python-modules/pyevilgenius/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "pyevilgenius";

11− version = "1.0.0";

11+ version = "2.0.0";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.8";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "home-assistant-libs";

1818 repo = pname;

1919 rev = version;

20− sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";

20+ sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/pyinsteon/default.nix+3−3

@@ -16,7 +16,7 @@

1616

1717buildPythonPackage rec {

1818 pname = "pyinsteon";

19− version = "1.0.16";

19+ version = "1.1.0";

2020 format = "setuptools";

2121

2222 disabled = pythonOlder "3.6";

@@ -24,8 +24,8 @@ buildPythonPackage rec {

2424 src = fetchFromGitHub {

2525 owner = pname;

2626 repo = pname;

27− rev = version;

28− hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc=";

27+ rev = "refs/tags/${version}";

28+ hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";

2929 };

3030

3131 propagatedBuildInputs = [

pkgs/development/python-modules/pykulersky/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "pykulersky";

14− version = "0.5.3";

14+ version = "0.5.4";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.6";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "emlove";

2121 repo = pname;

2222 rev = version;

23− sha256 = "sha256-l3obfs5zo5DqArsDml8EZ+/uzab35Jjsuzw6U1XFJ3k=";

23+ sha256 = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pynws/default.nix+2−2

@@ -13,14 +13,14 @@

1313

1414buildPythonPackage rec {

1515 pname = "pynws";

16− version = "1.3.2";

16+ version = "1.4.1";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchFromGitHub {

2020 owner = "MatthewFlamm";

2121 repo = pname;

2222 rev = "v${version}";

23− sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";

23+ sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pytomorrowio/default.nix+4−2

@@ -3,19 +3,20 @@

33, pythonOlder

44, fetchPypi

55, aiohttp

6+, pytest-aiohttp

67, pytest-asyncio

78, pytestCheckHook

89}:

910

1011buildPythonPackage rec {

1112 pname = "pytomorrowio";

12− version = "0.2.1";

13+ version = "0.3.3";

1314

1415 disabled = pythonOlder "3.7";

1516

1617 src = fetchPypi {

1718 inherit pname version;

18− sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e";

19+ sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62";

1920 };

2021

2122 propagatedBuildInputs = [

@@ -23,6 +24,7 @@ buildPythonPackage rec {

2324 ];

2425

2526 checkInputs = [

27+ pytest-aiohttp

2628 pytest-asyncio

2729 pytestCheckHook

2830 ];

pkgs/development/python-modules/simplisafe-python/default.nix+6−2

@@ -3,6 +3,7 @@

33, aresponses

44, asynctest

55, backoff

6+, beautifulsoup4

67, buildPythonPackage

78, docutils

89, fetchFromGitHub

@@ -19,7 +20,7 @@

1920

2021buildPythonPackage rec {

2122 pname = "simplisafe-python";

22− version = "2022.03.3";

23+ version = "2022.05.0";

2324 format = "pyproject";

2425

2526 disabled = pythonOlder "3.8";

@@ -28,7 +29,7 @@ buildPythonPackage rec {

2829 owner = "bachya";

2930 repo = pname;

3031 rev = version;

31− sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw=";

32+ sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";

3233 };

3334

3435 nativeBuildInputs = [

@@ -38,6 +39,7 @@ buildPythonPackage rec {

3839 propagatedBuildInputs = [

3940 aiohttp

4041 backoff

42+ beautifulsoup4

4143 docutils

4244 pytz

4345 voluptuous

@@ -62,6 +64,8 @@ buildPythonPackage rec {

6264 # simplipy/api.py:253: InvalidCredentialsError

6365 "test_request_error_failed_retry"

6466 "test_update_error"

67+ # ClientConnectorError: Cannot connect to host auth.simplisafe.com:443 ssl:default [Temporary failure in name resolution]

68+ "test_client_async_from_refresh_token_unknown_error"

6569 ];

6670

6771 disabledTestPaths = [

pkgs/development/python-modules/skytemple-rust/default.nix+9−2

@@ -1,4 +1,11 @@

1−{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:

1+{ lib

2+, stdenv

3+, buildPythonPackage

4+, fetchFromGitHub

5+, libiconv

6+, Foundation

7+, rustPlatform

8+, setuptools-rust }:

310buildPythonPackage rec {

411 pname = "skytemple-rust";

@@ -17,7 +24,7 @@ buildPythonPackage rec {

1724 sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";

1825 };

1926

20− buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

27+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

2128 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

2229

2330 GETTEXT_SYSTEM = true;

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

@@ -24,12 +24,12 @@

2424

2525buildPythonPackage rec {

2626 pname = "snowflake-connector-python";

27− version = "2.7.6";

27+ version = "2.7.7";

2828 disabled = pythonOlder "3.6";

2929

3030 src = fetchPypi {

3131 inherit pname version;

32− sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";

32+ sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";

3333 };

3434

3535 postPatch = ''

pkgs/development/python-modules/sqlmap/default.nix+2−2

@@ -7,11 +7,11 @@

88buildPythonPackage rec {

99 pname = "sqlmap";

10− version = "1.6.4";

10+ version = "1.6.5";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8=";

14+ sha256 = "sha256-EdiLTzjRigJLsslWSymLNajvUDimBt4d4EBugxVYueg=";

1515 };

1616

1717 postPatch = ''

pkgs/development/python-modules/textual/default.nix+16−13

@@ -1,38 +1,34 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4−, fetchpatch

54, poetry-core

65, rich

76, typing-extensions

87, pytestCheckHook

8+, pythonOlder

99}:

1010

1111buildPythonPackage rec {

1212 pname = "textual";

13− version = "0.1.15";

13+ version = "0.1.18";

1414 format = "pyproject";

1515

16+ disabled = pythonOlder "3.7";

17+

1618 src = fetchFromGitHub {

1719 owner = "Textualize";

1820 repo = pname;

1921 rev = "v${version}";

20− sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";

22+ sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";

2123 };

2224

23− patches = [

24− (fetchpatch {

25− # v0.1.15 git tag has 0.1.14 in pyproject.toml

26− name = "version.patch";

27− url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch";

28− sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp";

29− })

25+ nativeBuildInputs = [

26+ poetry-core

3027 ];

3128

32− nativeBuildInputs = [ poetry-core ];

33−

3429 propagatedBuildInputs = [

3530 rich

31+ ] ++ lib.optionals (pythonOlder "3.9") [

3632 typing-extensions

3733 ];

3834

@@ -40,7 +36,14 @@ buildPythonPackage rec {

4036 pytestCheckHook

4137 ];

4238

43− pythonImportsCheck = [ "textual" ];

39+ postPatch = ''

40+ substituteInPlace pyproject.toml \

41+ --replace 'rich = "^12.3.0"' 'rich = "*"'

42+ '';

43+

44+ pythonImportsCheck = [

45+ "textual"

46+ ];

4447

4548 meta = with lib; {

4649 description = "TUI framework for Python inspired by modern web development";

pkgs/development/python-modules/total-connect-client/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "total-connect-client";

11− version = "2022.2.1";

11+ version = "2022.3";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "craigjmidwinter";

1818 repo = "total-connect-client";

1919 rev = version;

20− hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";

20+ hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/voluptuous/default.nix+15−11

@@ -1,27 +1,31 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

4−, nose

3+, fetchFromGitHub

4+, pytestCheckHook

55}:

77buildPythonPackage rec {

88 pname = "voluptuous";

9− version = "0.13.0";

9+ version = "0.13.1";

1010

11− src = fetchPypi {

12− inherit pname version;

13− sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";

11+ src = fetchFromGitHub {

12+ owner = "alecthomas";

13+ repo = pname;

14+ rev = version;

15+ hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";

1416 };

1517

1618 checkInputs = [

17− nose

19+ pytestCheckHook

1820 ];

1921

20− checkPhase = ''

21− nosetests

22− '';

22+ pythonImportsCheck = [

23+ "voluptuous"

24+ ];

2325

24− pythonImportsCheck = [ "voluptuous" ];

26+ pytestFlagsArray = [

27+ "voluptuous/tests/"

28+ ];

2529

2630 meta = with lib; {

2731 description = "Python data validation library";

pkgs/development/python-modules/zigpy/default.nix+4−2

@@ -4,6 +4,7 @@

44, asynctest

55, buildPythonPackage

66, crccheck

7+, cryptography

78, fetchFromGitHub

89, pycryptodome

910, pytest-aiohttp

@@ -15,7 +16,7 @@

1516

1617buildPythonPackage rec {

1718 pname = "zigpy";

18− version = "0.44.2";

19+ version = "0.45.1";

1920 format = "setuptools";

2021

2122 disabled = pythonOlder "3.7";

@@ -24,13 +25,14 @@ buildPythonPackage rec {

2425 owner = "zigpy";

2526 repo = "zigpy";

2627 rev = version;

27− sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I=";

28+ sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";

2829 };

2930

3031 propagatedBuildInputs = [

3132 aiohttp

3233 aiosqlite

3334 crccheck

35+ cryptography

3436 pycryptodome

3537 voluptuous

3638 ];

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "zwave-js-server-python";

13− version = "0.35.3";

13+ version = "0.36.1";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.8";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

1919 owner = "home-assistant-libs";

2020 repo = pname;

2121 rev = version;

22− sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";

22+ sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/tools/just/default.nix+3−3

@@ -10,16 +10,16 @@

1010

1111rustPlatform.buildRustPackage rec {

1212 pname = "just";

13− version = "1.1.2";

13+ version = "1.1.3";

1414

1515 src = fetchFromGitHub {

1616 owner = "casey";

1717 repo = pname;

1818 rev = version;

19− sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";

19+ sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";

2020 };

2121

22− cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";

22+ cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";

2323

2424 nativeBuildInputs = [ installShellFiles ];

2525 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+10−2

@@ -5,7 +5,7 @@

55}:

66let

77 # Poetry2nix version

8− version = "1.27.1";

8+ version = "1.28.0";

1010 inherit (poetryLib) isCompatible readTOML moduleName;

1111

@@ -287,12 +287,20 @@ lib.makeScope pkgs.newScope (self: {

287287 (name: value: projectDir + "/${value.path}")

288288 (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set);

289289

290− editablePackageSources' = (

290+ excludedEditablePackageNames = builtins.filter

291+ (pkg: editablePackageSources."${pkg}" == null)

292+ (builtins.attrNames editablePackageSources);

293+

294+ allEditablePackageSources = (

291295 (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))

292296 // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))

293297 // editablePackageSources

294298 );

295299

300+ editablePackageSources' = builtins.removeAttrs

301+ allEditablePackageSources

302+ excludedEditablePackageNames;

303+

296304 poetryPython = self.mkPoetryPackages {

297305 inherit pyproject poetrylock overrides python pwd preferWheels pyProject;

298306 editablePackageSources = editablePackageSources';

pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1

@@ -180,7 +180,7 @@ let

180180 hasGitIgnore = builtins.pathExists gitIgnore;

181181 gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ];

182182 in

183− lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

183+ lib.optionals (builtins.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

184184

185185 /*

186186 Provides a source filtering mechanism that:

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+153−5

@@ -29,6 +29,9 @@

2929 "aioflo": [

3030 "poetry-core"

3131 ],

32+ "aiogithubapi": [

33+ "poetry-core"

34+ ],

3235 "aioguardian": [

3336 "poetry-core"

3437 ],

@@ -89,9 +92,21 @@

8992 "amqtt": [

9093 "poetry-core"

9194 ],

95+ "ansible-doctor": [

96+ "poetry-core"

97+ ],

98+ "ansible-later": [

99+ "poetry-core"

100+ ],

101+ "ansible-runner": [

102+ "pbr"

103+ ],

92104 "apache-beam": [

93105 "cython"

94106 ],

107+ "aplpy": [

108+ "cython"

109+ ],

95110 "argon2_cffi": [

96111 "flitBuildHook"

97112 ],

@@ -114,15 +129,24 @@

114129 "atomman": [

115130 "cython"

116131 ],

132+ "atpublic": [

133+ "pdm-pep517"

134+ ],

117135 "autarco": [

118136 "poetry-core"

119137 ],

120138 "authcaptureproxy": [

121139 "poetry-core"

122140 ],

141+ "av": [

142+ "cython"

143+ ],

123144 "awesomeversion": [

124145 "poetry-core"

125146 ],

147+ "aws-adfs": [

148+ "poetry-core"

149+ ],

126150 "aws-error-utils": [

127151 "poetry"

128152 ],

@@ -147,6 +171,9 @@

147171 "boltztrap2": [

148172 "cython"

149173 ],

174+ "bsblan": [

175+ "poetry-core"

176+ ],

150177 "build": [

151178 "flit-core"

152179 ],

@@ -183,6 +210,9 @@

183210 "clikit": [

184211 "poetry-core"

185212 ],

213+ "cloudflare-dyndns": [

214+ "poetry"

215+ ],

186216 "collections-extended": [

187217 "poetry-core"

188218 ],

@@ -210,7 +240,8 @@

210240 "poetry-core"

211241 ],

212242 "cssselect2": [

213− "flit"

243+ "flit",

244+ "flit-core"

214245 ],

215246 "cwcwidth": [

216247 "cython"

@@ -224,9 +255,15 @@

224255 "cypari2": [

225256 "cython"

226257 ],

258+ "cypherpunkpay": [

259+ "poetry-core"

260+ ],

227261 "cysignals": [

228262 "cython"

229263 ],

264+ "datadog": [

265+ "hatchling"

266+ ],

230267 "datrie": [

231268 "cython"

232269 ],

@@ -260,6 +297,9 @@

260297 "doc8": [

261298 "pbr"

262299 ],

300+ "docstring-parser": [

301+ "poetry-core"

302+ ],

263303 "dtlssocket": [

264304 "cython"

265305 ],

@@ -301,7 +341,8 @@

301341 "poetry-core"

302342 ],

303343 "entrypoints": [

304− "flit"

344+ "flit",

345+ "flit-core"

305346 ],

306347 "enturclient": [

307348 "poetry-core"

@@ -309,6 +350,13 @@

309350 "enumatch": [

310351 "poetry"

311352 ],

353+ "exceptiongroup": [

354+ "flit-core",

355+ "flitBuildHook"

356+ ],

357+ "falcon": [

358+ "cython"

359+ ],

312360 "fastapi": [

313361 "flitBuildHook"

314362 ],

@@ -378,6 +426,9 @@

378426 "generic": [

379427 "poetry-core"

380428 ],

429+ "gensim": [

430+ "cython"

431+ ],

381432 "glances-api": [

382433 "poetry-core"

383434 ],

@@ -492,9 +543,15 @@

492543 "ipwhl": [

493544 "flitBuildHook"

494545 ],

546+ "iso8601": [

547+ "poetry-core"

548+ ],

495549 "isort": [

496550 "poetry-core"

497551 ],

552+ "jarowinkler": [

553+ "cython"

554+ ],

498555 "jedi-language-server": [

499556 "poetry"

500557 ],

@@ -519,6 +576,12 @@

519576 "jupyterlab": [

520577 "jupyter-packaging"

521578 ],

579+ "jupyterlab-code-formatter": [

580+ "jupyter-packaging"

581+ ],

582+ "jupyterlab-pygments": [

583+ "jupyter-packaging"

584+ ],

522585 "keystoneauth1": [

523586 "pbr"

524587 ],

@@ -537,6 +600,9 @@

537600 "ldappool": [

538601 "pbr"

539602 ],

603+ "levenshtein": [

604+ "cython"

605+ ],

540606 "libgpuarray": [

541607 "cython"

542608 ],

@@ -564,6 +630,9 @@

564630 "lockfile": [

565631 "pbr"

566632 ],

633+ "lsassy": [

634+ "poetry-core"

635+ ],

567636 "luftdaten": [

568637 "poetry-core"

569638 ],

@@ -585,6 +654,9 @@

585654 "marisa-trie": [

586655 "cython"

587656 ],

657+ "markdown-it-py": [

658+ "flit-core"

659+ ],

588660 "mask-rcnn": [

589661 "cython"

590662 ],

@@ -607,6 +679,9 @@

607679 "memory-allocator": [

608680 "cython"

609681 ],

682+ "meteofrance-api": [

683+ "poetry"

684+ ],

610685 "metprint": [

611686 "poetry-core"

612687 ],

@@ -618,6 +693,7 @@

618693 "poetry"

619694 ],

620695 "mkdocs-jupyter": [

696+ "ipython_genutils",

621697 "poetry-core"

622698 ],

623699 "mkdocs-literate-nav": [

@@ -674,6 +750,9 @@

674750 "netdata": [

675751 "poetry-core"

676752 ],

753+ "netutils": [

754+ "poetry-core"

755+ ],

677756 "newversion": [

678757 "poetry-core"

679758 ],

@@ -689,6 +768,9 @@

689768 "nkdfu": [

690769 "flitBuildHook"

691770 ],

771+ "notebook-shim": [

772+ "jupyter-packaging"

773+ ],

692774 "notus-scanner": [

693775 "poetry-core"

694776 ],

@@ -728,6 +810,9 @@

728810 "openvino": [

729811 "cython"

730812 ],

813+ "ordered-set": [

814+ "flit-core"

815+ ],

731816 "ormar": [

732817 "poetry-core"

733818 ],

@@ -807,6 +892,9 @@

807892 "poetry": [

808893 "poetry-core"

809894 ],

895+ "poetry-dynamic-versioning": [

896+ "poetry-core"

897+ ],

810898 "poetry2conda": [

811899 "poetry"

812900 ],

@@ -930,6 +1018,9 @@

9301018 "pymaven-patch": [

9311019 "pbr"

9321020 ],

1021+ "pymdown-extensions": [

1022+ "hatchling"

1023+ ],

9331024 "pymfy": [

9341025 "poetry-core"

9351026 ],

@@ -954,6 +1045,9 @@

9541045 "pyoverkiz": [

9551046 "poetry-core"

9561047 ],

1048+ "pyparsing": [

1049+ "flit-core"

1050+ ],

9571051 "pypass": [

9581052 "pbr"

9591053 ],

@@ -978,12 +1072,21 @@

9781072 "pyproject-flake8": [

9791073 "flit-core"

9801074 ],

1075+ "pypsrp": [

1076+ "poetry-core"

1077+ ],

9811078 "pyquil": [

9821079 "poetry-core"

9831080 ],

1081+ "pyrad": [

1082+ "poetry-core"

1083+ ],

9841084 "pyregion": [

9851085 "cython"

9861086 ],

1087+ "pyrevolve": [

1088+ "cython"

1089+ ],

9871090 "pyrmvtransport": [

9881091 "flit"

9891092 ],

@@ -999,6 +1102,9 @@

9991102 "pysigma": [

10001103 "poetry-core"

10011104 ],

1105+ "pysigma-backend-insightidr": [

1106+ "poetry-core"

1107+ ],

10021108 "pysigma-backend-splunk": [

10031109 "poetry-core"

10041110 ],

@@ -1008,14 +1114,30 @@

10081114 "pysigma-pipeline-sysmon": [

10091115 "poetry-core"

10101116 ],

1117+ "pysigma-pipeline-windows": [

1118+ "poetry-core"

1119+ ],

1120+ "pyslurm": [

1121+ "cython"

1122+ ],

10111123 "pysmf": [

10121124 "cython"

10131125 ],

10141126 "pysml": [

10151127 "poetry-core"

10161128 ],

1129+ "pysnmp-pyasn1": [

1130+ "poetry-core"

1131+ ],

1132+ "pysnmp-pysmi": [

1133+ "poetry-core"

1134+ ],

1135+ "pysnmplib": [

1136+ "poetry-core"

1137+ ],

10171138 "pysnow": [

1018− "poetry"

1139+ "poetry",

1140+ "poetry-core"

10191141 ],

10201142 "pysptk": [

10211143 "cython"

@@ -1035,6 +1157,9 @@

10351157 "pytest-httpserver": [

10361158 "poetry-core"

10371159 ],

1160+ "pytest-isort": [

1161+ "poetry-core"

1162+ ],

10381163 "pytest-mockservers": [

10391164 "poetry-core"

10401165 ],

@@ -1097,6 +1222,9 @@

10971222 "python-openstackclient": [

10981223 "pbr"

10991224 ],

1225+ "python-pae": [

1226+ "poetry-core"

1227+ ],

11001228 "python-pkcs11": [

11011229 "cython"

11021230 ],

@@ -1215,7 +1343,8 @@

12151343 "poetry-core"

12161344 ],

12171345 "rokuecp": [

1218− "poetry"

1346+ "poetry",

1347+ "poetry-core"

12191348 ],

12201349 "roombapy": [

12211350 "poetry-core"

@@ -1280,6 +1409,9 @@

12801409 "sentinel": [

12811410 "poetry-core"

12821411 ],

1412+ "seventeentrack": [

1413+ "poetry-core"

1414+ ],

12831415 "sfepy": [

12841416 "cython"

12851417 ],

@@ -1301,9 +1433,15 @@

13011433 "slowapi": [

13021434 "poetry-core"

13031435 ],

1436+ "socksio": [

1437+ "flit-core"

1438+ ],

13041439 "solo-python": [

13051440 "flitBuildHook"

13061441 ],

1442+ "soupsieve": [

1443+ "hatchling"

1444+ ],

13071445 "spacy-pkuseg": [

13081446 "cython"

13091447 ],

@@ -1425,7 +1563,8 @@

14251563 "cython"

14261564 ],

14271565 "testpath": [

1428− "flit"

1566+ "flit",

1567+ "flit-core"

14291568 ],

14301569 "testrepository": [

14311570 "pbr"

@@ -1505,6 +1644,9 @@

15051644 "typing-extensions": [

15061645 "flit-core"

15071646 ],

1647+ "uharfbuzz": [

1648+ "cython"

1649+ ],

15081650 "unpaddedbase64": [

15091651 "poetry-core"

15101652 ],

@@ -1550,8 +1692,14 @@

15501692 "yoda": [

15511693 "cython"

15521694 ],

1695+ "yte": [

1696+ "poetry-core"

1697+ ],

15531698 "zeversolarlocal": [

15541699 "flit-core",

15551700 "flitBuildHook"

1701+ ],

1702+ "zwave-me-ws": [

1703+ "poetry-core"

15561704 ]

15571705}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+98−4

@@ -8,13 +8,14 @@ let

88 { self

99 , drv

1010 , attr

11+ , extraAttrs ? [ ]

1112 }:

1213 let

1314 buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};

1415 in

1516 (

1617 # Flit only works on Python3

17− if (attr == "flit-core" || attr == "flit") && !self.isPy3k then drv

18+ if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv

1819 else

1920 drv.overridePythonAttrs (

2021 old:

@@ -23,7 +24,7 @@ let

2324 { }

2425 else

2526 {

26− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ];

27+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ] ++ map (a: self.${a}) extraAttrs;

2728 }

2829 )

2930 );

@@ -55,6 +56,16 @@ lib.composeManyExtensions [

5556 systems)

5657 buildSystems)

5758

59+ # Build systems with conditionals

60+ (self: super: {

61+

62+ platformdirs =

63+ if lib.versionAtLeast super.platformdirs.version "2.5.2"

64+ then addBuildSystem { inherit self; drv = super.platformdirs; attr = "hatchling"; extraAttrs = [ "hatch-vcs" ]; }

65+ else super.platformdirs;

66+

67+ })

68+

5869 # Build fixes

5970 (self: super:

6071 let

@@ -437,6 +448,17 @@ lib.composeManyExtensions [

437448 }

438449 );

439450

451+ # Setuptools >= 60 broke build_py_2to3

452+ docutils =

453+ if lib.versionOlder super.docutils.version "0.16" && lib.versionAtLeast super.setuptools.version "60" then

454+ (

455+ super.docutils.overridePythonAttrs (

456+ old: {

457+ SETUPTOOLS_USE_DISTUTILS = "stdlib";

458+ }

459+ )

460+ ) else super.docutils;

461+

440462 # Environment markers are not always included (depending on how a dep was defined)

441463 enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;

442464

@@ -844,6 +866,17 @@ lib.composeManyExtensions [

844866 }

845867 );

846868

869+ lsassy =

870+ if super.lsassy.version == "3.1.1" then

871+ super.lsassy.overridePythonAttrs

872+ (old: {

873+ # pyproject.toml contains a constraint `rich = "^10.6.0"` which is not replicated in setup.py

874+ # hence pypi misses it and poetry pins rich to 11.0.0

875+ preConfigure = (old.preConfigure or "") + ''

876+ rm pyproject.toml

877+ '';

878+ }) else super.lsassy;

879+

847880 lxml = super.lxml.overridePythonAttrs (

848881 old: {

849882 nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];

@@ -1143,6 +1176,26 @@ lib.composeManyExtensions [

11431176 }

11441177 );

11451178

1179+ orjson =

1180+ let

1181+ getCargoHash = version: {

1182+ "3.6.7" = "sha256-sz2k9podPB6QSptkyOu7+BoVTrKhefizRtYU+MICPt4=";

1183+ "3.6.8" = "sha256-vpfceVtYkU09xszNIihY1xbqGWieqDquxwsAmDH8jd4=";

1184+ }.${version} or null;

1185+ in

1186+ super.orjson.overridePythonAttrs (old: {

1187+ cargoDeps = pkgs.rustPlatform.fetchCargoTarball {

1188+ inherit (old) src;

1189+ name = "${old.pname}-${old.version}";

1190+ hash = getCargoHash old.version;

1191+ };

1192+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [

1193+ pkgs.rustPlatform.cargoSetupHook

1194+ pkgs.rustPlatform.maturinBuildHook

1195+ ];

1196+ buildInputs = (old.buildInputs or [ ]) ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv;

1197+ });

1198+

11461199 osqp = super.osqp.overridePythonAttrs (

11471200 old: {

11481201 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];

@@ -1150,6 +1203,29 @@ lib.composeManyExtensions [

11501203 }

11511204 );

11521205

1206+

1207+ pandas = super.pandas.overridePythonAttrs (old: {

1208+

1209+ buildInputs = old.buildInputs or [ ] ++ lib.optional stdenv.isDarwin pkgs.libcxx;

1210+

1211+ # Doesn't work with -Werror,-Wunused-command-line-argument

1212+ # https://github.com/NixOS/nixpkgs/issues/39687

1213+ hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

1214+

1215+ # For OSX, we need to add a dependency on libcxx, which provides

1216+ # `complex.h` and other libraries that pandas depends on to build.

1217+ postPatch = lib.optionalString stdenv.isDarwin ''

1218+ cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1";

1219+ echo "Adding $cpp_sdk to the setup.py common_include variable"

1220+ substituteInPlace setup.py \

1221+ --replace "['pandas/src/klib', 'pandas/src']" \

1222+ "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"

1223+ '';

1224+

1225+

1226+ enableParallelBuilding = true;

1227+ });

1228+

11531229 pantalaimon = super.pantalaimon.overridePythonAttrs (old: {

11541230 nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];

11551231 postInstall = old.postInstall or "" + ''

@@ -1196,8 +1272,12 @@ lib.composeManyExtensions [

11961272

11971273 pillow = super.pillow.overridePythonAttrs (

11981274 old: {

1199− nativeBuildInputs = [ pkg-config self.pytest-runner ] ++ (old.nativeBuildInputs or [ ]);

1200− buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]);

1275+ nativeBuildInputs = (old.nativeBuildInputs or [ ])

1276+ ++ [ pkg-config self.pytest-runner ];

1277+ buildInputs = with pkgs; (old.buildInputs or [ ])

1278+ ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ]

1279+ ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ]

1280+ ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ];

12011281 }

12021282 );

12031283

@@ -1246,6 +1326,14 @@ lib.composeManyExtensions [

12461326 }

12471327 );

12481328

1329+ psycopg2cffi = super.psycopg2cffi.overridePythonAttrs (

1330+ old: {

1331+ buildInputs = (old.buildInputs or [ ])

1332+ ++ lib.optional stdenv.isDarwin pkgs.openssl;

1333+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ];

1334+ }

1335+ );

1336+

12491337 py-solc-x = super.py-solc-x.overridePythonAttrs (

12501338 old: {

12511339 preConfigure = ''

@@ -1860,6 +1948,12 @@ lib.composeManyExtensions [

18601948

18611949 });

18621950

1951+ soundfile = super.soundfile.overridePythonAttrs (old: {

1952+ postPatch = ''

1953+ substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${pkgs.libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"

1954+ '';

1955+ });

1956+

18631957 systemd-python = super.systemd-python.overridePythonAttrs (old: {

18641958 buildInputs = old.buildInputs ++ [ pkgs.systemd ];

18651959 nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];

pkgs/development/tools/protoc-gen-entgrpc/default.nixnew file+28

@@ -0,0 +1,28 @@

1+{ lib, buildGoModule, fetchFromGitHub }:

3+buildGoModule rec {

4+ pname = "protoc-gen-entgrpc";

5+ version = "0.2.0";

7+ src = fetchFromGitHub {

8+ owner = "ent";

9+ repo = "contrib";

10+ rev = "v${version}";

11+ sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o=";

12+ };

13+

14+ vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw=";

15+

16+ subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];

17+

18+ ldflags = [ "-s" "-w" ];

19+

20+ meta = with lib; {

21+ description = "Generator of an implementation of the service interface for ent protobuff";

22+ downloadPage = "https://github.com/ent/contrib/";

23+ license = licenses.asl20;

24+ homepage = "https://entgo.io/";

25+ maintainers = with maintainers; [ superherointj ];

26+ };

27+}

28+

pkgs/development/tools/rust/cargo-sync-readme/default.nix+4−3

@@ -2,20 +2,21 @@

33rustPlatform.buildRustPackage rec {

44 pname = "cargo-sync-readme";

5− version = "1.0";

5+ version = "1.1";

77 src = fetchFromGitHub {

88 owner = "phaazon";

99 repo = pname;

1010 rev = version;

11− sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";

11+ sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";

1212 };

1313

14− cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";

14+ cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";

1515

1616 meta = with lib; {

1717 description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";

1818 homepage = "https://github.com/phaazon/cargo-sync-readme";

19+ changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";

1920 license = licenses.bsd3;

2021 maintainers = with maintainers; [ b4dm4n ];

2122 };

pkgs/development/tools/rust/rust-analyzer/default.nix+3−3

@@ -11,14 +11,14 @@

1111

1212rustPlatform.buildRustPackage rec {

1313 pname = "rust-analyzer-unwrapped";

14− version = "2022-04-11";

15− cargoSha256 = "sha256-pc8S+5g67vN9170ABiHGe1t4Go0F63UiOeLd71USYCI=";

14+ version = "2022-05-02";

15+ cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";

1616

1717 src = fetchFromGitHub {

1818 owner = "rust-analyzer";

1919 repo = "rust-analyzer";

2020 rev = version;

21− sha256 = "sha256-miMIrDawSS1zXh6EuX03x5ACM2NTabksssSyutSNpjY=";

21+ sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

2222 };

2323

2424 patches = [

pkgs/development/tools/wails/default.nix+3−3

@@ -15,16 +15,16 @@

1515

1616buildGoModule rec {

1717 pname = "wails";

18− version = "2.0.0-beta.34";

18+ version = "2.0.0-beta.36";

1919

2020 src = fetchFromGitHub {

2121 owner = "wailsapp";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";

24+ sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";

2525 } + "/v2";

2626

27− vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";

27+ vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";

2828

2929 proxyVendor = true;

3030

pkgs/development/web/nodejs/nodejs.nix+1−1

@@ -136,7 +136,7 @@ let

136136

137137 ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

138138 mkdir -p $out/share/bash-completion/completions/

139− $out/bin/npm completion > $out/share/bash-completion/completions/npm || :

139+ HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm

140140 for dir in "$out/lib/node_modules/npm/man/"*; do

141141 mkdir -p $out/share/man/$(basename "$dir")

142142 for page in "$dir"/*; do

pkgs/development/web/nodejs/v14.nix+2−2

@@ -7,7 +7,7 @@ let

77in

88 buildNodejs {

99 inherit enableNpm;

10− version = "14.19.1";

11− sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk=";

10+ version = "14.19.2";

11+ sha256 = "sha256-70N1qRUv9p8oI9eyCjtTdnoEYWS7rHgkQpyyFtFojPA=";

1212 patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

1313 }

pkgs/misc/platformsh/default.nix+2−2

@@ -2,14 +2,14 @@

33let

44 pname = "platformsh";

5− version = "3.79.0";

5+ version = "3.79.2";

66in

77stdenv.mkDerivation {

88 inherit pname version;

1010 src = fetchurl {

1111 url = "https://github.com/platformsh/platformsh-cli/releases/download/v${version}/platform.phar";

12− sha256 = "sha256-gTh1VS/b+D8E67w6Q4u9h0EhpFZiA2gBGe4mo49+9KY=";

12+ sha256 = "sha256-STGMKWgI4C6ccg8DGUhdnEENOB2//gtpU0ljM4cQCXI=";

1313 };

1414

1515 dontUnpack = true;

pkgs/misc/rich-cli/default.nix+18−8

@@ -1,17 +1,20 @@

1−{ lib, python3 }:

1+{ lib

2+, python3

3+}:

35python3.pkgs.buildPythonApplication rec {

46 pname = "rich-cli";

5− version = "1.5.1";

7+ version = "1.7.0";

8+ format = "pyproject";

710 src = python3.pkgs.fetchPypi {

811 inherit pname version;

9− sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";

12+ sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";

1013 };

1114

12− format = "pyproject";

13−

14− nativeBuildInputs = [ python3.pkgs.poetry-core ];

15+ nativeBuildInputs = with python3.pkgs; [

16+ poetry-core

17+ ];

1518

1619 propagatedBuildInputs = with python3.pkgs; [

1720 rich

@@ -21,11 +24,18 @@ python3.pkgs.buildPythonApplication rec {

2124 rich-rst

2225 ];

2326

24− buildInputs = [ python3 ];

27+ postPatch = ''

28+ substituteInPlace pyproject.toml \

29+ --replace 'rich = "^12.3.0"' 'rich = "*"'

30+ '';

31+

32+ pythonImportsCheck = [

33+ "rich_cli"

34+ ];

2535

2636 meta = with lib; {

27− homepage = "https://github.com/Textualize/rich-cli";

2837 description = "Command Line Interface to Rich";

38+ homepage = "https://github.com/Textualize/rich-cli";

2939 license = licenses.mit;

3040 maintainers = with maintainers; [ jyooru ];

3141 };

pkgs/servers/home-assistant/component-packages.nix+35−14

@@ -2,7 +2,7 @@

22# Do not edit!

44{

5− version = "2022.4.7";

5+ version = "2022.5.0";

66 components = {

77 "abode" = ps: with ps; [

88 abodepy

@@ -157,10 +157,6 @@

157157 ];

158158 "arest" = ps: with ps; [

159159 ];

160− "arlo" = ps: with ps; [

161− ha-ffmpeg

162− pyarlo

163− ];

164160 "arris_tg2492lg" = ps: with ps; [

165161 arris-tg2492lg

166162 ];

@@ -554,8 +550,6 @@

554550 "digital_ocean" = ps: with ps; [

555551 digital-ocean

556552 ];

557− "digitalloggers" = ps: with ps; [

558− ]; # missing inputs: dlipower

559553 "directv" = ps: with ps; [

560554 directv

561555 ];

@@ -993,8 +987,7 @@

993987 ];

994988 "google" = ps: with ps; [

995989 aiohttp-cors

996− google-api-python-client

997− httplib2

990+ gcal-sync

998991 oauth2client

999992 ];

1000993 "google_assistant" = ps: with ps; [

@@ -1248,9 +1241,15 @@

12481241 ];

12491242 "insteon" = ps: with ps; [

12501243 aiohttp-cors

1244+ fnvhash

1245+ home-assistant-frontend

1246+ insteon-frontend-home-assistant

1247+ lru-dict

1248+ pillow

12511249 pyinsteon

12521250 pyserial

12531251 pyudev

1252+ sqlalchemy

12541253 ];

12551254 "integration" = ps: with ps; [

12561255 ];

@@ -1391,8 +1390,10 @@

13911390 life360

13921391 ];

13931392 "lifx" = ps: with ps; [

1393+ aiohttp-cors

13941394 aiolifx

13951395 aiolifx-effects

1396+ ifaddr

13961397 ];

13971398 "lifx_cloud" = ps: with ps; [

13981399 ];

@@ -1514,6 +1515,9 @@

15141515 "mazda" = ps: with ps; [

15151516 pymazda

15161517 ];

1518+ "meater" = ps: with ps; [

1519+ meater-python

1520+ ];

15171521 "media_extractor" = ps: with ps; [

15181522 aiohttp-cors

15191523 youtube-dl-light

@@ -2088,6 +2092,9 @@

20882092 ];

20892093 "qnap" = ps: with ps; [

20902094 ]; # missing inputs: qnapstats

2095+ "qnap_qsw" = ps: with ps; [

2096+ aioqsw

2097+ ];

20912098 "qrcode" = ps: with ps; [

20922099 pillow

20932100 pyzbar

@@ -2309,6 +2316,10 @@

23092316 "sentry" = ps: with ps; [

23102317 sentry-sdk

23112318 ];

2319+ "senz" = ps: with ps; [

2320+ aiohttp-cors

2321+ aiosenz

2322+ ];

23122323 "serial" = ps: with ps; [

23132324 pyserial-asyncio

23142325 ];

@@ -2382,6 +2393,10 @@

23822393 ];

23832394 "slide" = ps: with ps; [

23842395 ]; # missing inputs: goslide-api

2396+ "slimproto" = ps: with ps; [

2397+ aiohttp-cors

2398+ aioslimproto

2399+ ];

23852400 "sma" = ps: with ps; [

23862401 pysma

23872402 ];

@@ -2420,7 +2435,7 @@

24202435 paho-mqtt

24212436 ];

24222437 "snmp" = ps: with ps; [

2423− pysnmp

2438+ pysnmplib

24242439 ];

24252440 "solaredge" = ps: with ps; [

24262441 solaredge

@@ -2747,6 +2762,9 @@

27472762 pytradfri

27482763 ]

27492764 ++ pytradfri.extras-require.async;

2765+ "trafikverket_ferry" = ps: with ps; [

2766+ pytrafikverket

2767+ ];

27502768 "trafikverket_train" = ps: with ps; [

27512769 pytrafikverket

27522770 ];

@@ -2828,11 +2846,10 @@

28282846 ];

28292847 "update" = ps: with ps; [

28302848 ];

2831− "updater" = ps: with ps; [

2832− ];

28332849 "upnp" = ps: with ps; [

28342850 aiohttp-cors

28352851 async-upnp-client

2852+ getmac

28362853 ifaddr

28372854 zeroconf

28382855 ];

@@ -3168,7 +3185,6 @@

31683185 "apprise"

31693186 "aprs"

31703187 "arcam_fmj"

3171− "arlo"

31723188 "aseko_pool_live"

31733189 "asuswrt"

31743190 "atag"

@@ -3436,6 +3452,7 @@

34363452 "manual_mqtt"

34373453 "maxcube"

34383454 "mazda"

3455+ "meater"

34393456 "media_player"

34403457 "media_source"

34413458 "melcloud"

@@ -3540,6 +3557,7 @@

35403557 "pvpc_hourly_pricing"

35413558 "python_script"

35423559 "qld_bushfire"

3560+ "qnap_qsw"

35433561 "rachio"

35443562 "radarr"

35453563 "radio_browser"

@@ -3582,6 +3600,7 @@

35823600 "sensibo"

35833601 "sensor"

35843602 "sentry"

3603+ "senz"

35853604 "seventeentrack"

35863605 "shell_command"

35873606 "shelly"

@@ -3595,6 +3614,7 @@

35953614 "siren"

35963615 "slack"

35973616 "sleepiq"

3617+ "slimproto"

35983618 "sma"

35993619 "smappee"

36003620 "smart_meter_texas"

@@ -3648,6 +3668,7 @@

36483668 "tailscale"

36493669 "tankerkoenig"

36503670 "tasmota"

3671+ "tautulli"

36513672 "tcp"

36523673 "telegram"

36533674 "telegram_bot"

@@ -3671,6 +3692,7 @@

36713692 "trace"

36723693 "tractive"

36733694 "tradfri"

3695+ "trafikverket_ferry"

36743696 "trafikverket_train"

36753697 "trafikverket_weatherstation"

36763698 "transmission"

@@ -3689,7 +3711,6 @@

36893711 "upb"

36903712 "upcloud"

36913713 "update"

3692− "updater"

36933714 "upnp"

36943715 "uptime"

36953716 "uptimerobot"

pkgs/servers/home-assistant/default.nix+15−4

@@ -30,7 +30,6 @@ let

3030 defaultOverrides = [

3131 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt

3232 (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")

33− (mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=")

3433

3534 # pytest-aiohttp>0.3.0 breaks home-assistant tests

3635 (self: super: {

@@ -47,9 +46,21 @@ let

4746 aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {

4847 doCheck = false; # requires aiohttp>=1.0.0

4948 });

49+ gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {

50+ doCheck = false; # requires aiohttp>=1.0.0

51+ });

5052 hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {

5153 doCheck = false; # requires aiohttp>=1.0.0

5254 });

55+ pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: {

56+ doCheck = false; # requires pytest-aiohttp>=1.0.0

57+ });

58+ pynws = super.pynws.overridePythonAttrs (oldAttrs: {

59+ doCheck = false; # requires pytest-aiohttp>=1.0.0

60+ });

61+ pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: {

62+ doCheck = false; # requires pytest-aiohttp>=1.0.0

63+ });

5364 rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {

5465 doCheck = false; # requires pytest-aiohttp>=1.0.0

5566 });

@@ -110,7 +121,7 @@ let

110121 src = fetchFromGitHub {

111122 owner = "ManneW";

112123 repo = "vilfo-api-client-python";

113− rev = "v$version}";

124+ rev = "v${version}";

114125 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

115126 };

116127 });

@@ -168,7 +179,7 @@ let

168179 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

169180

170181 # Don't forget to run parse-requirements.py after updating

171− hassVersion = "2022.4.7";

182+ hassVersion = "2022.5.0";

172183

173184in python.pkgs.buildPythonApplication rec {

174185 pname = "homeassistant";

@@ -186,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {

186197 owner = "home-assistant";

187198 repo = "core";

188199 rev = version;

189− hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M=";

200+ hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";

190201 };

191202

192203 # leave this in, so users don't have to constantly update their downstream patch handling

pkgs/servers/home-assistant/frontend.nix+2−2

@@ -4,7 +4,7 @@ buildPythonPackage rec {

44 # the frontend version corresponding to a specific home-assistant version can be found here

55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json

66 pname = "home-assistant-frontend";

7− version = "20220405.0";

7+ version = "20220504.0";

88 format = "wheel";

1010 src = fetchPypi {

@@ -12,7 +12,7 @@ buildPythonPackage rec {

1212 pname = "home_assistant_frontend";

1313 dist = "py3";

1414 python = "py3";

15− sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";

15+ sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";

1616 };

1717

1818 # there is nothing to strip in this package

pkgs/servers/irc/inspircd/default.nix+2−2

@@ -142,13 +142,13 @@ in

142142

143143stdenv.mkDerivation rec {

144144 pname = "inspircd";

145− version = "3.12.0";

145+ version = "3.13.0";

146146

147147 src = fetchFromGitHub {

148148 owner = pname;

149149 repo = pname;

150150 rev = "v${version}";

151− sha256 = "sha256-3c7PFIZy/TGf68XdaSC25Amr8Zfb0O+za4ermIzQjnY=";

151+ sha256 = "1d5mnj86x4bk6iygns0cc15w315wrzmqxcq0sc4n75xsg6wwp1zl";

152152 };

153153

154154 outputs = [ "bin" "lib" "man" "doc" "out" ];

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

@@ -1,19 +1,19 @@

1−{ lib, buildGoPackage, fetchFromGitHub }:

1+{ lib, buildGoModule, fetchFromGitHub }:

3−buildGoPackage rec {

3+buildGoModule rec {

44 pname = "aws-s3-exporter";

5− version = "0.4.1";

6−

7− goPackagePath = "github.com/ribbybibby/s3_exporter";

5+ version = "0.5.0";

97 src = fetchFromGitHub {

108 owner = "ribbybibby";

119 repo = "s3_exporter";

1210 rev = "v${version}";

13− sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";

11+ sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";

1412 };

1513

16− doCheck = true;

14+ vendorSha256 = null;

15+

16+ ldflags = [ "-s" "-w" ];

1717

1818 meta = with lib; {

1919 description = "Exports Prometheus metrics about S3 buckets and objects";

pkgs/servers/web-apps/sogo/default.nix+2−2

@@ -1,6 +1,6 @@

11{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir

22, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests

3−, oathToolkit }:

3+, oath-toolkit }:

44gnustep.stdenv.mkDerivation rec {

55 pname = "SOGo";

66 version = "5.5.0";

@@ -13,7 +13,7 @@ gnustep.stdenv.mkDerivation rec {

1313 };

1414

1515 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];

16− buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];

16+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ];

1717

1818 patches = [

1919 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches

pkgs/tools/X11/opentabletdriver/default.nix+2−2

@@ -19,13 +19,13 @@

1919

2020buildDotnetModule rec {

2121 pname = "OpenTabletDriver";

22− version = "0.6.0.3";

22+ version = "0.6.0.4";

2323

2424 src = fetchFromGitHub {

2525 owner = "OpenTabletDriver";

2626 repo = "OpenTabletDriver";

2727 rev = "v${version}";

28− sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos=";

28+ sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8=";

2929 };

3030

3131 debPkg = fetchurl {

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

@@ -20,6 +20,7 @@

2020 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })

2121 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })

2222 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })

23+ (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

2324 (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

2425 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

2526 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

@@ -27,7 +28,6 @@

2728 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

2829 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

2930 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })

30− (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

3131 (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; })

3232 (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; })

3333 (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; })

pkgs/tools/admin/lxd/default.nix+1

@@ -48,6 +48,7 @@ buildGo118Package rec {

4848 '';

4949

5050 passthru.tests.lxd = nixosTests.lxd;

51+ passthru.tests.lxd-nftables = nixosTests.lxd-nftables;

5152

5253 nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

5354 buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev

pkgs/tools/admin/syft/default.nix+3−3

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "syft";

5− version = "0.44.1";

5+ version = "0.45.1";

77 src = fetchFromGitHub {

88 owner = "anchore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U=";

11+ sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew=";

1212 # populate values that require us to use git. By doing this in postFetch we

1313 # can delete .git afterwards and maintain better reproducibility of the src.

1414 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

2020 find "$out" -name .git -print0 | xargs -0 rm -rf

2121 '';

2222 };

23− vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI=";

23+ vendorSha256 = "sha256-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg=";

2424

2525 nativeBuildInputs = [ installShellFiles ];

2626

pkgs/tools/filesystems/ceph/default.nix+2−2

@@ -9,7 +9,7 @@

99, gtest

1010, cunit, snappy

1111, makeWrapper

12−, leveldb, oathToolkit

12+, leveldb, oath-toolkit

1313, libnl, libcap_ng

1414, rdkafka

1515, nixosTests

@@ -161,7 +161,7 @@ in rec {

161161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [

162162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3

163163 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit

164− snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka

164+ snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka

165165 cryptsetup sqlite lua icu bzip2

166166 ] ++ lib.optionals stdenv.isLinux [

167167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs

pkgs/tools/filesystems/xfsprogs/default.nix+2−2

@@ -4,11 +4,11 @@

55stdenv.mkDerivation rec {

66 pname = "xfsprogs";

7− version = "5.15.0";

7+ version = "5.16.0";

99 src = fetchurl {

1010 url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

11− sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk";

11+ hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58=";

1212 };

1313

1414 outputs = [ "bin" "dev" "out" "doc" ];

pkgs/tools/misc/chezmoi/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "chezmoi";

5− version = "2.15.1";

5+ version = "2.15.2";

77 src = fetchFromGitHub {

88 owner = "twpayne";

99 repo = "chezmoi";

1010 rev = "v${version}";

11− sha256 = "sha256-spIdY28ZC/+6bwWWwKW7Iu2E2eKD7MeRuxEAMN2e3H8=";

11+ sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28=";

1212 };

1313

14− vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";

14+ vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc=";

1515

1616 doCheck = false;

1717

pkgs/tools/misc/lookatme/default.nixdeleted−67

@@ -1,67 +0,0 @@

1−{ lib, python3, fetchFromGitHub }:

2−

3−let

4− py = python3.override {

5− packageOverrides = self: super: {

6− self = py;

7− # use click 7

8− click = self.callPackage ../../../development/python2-modules/click/default.nix { };

9− # needs pyyaml 5

10− pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {

11− name = "${oldAttrs.pname}-${version}";

12− version = "5.4.1";

13− src = fetchFromGitHub {

14− owner = "yaml";

15− repo = "pyyaml";

16− rev = version;

17− sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM=";

18− };

19− checkPhase = ''

20− runHook preCheck

21− PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all

22− runHook postCheck

23− '';

24− });

25− };

26− };

27−in

28−with py.pkgs;

29−

30−buildPythonApplication rec {

31− pname = "lookatme";

32− version = "2.3.2";

33− format = "setuptools";

34−

35− src = fetchPypi {

36− inherit pname version;

37− sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw=";

38− };

39−

40− checkInputs = [

41− pytest-mock

42− pytestCheckHook

43− six

44− ];

45−

46− disabledTests = [

47− # https://github.com/d0c-s4vage/lookatme/issues/126

48− "test_sanity_check_that_errors_are_detected"

49− "test_styles_defaults"

50− ];

51−

52− propagatedBuildInputs = [

53− click

54− pyyaml

55− pygments

56− marshmallow

57− mistune

58− urwid

59− ];

60−

61− meta = with lib; {

62− description = "An interactive, terminal-based markdown presenter";

63− homepage = "https://github.com/d0c-s4vage/lookatme";

64− license = licenses.mit;

65− maintainers = with maintainers; [ ameer ];

66− };

67−}

pkgs/tools/networking/networkmanager/applet/default.nix+1−1

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {

7474 passthru = {

7575 updateScript = gnome.updateScript {

7676 packageName = pname;

77− attrPath = "networkmanager-applet";

77+ attrPath = "networkmanagerapplet";

7878 versionPolicy = "odd-unstable";

7979 };

8080 };

pkgs/tools/networking/pssh/default.nix+7−4

@@ -1,14 +1,14 @@

1−{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:

1+{ lib, fetchFromGitHub, python3Packages, openssh, rsync }:

3−python2Packages.buildPythonApplication rec {

3+python3Packages.buildPythonApplication rec {

44 pname = "pssh";

5− version = "2.3.1";

5+ version = "2.3.4";

77 src = fetchFromGitHub {

88 owner = "lilydjwg";

99 repo = "pssh";

1010 rev = "v${version}";

11− sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";

11+ hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";

1212 };

1313

1414 postPatch = ''

@@ -20,6 +20,9 @@ python2Packages.buildPythonApplication rec {

2020 done

2121 '';

2222

23+ # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126

24+ doCheck = false;

25+

2326 meta = with lib; {

2427 description = "Parallel SSH Tools";

2528 longDescription = ''

pkgs/tools/security/fulcio/default.nix+3−3

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "fulcio";

5− version = "0.4.0";

5+ version = "0.4.1";

77 src = fetchFromGitHub {

88 owner = "sigstore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";

11+ sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";

1212 # populate values that require us to use git. By doing this in postFetch we

1313 # can delete .git afterwards and maintain better reproducibility of the src.

1414 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

2020 find "$out" -name .git -print0 | xargs -0 rm -rf

2121 '';

2222 };

23− vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";

23+ vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";

2424

2525 nativeBuildInputs = [ installShellFiles ];

2626

pkgs/tools/security/gopass/default.nix+3−3

@@ -13,7 +13,7 @@

1313

1414buildGoModule rec {

1515 pname = "gopass";

16− version = "1.14.0";

16+ version = "1.14.1";

1717

1818 nativeBuildInputs = [ installShellFiles makeWrapper ];

1919

@@ -21,10 +21,10 @@ buildGoModule rec {

2121 owner = "gopasspw";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E=";

24+ sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";

2525 };

2626

27− vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk=";

27+ vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";

2828

2929 subPackages = [ "." ];

3030

pkgs/tools/security/grype/default.nix+3−3

@@ -6,13 +6,13 @@

77buildGoModule rec {

88 pname = "grype";

9− version = "0.36.0";

9+ version = "0.36.1";

1010

1111 src = fetchFromGitHub {

1212 owner = "anchore";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw=";

15+ sha256 = "sha256-BJSjJrDXZHB4MY4RZCmuC5Gn9YJiCQwyOFrXiGX1h18=";

1616 # populate values that require us to use git. By doing this in postFetch we

1717 # can delete .git afterwards and maintain better reproducibility of the src.

1818 leaveDotGit = true;

@@ -25,7 +25,7 @@ buildGoModule rec {

2525 '';

2626 };

2727

28− vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI=";

28+ vendorSha256 = "sha256-aIFom4hGx7HTobCh9YRyqyf9gUpJIaxAstUUkHjSFnA=";

2929

3030 nativeBuildInputs = [

3131 installShellFiles

pkgs/tools/security/jadx/default.nix+3−3

@@ -2,13 +2,13 @@

33let

44 pname = "jadx";

5− version = "1.3.4";

5+ version = "1.3.5";

77 src = fetchFromGitHub {

88 owner = "skylot";

99 repo = pname;

1010 rev = "v${version}";

11− hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";

11+ hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";

1212 };

1313

1414 deps = stdenv.mkDerivation {

@@ -40,7 +40,7 @@ let

4040 '';

4141

4242 outputHashMode = "recursive";

43− outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";

43+ outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";

4444 };

4545in stdenv.mkDerivation {

4646 inherit pname version src;

pkgs/tools/security/nmap/default.nix+6−18

@@ -1,9 +1,7 @@

11{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

22, pcre, libssh2

3−, graphicalSupport ? false

43, libX11 ? null

54, gtk2 ? null

6−, python2 ? null

75, makeWrapper ? null

86, withLua ? true

97}:

@@ -11,7 +9,7 @@

119with lib;

1210

1311stdenv.mkDerivation rec {

14− pname = "nmap${optionalString graphicalSupport "-graphical"}";

12+ pname = "nmap";

1513 version = "7.92";

1614

1715 src = fetchurl {

@@ -41,7 +39,9 @@ stdenv.mkDerivation rec {

4139 configureFlags = [

4240 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

4341 "--with-liblinear=included"

44− ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];

42+ "--without-ndiff"

43+ "--without-zenmap"

44+ ];

4545

4646 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

4747 "AR=${stdenv.cc.bintools.targetPrefix}ar"

@@ -49,20 +49,8 @@ stdenv.mkDerivation rec {

4949 "CC=${stdenv.cc.targetPrefix}gcc"

5050 ];

5151

52− pythonPath = with python2.pkgs; optionals graphicalSupport [

53− pygtk pysqlite pygobject2 pycairo

54− ];

55−

56− nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];

57− buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [

58− python2 libX11 gtk2

59− ]);

60−

61− postInstall = optionalString graphicalSupport ''

62− buildPythonPath "$out $pythonPath"

63− patchPythonScript $out/bin/ndiff

64− patchPythonScript $out/bin/zenmap

65− '';

52+ nativeBuildInputs = [ pkg-config ];

53+ buildInputs = [ pcre libssh2 libpcap openssl ];

6654

6755 enableParallelBuilding = true;

6856

pkgs/tools/security/oath-toolkit/update.sh+1−1

@@ -5,7 +5,7 @@ set -euo pipefail

66nixfile='default.nix'

77release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'

8−attr='oathToolkit'

8+attr='oath-toolkit'

99command='oathtool --version'

1010

1111color() {

pkgs/tools/security/pass/extensions/otp.nix+3−3

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, oathToolkit }:

1+{ lib, stdenv, fetchFromGitHub, oath-toolkit }:

33stdenv.mkDerivation rec {

44 pname = "pass-otp";

@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {

1111 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";

1212 };

1313

14− buildInputs = [ oathToolkit ];

14+ buildInputs = [ oath-toolkit ];

1515

1616 dontBuild = true;

1717

1818 patchPhase = ''

19− sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash

19+ sed -i -e 's|OATH=\$(which oathtool)|OATH=${oath-toolkit}/bin/oathtool|' otp.bash

2020 '';

2121

2222 installFlags = [ "PREFIX=$(out)"

pkgs/tools/security/plasma-pass/default.nix+2−2

@@ -1,7 +1,7 @@

11{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules

22, ki18n

33, kitemmodels

4−, oathToolkit

4+, oath-toolkit

55, qgpgme

66, plasma-framework

77, qt5 }:

@@ -21,7 +21,7 @@ mkDerivation rec {

2121 buildInputs = [

2222 ki18n

2323 kitemmodels

24− oathToolkit

24+ oath-toolkit

2525 qgpgme

2626 plasma-framework

2727 qt5.qtbase

pkgs/tools/system/runitor/default.nixnew file+52

@@ -0,0 +1,52 @@

1+{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:

3+buildGoModule rec {

4+ pname = "runitor";

5+ version = "0.9.2";

6+ vendorSha256 = null;

8+ src = fetchFromGitHub {

9+ owner = "bdd";

10+ repo = "runitor";

11+ rev = "v${version}";

12+ sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4";

13+ };

14+

15+ ldflags = [

16+ "-s" "-w" "-X main.Version=v${version}"

17+ ];

18+

19+ # TODO(cole-h):

20+ # End-to-end tests requiring localhost networking currently under

21+ # OfBorg's Linux builders, while passing under Darwin.

22+ #

23+ # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891

24+ #

25+ # Temporarily disable tests.

26+ doCheck = false;

27+

28+ passthru.tests.version = testers.testVersion {

29+ package = runitor;

30+ command = "runitor -version";

31+ version = "v${version}";

32+ };

33+

34+ # Unit tests require binding to local addresses for listening sockets.

35+ __darwinAllowLocalNetworking = true;

36+

37+ meta = with lib; {

38+ homepage = "https://bdd.fi/x/runitor";

39+ description = "A command runner with healthchecks.io integration";

40+ longDescription = ''

41+ Runitor runs the supplied command, captures its output, and based on its exit

42+ code reports successful or failed execution to https://healthchecks.io or your

43+ private instance.

44+

45+ Healthchecks.io is a web service for monitoring periodic tasks. It's like a

46+ dead man's switch for your cron jobs. You get alerted if they don't run on time

47+ or terminate with a failure.

48+ '';

49+ license = licenses.bsd0;

50+ maintainers = with maintainers; [ bdd ];

51+ };

52+}

pkgs/tools/text/xml/xpf/default.nixdeleted−21

@@ -1,21 +0,0 @@

1−{lib, stdenv, fetchurl, python2, libxml2}:

2−

3−assert libxml2.pythonSupport == true;

4−

5−stdenv.mkDerivation rec {

6− pname = "xpf";

7− version = "0.2";

8−

9− src = fetchurl {

10− url = "http://tarballs.nixos.org/xpf-${version}.tar.gz";

11− sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";

12− };

13−

14− buildInputs = [ python2 libxml2 ];

15−

16− meta = {

17− description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";

18− homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters";

19− platforms = lib.platforms.unix;

20− };

21−}

pkgs/tools/virtualization/lxd-image-server/default.nix+3

@@ -3,6 +3,7 @@

33, rsync

44, python3

55, fetchFromGitHub

6+, nixosTests

67}:

89python3.pkgs.buildPythonApplication rec {

@@ -37,6 +38,8 @@ python3.pkgs.buildPythonApplication rec {

3738

3839 doCheck = false;

3940

41+ passthru.tests.lxd-image-server = nixosTests.lxd-image-server;

42+

4043 meta = with lib; {

4144 description = "Creates and manages a simplestreams lxd image server on top of nginx";

4245 homepage = "https://github.com/Avature/lxd-image-server";

pkgs/top-level/aliases.nix+9−2

@@ -92,6 +92,7 @@ mapAliases ({

9292 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26

9393 avldrums-lv2 = x42-avldrums; # Added 2020-03-29

9494 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18

95+ awesome-4-0 = awesome; # Added 2022-05-05

9596 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;

9697 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02

9798

@@ -146,6 +147,7 @@ mapAliases ({

146147

147148 c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10

148149 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02

150+ caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25

149151 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13

150152 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13

151153 callPackage_i686 = pkgsi686Linux.callPackage;

@@ -324,6 +326,7 @@ mapAliases ({

324326 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22

325327 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;

326328 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14

329+ dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21

327330 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03

328331 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22

329332 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07

@@ -849,7 +852,6 @@ mapAliases ({

849852 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12

850853 netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22

851854 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31

852− networkmanagerapplet = networkmanager-applet; # Added 2022-04-30

853855 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22

854856 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22

855857 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22

@@ -871,7 +873,8 @@ mapAliases ({

871873 nix_2_6 = nixVersions.nix_2_6;

872874 nixopsUnstable = nixops_unstable; # Added 2022-03-03

873875 nmap-unfree = nmap; # Added 2021-04-06

874− nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22

876+ nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26

877+ nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26

875878 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

876879 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

877880 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

@@ -882,6 +885,7 @@ mapAliases ({

882885

883886 ### O ###

884887

888+ oathToolkit = oath-toolkit; # Added 2022-04-04

885889 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

886890 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16

887891 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16

@@ -1002,6 +1006,7 @@ mapAliases ({

10021006 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19

10031007 ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18

10041008 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22

1009+ pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21

10051010 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18

10061011 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22

10071012 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02

@@ -1306,6 +1311,7 @@ mapAliases ({

13061311 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

13071312 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

13081313 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08

1314+ twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26

13091315 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

13101316

13111317 ### U ###

@@ -1392,6 +1398,7 @@ mapAliases ({

13921398 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22

13931399 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

13941400 xp-pen-g430 = pentablet-driver; # Added 2020-05-03

1401+ xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26

13951402 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22

13961403 xf86_input_mtrack = throw ''

13971404 xf86_input_mtrack has been removed from nixpkgs as it is broken and

pkgs/top-level/all-packages.nix+16−31

@@ -406,6 +406,8 @@ with pkgs;

406406

407407 protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };

408408

409+ protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { };

410+

409411 protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };

410412

411413 protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };

@@ -3360,6 +3362,10 @@ with pkgs;

33603362

33613363 earlyoom = callPackage ../os-specific/linux/earlyoom { };

33623364

3365+ easycrypt = callPackage ../applications/science/logic/easycrypt { };

3366+

3367+ easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { };

3368+

33633369 EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };

33643370

33653371 ecasound = callPackage ../applications/audio/ecasound { };

@@ -8560,8 +8566,6 @@ with pkgs;

85608566

85618567 networkmanager = callPackage ../tools/networking/networkmanager { };

85628568

8563− networkmanager-applet = callPackage ../tools/networking/networkmanager/applet { };

8564−

85658569 networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };

85668570

85678571 networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };

@@ -8578,6 +8582,8 @@ with pkgs;

85788582

85798583 networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };

85808584

8585+ networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };

8586+

85818587 libnma = callPackage ../tools/networking/networkmanager/libnma { };

85828588

85838589 libnma-gtk4 = libnma.override { withGtk4 = true; };

@@ -8731,10 +8737,6 @@ with pkgs;

87318737

87328738 nmap = callPackage ../tools/security/nmap { };

87338739

8734− nmap-graphical = nmap.override {

8735− graphicalSupport = true;

8736− };

8737−

87388740 nmap-formatter = callPackage ../tools/security/nmap-formatter { };

87398741

87408742 nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };

@@ -8825,7 +8827,7 @@ with pkgs;

88258827

88268828 oapi-codegen = callPackage ../tools/networking/oapi-codegen { };

88278829

8828− oathToolkit = callPackage ../tools/security/oath-toolkit { };

8830+ oath-toolkit = callPackage ../tools/security/oath-toolkit { };

88298831

88308832 oatpp = callPackage ../development/libraries/oatpp { };

88318833

@@ -9497,7 +9499,9 @@ with pkgs;

94979499

94989500 proxify = callPackage ../tools/networking/proxify { };

94999501

9500− proxysql = callPackage ../servers/sql/proxysql { };

9502+ proxysql = callPackage ../servers/sql/proxysql {

9503+ stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv;

9504+ };

95019505

95029506 prs = callPackage ../tools/security/prs { };

95039507

@@ -11799,10 +11803,6 @@ with pkgs;

1179911803 inherit (darwin.apple_sdk.frameworks) AppKit;

1180011804 };

1180111805

11802− xpf = callPackage ../tools/text/xml/xpf {

11803− libxml2 = libxml2Python;

11804− };

11805−

1180611806 xsecurelock = callPackage ../tools/X11/xsecurelock { };

1180711807

1180811808 xsel = callPackage ../tools/misc/xsel { };

@@ -14495,9 +14495,6 @@ with pkgs;

1449514495

1449614496 inherit (ocamlPackages) reason;

1449714497

14498− pixie = callPackage ../development/interpreters/pixie { };

14499− dust = callPackage ../development/interpreters/pixie/dust.nix { };

14500−

1450114498 buildRubyGem = callPackage ../development/ruby-modules/gem { };

1450214499 defaultGemConfig = callPackage ../development/ruby-modules/gem-config {

1450314500 inherit (darwin) DarwinTools cctools;

@@ -25261,11 +25258,10 @@ with pkgs;

2526125258

2526225259 avrdudess = callPackage ../applications/misc/avrdudess { };

2526325260

25264− awesome-4-0 = callPackage ../applications/window-managers/awesome {

25261+ awesome = callPackage ../applications/window-managers/awesome {

2526525262 cairo = cairo.override { xcbSupport = true; };

2526625263 inherit (texFunctions) fontsConf;

2526725264 };

25268− awesome = awesome-4-0;

2526925265

2527025266 awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };

2527125267

@@ -27836,8 +27832,6 @@ with pkgs;

2783627832 inherit (luajitPackages) luafilesystem;

2783727833 };

2783827834

27839− lookatme = callPackage ../tools/misc/lookatme {};

27840−

2784127835 looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };

2784227836

2784327837 ltc-tools = callPackage ../applications/audio/ltc-tools { };

@@ -29359,7 +29353,7 @@ with pkgs;

2935929353

2936029354 udevil = callPackage ../applications/misc/udevil {};

2936129355

29362− udiskie = python3.pkgs.callPackage ../applications/misc/udiskie { };

29356+ udiskie = callPackage ../applications/misc/udiskie { };

2936329357

2936429358 sacc = callPackage ../applications/networking/gopher/sacc { };

2936529359

@@ -30074,10 +30068,6 @@ with pkgs;

3007430068 swt = swt_jdk8;

3007530069 };

3007630070

30077− twister = callPackage ../applications/networking/p2p/twister {

30078− boost = boost16x;

30079− };

30080−

3008130071 twmn = libsForQt5.callPackage ../applications/misc/twmn { };

3008230072

3008330073 testssl = callPackage ../applications/networking/testssl { };

@@ -33428,13 +33418,6 @@ with pkgs;

3342833418

3342933419 caffeWithCuda = caffe.override { cudaSupport = true; };

3343033420

33431− caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {

33432− inherit (python3Packages) python future six numpy pydot;

33433− protobuf = protobuf3_1;

33434− python-protobuf = python3Packages.protobuf.override { inherit protobuf; };

33435− opencv3 = opencv3WithoutCuda; # Used only for image loading.

33436− });

33437−

3343833421 caffeine-ng = callPackage ../tools/X11/caffeine-ng {};

3343933422

3344033423 cntk = callPackage ../applications/science/math/cntk {

@@ -34474,6 +34457,8 @@ with pkgs;

3447434457

3447534458 runit = callPackage ../tools/system/runit { };

3447634459

34460+ runitor = callPackage ../tools/system/runitor { };

34461+

3447734462 refind = callPackage ../tools/bootloaders/refind { };

3447834463

3447934464 spectrojack = callPackage ../applications/audio/spectrojack { };

pkgs/top-level/python-packages.nix+11−1

@@ -2840,6 +2840,8 @@ in {

28402840

28412841 fastavro = callPackage ../development/python-modules/fastavro { };

28422842

2843+ fastbencode = callPackage ../development/python-modules/fastbencode { };

2844+

28432845 fastcache = callPackage ../development/python-modules/fastcache { };

28442846

28452847 fastcore = callPackage ../development/python-modules/fastcore { };

@@ -3266,6 +3268,8 @@ in {

32663268

32673269 gbulb = callPackage ../development/python-modules/gbulb { };

32683270

3271+ gcal-sync = callPackage ../development/python-modules/gcal-sync { };

3272+

32693273 gcovr = callPackage ../development/python-modules/gcovr { };

32703274

32713275 gcsfs = callPackage ../development/python-modules/gcsfs { };

@@ -4146,6 +4150,8 @@ in {

41464150

41474151 installer = callPackage ../development/python-modules/installer { };

41484152

4153+ insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { };

4154+

41494155 intake = callPackage ../development/python-modules/intake { };

41504156

41514157 intake-parquet = callPackage ../development/python-modules/intake-parquet { };

@@ -5161,6 +5167,8 @@ in {

51615167

51625168 measurement = callPackage ../development/python-modules/measurement { };

51635169

5170+ meater-python = callPackage ../development/python-modules/meater-python { };

5171+

51645172 mecab-python3 = callPackage ../development/python-modules/mecab-python3 { };

51655173

51665174 mechanicalsoup = callPackage ../development/python-modules/mechanicalsoup { };

@@ -9482,7 +9490,9 @@ in {

94829490

94839491 skytemple-icons = callPackage ../development/python-modules/skytemple-icons { };

94849492

9485− skytemple-rust = callPackage ../development/python-modules/skytemple-rust { };

9493+ skytemple-rust = callPackage ../development/python-modules/skytemple-rust {

9494+ inherit (pkgs.darwin.apple_sdk.frameworks) Foundation;

9495+ };

94869496

94879497 skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { };

94889498

pkgs/top-level/release-lib.nix+1−1

@@ -103,7 +103,7 @@ rec {

103103 forAllSystems = genAttrs supportedSystems;

104104

105105

106− # Generate attributes for all sytems matching at least one of the given

106+ # Generate attributes for all systems matching at least one of the given

107107 # patterns

108108 forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns);

109109