master..100ee30 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

135 files changed+1310−1367

unifiedsplit

maintainers/maintainer-list.nix−6

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

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− };

14181412 bdesham = {

14191413 email = "benjamin@esham.io";

14201414 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 standalone image, undo some of the minimal profile stuff

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

3131 documentation.enable = true;

3232 documentation.nixos.enable = true;

3333 environment.noXlibs = false;

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.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

495+ auth requisite ${pkgs.oathToolkit}/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.oath-toolkit ]

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

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.oath-toolkit}/lib/security/pam_oath.so,

1224+ "mr ${pkgs.oathToolkit}/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/web-apps/keycloak.nix+1−2

@@ -540,8 +540,7 @@ in

540540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;

541541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

542542 db-password._secret = cfg.database.passwordFile;

543− db-url-host = cfg.database.host;

544− db-url-port = toString cfg.database.port;

543+ db-url-host = "${cfg.database.host}:${toString cfg.database.port}";

545544 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;

546545 db-url-properties = prefixUnlessEmpty "?" dbProps;

547546 db-url = null;

nixos/tests/all-tests.nix+1

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

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

285285 lvm2 = handleTest ./lvm2 {};

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

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

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

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

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

nixos/tests/common/lxd/config.yamldeleted−24

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

1−storage_pools:

2− - name: default

3− driver: dir

4− config:

5− source: /var/lxd-pool

6−

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+48−15

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

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

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

33let

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− };

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=";

917 };

1018

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

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

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+

1346

1447in {

1548 name = "lxd-image-server";

1649

1750 meta = with pkgs.lib.maintainers; {

18− maintainers = [ mkg20001 patryk27 ];

51+ maintainers = [ mkg20001 ];

1952 };

2053

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

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

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

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

69102

103+

70104 machine.succeed(

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

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

72106 )

73107

74108 machine.succeed(

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

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

76110 )

77111

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

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

79113

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

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

82− machine.sleep(5)

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

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

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

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

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

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

nixos/tests/lxd-image.nixnew file+89

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

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

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+94−40

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

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

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

33let

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;

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

819

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

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

11− };

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+ '';

1232 };

1333

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

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

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=";

47+ };

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+ '';

76+

1677

1778in {

1879 name = "lxd";

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

2384

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

2586 virtualisation = {

26− diskSize = 2048;

27−

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

2988 # cores to lean on

3089 cores = 2;

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

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

50109

51110 machine.succeed(

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

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

53112 )

54113

55114 machine.succeed(

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

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

57116 )

58117

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")

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")

65122

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

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

68− machine.sleep(5)

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

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

69125

70126 ## ---------- ##

71127 ## limits.cpu ##

72128

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

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

75− machine.sleep(5)

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

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

76131

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

133+ # to the primal methods

77134 assert (

78135 "1"

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

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

80137 )

81138

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

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

84− machine.sleep(5)

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

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

85141

86142 assert (

87143 "2"

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

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

89145 )

90146

91147 ## ------------- ##

92148 ## limits.memory ##

93149

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

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

96− machine.sleep(5)

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

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

97152

98153 assert (

99154 "MemTotal: 62500 kB"

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

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

101156 )

102157

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

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

105− machine.sleep(5)

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

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

106160

107161 assert (

108162 "MemTotal: 125000 kB"

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

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

110164 )

111165

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

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

113167 '';

114168})

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 oath-toolkit

10+ # Generated in nix-shell -p oathToolkit

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

1212 # and picking a the first 4:

1313 oathSnakeOilPassword1 = "143349";

pkgs/applications/misc/libosmocore/default.nix+6−21

@@ -1,25 +1,16 @@

1−{ lib, stdenv

2−, autoreconfHook

3−, fetchFromGitHub

4−, gnutls

5−, libmnl

6−, libusb1

7−, lksctp-tools

8−, pcsclite

9−, pkg-config

10−, python3

11−, talloc

1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config

2+, pcsclite, talloc, python2, gnutls

123}:

134

145stdenv.mkDerivation rec {

156 pname = "libosmocore";

16− version = "1.6.0";

7+ version = "1.2.0";

178

189 src = fetchFromGitHub {

1910 owner = "osmocom";

2011 repo = "libosmocore";

2112 rev = version;

22− hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4=";

13+ sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";

2314 };

2415

2516 propagatedBuildInputs = [

@@ -27,17 +18,11 @@ stdenv.mkDerivation rec {

2718 ];

2819

2920 nativeBuildInputs = [

30− autoreconfHook

31− pkg-config

32− python3

21+ autoreconfHook pkg-config

3322 ];

3423

3524 buildInputs = [

36− gnutls

37− libmnl

38− libusb1

39− lksctp-tools

40− pcsclite

25+ pcsclite python2 gnutls

4126 ];

4227

4328 enableParallelBuilding = true;

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

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

33buildGoModule rec {

44 pname = "tut";

5− version = "0.0.46";

5+ version = "0.0.42";

77 src = fetchFromGitHub {

88 owner = "RasmusLindroth";

99 repo = pname;

1010 rev = version;

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

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

1212 };

1313

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

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

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

11{ lib

2−, asciidoc

32, fetchFromGitHub

3+, buildPythonApplication

4+, asciidoc-full

5+, docopt

6+, gettext

47, gobject-introspection

58, gtk3

6−, installShellFiles

9+, keyutils

710, libappindicator-gtk3

811, libnotify

912, librsvg

10−, python3

13+, nose

14+, pygobject3

15+, pyyaml

1116, udisks2

1217, wrapGAppsHook

1318}:

1419

15−python3.pkgs.buildPythonApplication rec {

20+buildPythonApplication rec {

1621 pname = "udiskie";

17− version = "2.4.2";

18−

19− format = "setuptools";

22+ version = "2.4.0";

2023

2124 src = fetchFromGitHub {

2225 owner = "coldfix";

2326 repo = "udiskie";

2427 rev = "v${version}";

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

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

2629 };

2730

28− patches = [

29− ./locale-path.patch

30− ];

31−

32− postPatch = ''

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

34− '';

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

3532

3633 nativeBuildInputs = [

37− asciidoc # Man page

34+ asciidoc-full # Man page

35+ gettext

3836 gobject-introspection

39− installShellFiles

4037 wrapGAppsHook

4138 ];

4239

43− dontWrapGApps = true;

44−

4540 buildInputs = [

4641 gobject-introspection

4742 gtk3

@@ -51,9 +46,8 @@ python3.pkgs.buildPythonApplication rec {

5146 udisks2

5247 ];

5348

54− propagatedBuildInputs = with python3.pkgs; [

49+ propagatedBuildInputs = [

5550 docopt

56− keyutils

5751 pygobject3

5852 pyyaml

5953 ];

@@ -63,20 +57,21 @@ python3.pkgs.buildPythonApplication rec {

6357 '';

6458

6559 postInstall = ''

66− installManPage doc/udiskie.8

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

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

6762 '';

6863

69− preFixup = ''

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

71− '';

72−

73− checkInputs = with python3.pkgs; [

74− pytestCheckHook

64+ checkInputs = [

65+ keyutils

66+ nose

7567 ];

7668

69+ checkPhase = ''

70+ nosetests

71+ '';

72+

7773 meta = with lib; {

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

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

8075 description = "Removable disk automounter for udisks";

8176 longDescription = ''

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

@@ -93,6 +88,6 @@ python3.pkgs.buildPythonApplication rec {

9388 - password caching (requires python keyutils 0.3)

9489 '';

9590 license = licenses.mit;

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

91+ maintainers = with maintainers; [ AndersonTorres ];

9792 };

9893}

pkgs/applications/misc/udiskie/locale-path.patchdeleted−17

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

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.13";

9+ version = "5.6.10.7";

1010

1111 src = fetchurl {

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

13− sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";

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

13+ sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";

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.04";

15+ version = "4.03";

1616

1717 src = fetchzip {

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

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

19+ sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6";

2020 };

2121

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

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

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

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−

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

5653, libvaSupport ? stdenv.isLinux

5754, libva

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

6966

7067 deps = [

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

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

69+ fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11

7370 libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

7471 libXext libXfixes libXi libXrandr libXrender libxshmfence

7572 libXtst libuuid mesa nspr nss pango pipewire udev wayland

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

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

132129

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

134− patchelf \

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

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

131+ patchelf \

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

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

137134 done

138135

139136 # Fix paths

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

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

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

175172 ''}

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

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

177175 ${optionalString vulkanSupport ''

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

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

180177 ''}

181178 )

182179 '';

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

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

4545 }

4646 },

4747 "ungoogled-chromium": {

48− "version": "101.0.4951.54",

49− "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",

50− "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",

48+ "version": "101.0.4951.41",

49+ "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",

50+ "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",

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.54-1",

60− "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"

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

60+ "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"

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 = "101.0.1210.19";

4+ version = "99.0.1150.16";

55 revision = "1";

6− sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";

6+ sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";

77 };

88 dev = import ./browser.nix {

99 channel = "dev";

10− version = "102.0.1227.0";

10+ version = "100.0.1163.1";

1111 revision = "1";

12− sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";

12+ sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";

1313 };

1414 stable = import ./browser.nix {

1515 channel = "stable";

16− version = "100.0.1185.44";

16+ version = "98.0.1108.56";

1717 revision = "1";

18− sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";

18+ sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";

1919 };

2020}

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

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

33buildGoModule rec {

44 pname = "cloudflared";

5− version = "2022.5.0";

5+ version = "2022.4.1";

77 src = fetchFromGitHub {

88 owner = "cloudflare";

99 repo = "cloudflared";

1010 rev = version;

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

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

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.312.0";

3+ ver = "1.2.54.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 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";

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

88 } else {

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

10− sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";

10+ sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";

1111 };

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

1313in

pkgs/applications/networking/firewalld/default.nixdeleted−104

@@ -1,104 +0,0 @@

1−{ lib

2−, stdenv

3−, fetchFromGitHub

4−, autoreconfHook

5−, bash

6−, docbook_xml_dtd_42

7−, docbook-xsl-nons

8−, glib

9−, gobject-introspection

10−, gtk3

11−, intltool

12−, libnotify

13−, libxml2

14−, libxslt

15−, networkmanagerapplet

16−, pkg-config

17−, python3

18−, wrapGAppsNoGuiHook

19−, withGui ? false

20−}:

21−

22−let

23− pythonPath = python3.withPackages (ps: with ps; [

24− dbus-python

25− nftables

26− pygobject3

27− ] ++ lib.optionals withGui [

28− pyqt5

29− pyqt5_sip

30− ]);

31−in

32−stdenv.mkDerivation rec {

33− pname = "firewalld";

34− version = "1.1.1";

35−

36− src = fetchFromGitHub {

37− owner = "firewalld";

38− repo = "firewalld";

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

40− sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";

41− };

42−

43− patches = [

44− ./respect-xml-catalog-files-var.patch

45− ];

46−

47− postPatch = ''

48− substituteInPlace src/firewall/config/__init__.py.in \

49− --replace "/usr/share" "$out/share"

50−

51− for file in config/firewall-{applet,config}.desktop.in; do

52− substituteInPlace $file \

53− --replace "/usr/bin/" "$out/bin/"

54− done

55− '' + lib.optionalString withGui ''

56− substituteInPlace src/firewall-applet.in \

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

58− '';

59−

60− nativeBuildInputs = [

61− autoreconfHook

62− docbook_xml_dtd_42

63− docbook-xsl-nons

64− glib

65− intltool

66− libxml2

67− libxslt

68− pkg-config

69− python3

70− python3.pkgs.wrapPython

71− ] ++ lib.optionals withGui [

72− gobject-introspection

73− wrapGAppsNoGuiHook

74− ];

75−

76− buildInputs = [

77− bash

78− glib

79− ] ++ lib.optionals withGui [

80− gtk3

81− libnotify

82− pythonPath

83− ];

84−

85− dontWrapGApps = true;

86−

87− preFixup = lib.optionalString withGui ''

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

89− '';

90−

91− postFixup = ''

92− chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite

93− patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py

94− wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}"

95− wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}"

96− '';

97−

98− meta = with lib; {

99− description = "Firewall daemon with D-Bus interface";

100− homepage = "https://github.com/firewalld/firewalld";

101− license = licenses.gpl2Plus;

102− maintainers = with maintainers; [ SuperSandro2000 ];

103− };

104−}

pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patchdeleted−13

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

1−--- a/m4/jh_path_xml_catalog.m4

2−+++ b/m4/jh_path_xml_catalog.m4

3−@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],

4− [

5− AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl

6− AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

7−- if $jh_found_xmlcatalog && \

8−- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then

9−+ # empty argument forces libxml to use XML_CATALOG_FILES variable

10−+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then

11− AC_MSG_RESULT([found])

12− ifelse([$3],,,[$3

13− ])dnl

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.4";

4+ version = "2.55.2";

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 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";

13+ sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4=";

1414 };

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

1616 inherit pname version metaCommon;

17− sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";

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

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.1618";

46+ version = "1.5.1615";

4747

4848 src = fetchFromGitHub {

4949 owner = "psi-plus";

5050 repo = "psi-plus-snapshots";

5151 rev = version;

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

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

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-2022-04-29";

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

77 src = fetchFromSourcehut {

88 owner = "~taiite";

99 repo = "senpai";

10− rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";

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

10+ rev = "8091752a67781273944e7a79a803b7a671378313";

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

1212 };

1313

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

14+ vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";

1515

1616 subPackages = [

1717 "cmd/senpai"

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

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

22, pkg-config

33, python3

44, fetchFromGitLab

5−, fetchpatch

65, gtk3

76, glib

87, gdbm

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

4544 libayatana-appindicator-gtk3

4645 ];

4746

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−

6247 postPatch = ''

6348 patchShebangs man/manhelper.py

6449 '';

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

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

2323

2424stdenv.mkDerivation rec {

2525 pname = "liferea";

26− version = "1.13.8";

26+ version = "1.12.9";

2727

2828 src = fetchurl {

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

30− sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h";

30+ sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q";

3131 };

3232

3333 nativeBuildInputs = [

pkgs/applications/networking/p2p/twister/default.nixnew file+70

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

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

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

3+}:

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+1−3

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

99 src = fetchFromGitHub {

1010 owner = "haiwen";

1111 repo = "seafile-client";

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";

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

1513 sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

1614 };

1715

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

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

1414

1515stdenv.mkDerivation rec {

1616 pname = "onedrive";

17− version = "2.4.17";

17+ version = "2.4.16";

1818

1919 src = fetchFromGitHub {

2020 owner = "abraunegg";

2121 repo = pname;

2222 rev = "v${version}";

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

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

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,<6" \

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

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.5.0";

8+ version = "22.4.1";

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 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd";

14+ sha256 = "b9ce77ecd5bb48bd6534068b0582dfaa3b828f800b19ddec80387a84e00766da";

1515 };

1616

1717 nativeBuildInputs = [ qmake qttools ];

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

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

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

1818 '';

1919

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

21−

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

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

2422 installPhase = ''

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

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

1414 nativeBuildInputs = [ cmake ];

1515 buildInputs = [ zlib ];

1616

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

18− "-DSTATIC_BUILD=ON"

19− ];

2017 meta = with lib; {

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

2219 license = licenses.gpl3;

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

@@ -22,15 +22,8 @@ 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−

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

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

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

33− ;

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

3427

3528 preCheck = ''

3629 patchShebangs test/

pkgs/applications/science/logic/easycrypt/default.nixdeleted−50

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

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

2−

3−stdenv.mkDerivation rec {

4− pname = "easycrypt";

5− version = "2022.04";

6−

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.nixdeleted−24

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

1−{ python3Packages, easycrypt }:

2−

3−python3Packages.buildPythonApplication rec {

4− inherit (easycrypt) src version;

5−

6− pname = "easycrypt-runtest";

7−

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.6.1";

8+ version = "7.5.0";

99 format = "setuptools";

1010

1111 src = fetchFromGitHub {

1212 owner = "snakemake";

1313 repo = pname;

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

15− hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM=";

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

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

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.3";

85+ version = "3.0.17";

8686

8787 src = fetchurl {

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

89− sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ=";

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

9090 };

9191

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

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

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

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

6969 ];

7070

71− doCheck = true;

72−

7371 postInstall =

7472 let

7573 binPath = lib.makeBinPath [

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

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

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

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

33# from justinwoo/easy-purescript-nix

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

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

3535 };

3636

3737

38− buildInputs = [ zlib gmp ];

38+ buildInputs = [ zlib

39+ gmp

40+ ncurses5 ];

3941 libPath = lib.makeLibraryPath buildInputs;

4042 dontStrip = true;

4143

pkgs/development/interpreters/pixie/default.nixnew file+94

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

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

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

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

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.nixnew file+46

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

1+{ lib, stdenv, fetchFromGitHub

2+, pixie, rlwrap

3+}:

5+stdenv.mkDerivation rec {

6+ pname = "dust";

7+ version = "0-91";

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.patchnew file+25

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

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]))

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.patchnew file+119

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

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

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+2−10

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

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

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

33stdenv.mkDerivation rec {

44 version = "0.6.3";

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

1111 sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";

1212 };

1313

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 ];

14+ nativeBuildInputs = [ cmake python2 ];

2315

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

2517

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

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

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

1+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, 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 python3 ];

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

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.79.0";

19+ version = "1.78.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "deltachat";

2323 repo = "deltachat-core-rust";

2424 rev = version;

25− hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ=";

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

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-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU=";

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

3636 };

3737

3838 nativeBuildInputs = [

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

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

1−{ lib, stdenv, fetchFromGitHub, fetchpatch

2−, python3

1+{ lib, stdenv, fetchFromGitHub

2+, python2

33}:

55stdenv.mkDerivation rec {

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

1313 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";

1414 };

1515

16− nativeBuildInputs = [ python3 ];

16+ nativeBuildInputs = [ python2 ];

1717

1818 strictDeps = true;

1919

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 = ''

20+ patchPhase = ''

2921 patchShebangs src

3022 substituteInPlace src/Makefile \

3123 --replace /usr/local $out

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

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

1414

1515 buildInputs = [ zlib bzip2 xz curl ];

1616

17− configureFlags = if ! stdenv.hostPlatform.isStatic

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

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

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

2018

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− '';

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

3620

3721 preCheck = ''

3822 patchShebangs test/

pkgs/development/libraries/science/math/caffe2/default.nixnew file+151

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

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.patchnew file+46

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

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"

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.patchnew file+55

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

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+1−2

@@ -21,8 +21,7 @@ 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"

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

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

2625

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

2827

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

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

88stdenv.mkDerivation rec {

99 pname = "wolfssl";

10− version = "5.3.0";

10+ version = "5.2.0";

1111

1212 src = fetchFromGitHub {

1313 owner = "wolfSSL";

1414 repo = "wolfssl";

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

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

16+ sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k";

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.3";

5+ version = "3.0.4";

77 src = fetchFromGitHub {

88 owner = "sekrit-twc";

99 repo = "zimg";

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

11− sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20";

11+ sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00";

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.4";

14+ version = "0.2.3";

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 = "refs/tags/${version}";

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

22+ rev = version;

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

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.4.2";

10+ version = "0.3.4";

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-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";

19+ hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";

2020 };

2121

2222 propagatedBuildInputs = [

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

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

88buildPythonPackage rec {

99 pname = "aioslimproto";

10− version = "2.0.1";

10+ version = "2.0.0";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.9";

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

1616 owner = "home-assistant-libs";

1717 repo = pname;

1818 rev = version;

19− hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";

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

2020 };

2121

2222 checkInputs = [

2323 pytestCheckHook

2424 ];

2525

26− disabledTests = [

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

28− "test_msg_instantiation"

29− ];

30−

3126 pythonImportsCheck = [

3227 "aioslimproto"

3328 ];

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

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

1111

1212buildPythonPackage rec {

1313 pname = "androidtv";

14− version = "0.0.67";

14+ version = "0.0.66";

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-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";

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

2424 };

2525

2626 propagatedBuildInputs = [

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

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

2020

2121let

2222 pname = "ansible";

23− version = "5.7.1";

23+ version = "5.7.0";

2424in

2525buildPythonPackage {

2626 inherit pname version;

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

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";

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

3434 };

3535

3636 postPatch = ''

@@ -78,7 +78,6 @@ 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";

8281 license = licenses.gpl3Plus;

8382 maintainers = with maintainers; [ hexa ];

8483 };

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.29.0";

17+ version = "0.28.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-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";

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

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 = "5.0.0";

14+ version = "4.1.0";

1515 disabled = pythonOlder "3.6";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";

19+ sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";

2020 };

2121

2222 propagatedBuildInputs = [

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

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

33, fetchPypi

44, configobj

55, patiencediff

6−, fastbencode

6+, six

77, fastimport

88, dulwich

99, launchpadlib

1010, testtools

11−, pythonOlder

12−, installShellFiles

1311}:

1412

1513buildPythonPackage rec {

1614 pname = "breezy";

17− version = "3.2.2";

18−

19− disabled = pythonOlder "3.5";

15+ version = "3.2.1";

2016

2117 src = fetchPypi {

2218 inherit pname version;

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

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

2420 };

2521

26− nativeBuildInputs = [ installShellFiles ];

27−

28− propagatedBuildInputs = [

29− configobj

30− fastbencode

31− patiencediff

32− fastimport

33− dulwich

34− launchpadlib

35− ];

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

3623

3724 checkInputs = [ testtools ];

3825

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

4229 # symlink for bazaar compatibility

4330 postInstall = ''

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

45−

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

4732 '';

4833

4934 pythonImportsCheck = [ "breezy" ];

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

5136 meta = with lib; {

5237 description = "Friendly distributed version control system";

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

54− license = licenses.gpl2Only;

39+ license = licenses.gpl2;

5540 maintainers = [ maintainers.marsam ];

5641 };

5742}

pkgs/development/python-modules/fastbencode/default.nixdeleted−26

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

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

2−

3−buildPythonPackage rec {

4− pname = "fastbencode";

5− version = "0.0.7";

6−

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.nixdeleted−46

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

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+2−16

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

1010, pyquery

1111, requests

1212, pytestCheckHook

13−, pythonOlder

1413}:

1514

1615buildPythonPackage rec {

1716 pname = "howdoi";

1817 version = "2.0.19";

19− format = "setuptools";

20−

21− disabled = pythonOlder "3.7";

2218

2319 src = fetchFromGitHub {

2420 owner = "gleitz";

2521 repo = pname;

2622 rev = "v${version}";

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

23+ sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q";

2824 };

2925

3026 propagatedBuildInputs = [

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

5046 # AssertionError: "The...

5147 "test_get_text_with_one_link"

5248 "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"

6349 ];

6450

6551 pythonImportsCheck = [

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

6854

6955 meta = with lib; {

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

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

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

7258 license = licenses.mit;

7359 maintainers = with maintainers; [ costrouc ];

7460 };

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nixdeleted−26

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

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−}:

5−

6−buildPythonPackage rec {

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

8− version = "0.1.0";

9−

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.nixdeleted−37

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

1−{ lib

2−, aiohttp

3−, buildPythonPackage

4−, fetchPypi

5−, pythonOlder

6−}:

7−

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+10−33

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

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

1+{ lib, buildPythonPackage, fetchPypi, pythonOlder,

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

3+ pytest, xmltodict, nbconvert, ipywidgets

4+, doCheck ? true

145}:

156

16−let nbclient = buildPythonPackage rec {

7+buildPythonPackage rec {

178 pname = "nbclient";

18− version = "0.6.2";

19− format = "setuptools";

20−

9+ version = "0.5.13";

2110 disabled = pythonOlder "3.7";

2211

2312 src = fetchPypi {

2413 inherit pname version;

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

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

2615 };

2716

17+ inherit doCheck;

18+ checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

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

2920

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−

4321 meta = with lib; {

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

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

4624 license = licenses.bsd3;

4725 maintainers = [ maintainers.erictapen ];

4826 };

49−};

50−in nbclient

27+}

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

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

55, glibcLocales

66, entrypoints

77, bleach

8+, beautifulsoup4

89, mistune

910, nbclient

1011, jinja2

1112, pygments

1213, traitlets

14+, testpath

1315, jupyter_core

1416, jupyterlab-pygments

1517, nbformat

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

1820, tornado

1921, jupyter-client

2022, defusedxml

21−, tinycss2

22−, beautifulsoup4

2323}:

2424

2525buildPythonPackage rec {

2626 pname = "nbconvert";

27− version = "6.5.0";

28− format = "setuptools";

27+ version = "6.4.5";

2928

3029 src = fetchPypi {

3130 inherit pname version;

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

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

3332 };

3433

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

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

4544 checkInputs = [ pytestCheckHook glibcLocales ];

4645

4746 propagatedBuildInputs = [

48− entrypoints bleach mistune jinja2 pygments traitlets

47+ entrypoints bleach mistune jinja2 pygments traitlets testpath

4948 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client

50− defusedxml tinycss2 beautifulsoup4

51− nbclient

49+ defusedxml beautifulsoup4

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

5251 jupyterlab-pygments

5352 ];

5453

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

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

77buildPythonPackage rec {

88 pname = "peaqevcore";

9− version = "0.0.22";

9+ version = "0.0.21";

1010 format = "setuptools";

1111

1212 disabled = pythonOlder "3.7";

1313

1414 src = fetchPypi {

1515 inherit pname version;

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

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

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 = "12.0.0";

13+ version = "11.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-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";

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

2222 };

2323

2424 propagatedBuildInputs = [

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

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

11{ lib

22, aiohttp

33, aioresponses

4−, async-timeout

54, buildPythonPackage

65, fetchFromGitHub

76, pytest-aiohttp

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

1110

1211buildPythonPackage rec {

1312 pname = "pydeconz";

14− version = "91";

13+ version = "87";

1514 format = "setuptools";

1615

17− disabled = pythonOlder "3.9";

16+ disabled = pythonOlder "3.7";

1817

1918 src = fetchFromGitHub {

2019 owner = "Kane610";

2120 repo = "deconz";

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

23− hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";

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

22+ sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";

2423 };

2524

2625 propagatedBuildInputs = [

2726 aiohttp

28− async-timeout

2927 ];

3028

3129 checkInputs = [

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

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

99buildPythonPackage rec {

1010 pname = "pyevilgenius";

11− version = "2.0.0";

11+ version = "1.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 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";

20+ sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";

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.1.0";

19+ version = "1.0.16";

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 = "refs/tags/${version}";

28− hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";

27+ rev = version;

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

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.4";

14+ version = "0.5.3";

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-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg=";

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

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.4.1";

16+ version = "1.3.2";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchFromGitHub {

2020 owner = "MatthewFlamm";

2121 repo = pname;

2222 rev = "v${version}";

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

23+ sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";

2424 };

2525

2626 propagatedBuildInputs = [

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

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

33, pythonOlder

44, fetchPypi

55, aiohttp

6−, pytest-aiohttp

76, pytest-asyncio

87, pytestCheckHook

98}:

109

1110buildPythonPackage rec {

1211 pname = "pytomorrowio";

13− version = "0.3.3";

12+ version = "0.2.1";

1413

1514 disabled = pythonOlder "3.7";

1615

1716 src = fetchPypi {

1817 inherit pname version;

19− sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62";

18+ sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e";

2019 };

2120

2221 propagatedBuildInputs = [

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

2423 ];

2524

2625 checkInputs = [

27− pytest-aiohttp

2826 pytest-asyncio

2927 pytestCheckHook

3028 ];

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

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

33, aresponses

44, asynctest

55, backoff

6−, beautifulsoup4

76, buildPythonPackage

87, docutils

98, fetchFromGitHub

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

2019

2120buildPythonPackage rec {

2221 pname = "simplisafe-python";

23− version = "2022.05.0";

22+ version = "2022.03.3";

2423 format = "pyproject";

2524

2625 disabled = pythonOlder "3.8";

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

2928 owner = "bachya";

3029 repo = pname;

3130 rev = version;

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

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

3332 };

3433

3534 nativeBuildInputs = [

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

3938 propagatedBuildInputs = [

4039 aiohttp

4140 backoff

42− beautifulsoup4

4341 docutils

4442 pytz

4543 voluptuous

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

6462 # simplipy/api.py:253: InvalidCredentialsError

6563 "test_request_error_failed_retry"

6664 "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"

6965 ];

7066

7167 disabledTestPaths = [

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

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

1−{ lib

2−, stdenv

3−, buildPythonPackage

4−, fetchFromGitHub

5−, libiconv

6−, Foundation

7−, rustPlatform

8−, setuptools-rust }:

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

103buildPythonPackage rec {

114 pname = "skytemple-rust";

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

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

2518 };

2619

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

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

2821 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

2922

3023 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.7";

27+ version = "2.7.6";

2828 disabled = pythonOlder "3.6";

2929

3030 src = fetchPypi {

3131 inherit pname version;

32− sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";

32+ sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";

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.5";

10+ version = "1.6.4";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "sha256-EdiLTzjRigJLsslWSymLNajvUDimBt4d4EBugxVYueg=";

14+ sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8=";

1515 };

1616

1717 postPatch = ''

pkgs/development/python-modules/textual/default.nix+13−16

@@ -1,34 +1,38 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4+, fetchpatch

45, poetry-core

56, rich

67, typing-extensions

78, pytestCheckHook

8−, pythonOlder

99}:

1010

1111buildPythonPackage rec {

1212 pname = "textual";

13− version = "0.1.18";

13+ version = "0.1.15";

1414 format = "pyproject";

1515

16− disabled = pythonOlder "3.7";

17−

1816 src = fetchFromGitHub {

1917 owner = "Textualize";

2018 repo = pname;

2119 rev = "v${version}";

22− sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";

20+ sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";

2321 };

2422

25− nativeBuildInputs = [

26− poetry-core

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+ })

2730 ];

2831

32+ nativeBuildInputs = [ poetry-core ];

33+

2934 propagatedBuildInputs = [

3035 rich

31− ] ++ lib.optionals (pythonOlder "3.9") [

3236 typing-extensions

3337 ];

3438

@@ -36,14 +40,7 @@ buildPythonPackage rec {

3640 pytestCheckHook

3741 ];

3842

39− postPatch = ''

40− substituteInPlace pyproject.toml \

41− --replace 'rich = "^12.3.0"' 'rich = "*"'

42− '';

43−

44− pythonImportsCheck = [

45− "textual"

46− ];

43+ pythonImportsCheck = [ "textual" ];

4744

4845 meta = with lib; {

4946 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.3";

11+ version = "2022.2.1";

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-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";

20+ hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/voluptuous/default.nix+11−15

@@ -1,31 +1,27 @@

11{ lib

22, buildPythonPackage

3−, fetchFromGitHub

4−, pytestCheckHook

3+, fetchPypi

4+, nose

55}:

77buildPythonPackage rec {

88 pname = "voluptuous";

9− version = "0.13.1";

9+ version = "0.13.0";

1010

11− src = fetchFromGitHub {

12− owner = "alecthomas";

13− repo = pname;

14− rev = version;

15− hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";

11+ src = fetchPypi {

12+ inherit pname version;

13+ sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";

1614 };

1715

1816 checkInputs = [

19− pytestCheckHook

17+ nose

2018 ];

2119

22− pythonImportsCheck = [

23− "voluptuous"

24− ];

20+ checkPhase = ''

21+ nosetests

22+ '';

2523

26− pytestFlagsArray = [

27− "voluptuous/tests/"

28− ];

24+ pythonImportsCheck = [ "voluptuous" ];

2925

3026 meta = with lib; {

3127 description = "Python data validation library";

pkgs/development/python-modules/wandb/default.nix+12−20

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

1212, jsonref

1313, jsonschema

1414, matplotlib

15−, nbconvert

1615, nbformat

1716, pandas

1817, pathtools

@@ -37,7 +36,7 @@

3736

3837buildPythonPackage rec {

3938 pname = "wandb";

40− version = "0.12.16";

39+ version = "0.12.15";

4140 format = "setuptools";

4241

4342 disabled = pythonOlder "3.6";

@@ -46,7 +45,7 @@ buildPythonPackage rec {

4645 owner = pname;

4746 repo = "client";

4847 rev = "v${version}";

49− hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";

48+ hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo=";

5049 };

5150

5251 # setuptools is necessary since pkg_resources is required at runtime.

@@ -67,20 +66,6 @@ buildPythonPackage rec {

6766 shortuuid

6867 ];

6968

70− # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf

71− # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.

72− # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to

73− # why we don't put it in propagatedBuildInputs. Note that this is difficult to

74− # test offline due to https://github.com/wandb/client/issues/3519.

75− postInstall = ''

76− mkdir -p $out/bin

77− ln -s ${git}/bin/git $out/bin/git

78− '';

79−

80− preCheck = ''

81− export HOME=$(mktemp -d)

82− '';

83−

8469 checkInputs = [

8570 azure-core

8671 bokeh

@@ -88,9 +73,6 @@ buildPythonPackage rec {

8873 jsonref

8974 jsonschema

9075 matplotlib

91− # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's

92− # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488.

93− nbconvert

9476 nbformat

9577 pandas

9678 pydantic

@@ -101,6 +83,16 @@ buildPythonPackage rec {

10183 tqdm

10284 ];

10385

86+ # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf

87+ # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.

88+ # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to

89+ # why we don't put it in propagatedBuildInputs. Note that this is difficult to

90+ # test offline due to https://github.com/wandb/client/issues/3519.

91+ postInstall = ''

92+ mkdir -p $out/bin

93+ ln -s ${git}/bin/git $out/bin/git

94+ '';

95+

10496 disabledTestPaths = [

10597 # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.

10698 "tests/test_cli.py"

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

@@ -4,7 +4,6 @@

44, asynctest

55, buildPythonPackage

66, crccheck

7−, cryptography

87, fetchFromGitHub

98, pycryptodome

109, pytest-aiohttp

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

1615

1716buildPythonPackage rec {

1817 pname = "zigpy";

19− version = "0.45.1";

18+ version = "0.44.2";

2019 format = "setuptools";

2120

2221 disabled = pythonOlder "3.7";

@@ -25,14 +24,13 @@ buildPythonPackage rec {

2524 owner = "zigpy";

2625 repo = "zigpy";

2726 rev = version;

28− sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";

27+ sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I=";

2928 };

3029

3130 propagatedBuildInputs = [

3231 aiohttp

3332 aiosqlite

3433 crccheck

35− cryptography

3634 pycryptodome

3735 voluptuous

3836 ];

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.36.1";

13+ version = "0.35.3";

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-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";

22+ sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";

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.3";

13+ version = "1.1.2";

1414

1515 src = fetchFromGitHub {

1616 owner = "casey";

1717 repo = pname;

1818 rev = version;

19− sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";

19+ sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";

2020 };

2121

22− cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";

22+ cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";

2323

2424 nativeBuildInputs = [ installShellFiles ];

2525 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+2−10

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

55}:

66let

77 # Poetry2nix version

8− version = "1.28.0";

8+ version = "1.27.1";

1010 inherit (poetryLib) isCompatible readTOML moduleName;

1111

@@ -287,20 +287,12 @@ 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− excludedEditablePackageNames = builtins.filter

291− (pkg: editablePackageSources."${pkg}" == null)

292− (builtins.attrNames editablePackageSources);

293−

294− allEditablePackageSources = (

290+ editablePackageSources' = (

295291 (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))

296292 // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))

297293 // editablePackageSources

298294 );

299295

300− editablePackageSources' = builtins.removeAttrs

301− allEditablePackageSources

302− excludedEditablePackageNames;

303−

304296 poetryPython = self.mkPoetryPackages {

305297 inherit pyproject poetrylock overrides python pwd preferWheels pyProject;

306298 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.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

183+ lib.optionals (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+5−153

@@ -29,9 +29,6 @@

2929 "aioflo": [

3030 "poetry-core"

3131 ],

32− "aiogithubapi": [

33− "poetry-core"

34− ],

3532 "aioguardian": [

3633 "poetry-core"

3734 ],

@@ -92,21 +89,9 @@

9289 "amqtt": [

9390 "poetry-core"

9491 ],

95− "ansible-doctor": [

96− "poetry-core"

97− ],

98− "ansible-later": [

99− "poetry-core"

100− ],

101− "ansible-runner": [

102− "pbr"

103− ],

10492 "apache-beam": [

10593 "cython"

10694 ],

107− "aplpy": [

108− "cython"

109− ],

11095 "argon2_cffi": [

11196 "flitBuildHook"

11297 ],

@@ -129,24 +114,15 @@

129114 "atomman": [

130115 "cython"

131116 ],

132− "atpublic": [

133− "pdm-pep517"

134− ],

135117 "autarco": [

136118 "poetry-core"

137119 ],

138120 "authcaptureproxy": [

139121 "poetry-core"

140122 ],

141− "av": [

142− "cython"

143− ],

144123 "awesomeversion": [

145124 "poetry-core"

146125 ],

147− "aws-adfs": [

148− "poetry-core"

149− ],

150126 "aws-error-utils": [

151127 "poetry"

152128 ],

@@ -171,9 +147,6 @@

171147 "boltztrap2": [

172148 "cython"

173149 ],

174− "bsblan": [

175− "poetry-core"

176− ],

177150 "build": [

178151 "flit-core"

179152 ],

@@ -210,9 +183,6 @@

210183 "clikit": [

211184 "poetry-core"

212185 ],

213− "cloudflare-dyndns": [

214− "poetry"

215− ],

216186 "collections-extended": [

217187 "poetry-core"

218188 ],

@@ -240,8 +210,7 @@

240210 "poetry-core"

241211 ],

242212 "cssselect2": [

243− "flit",

244− "flit-core"

213+ "flit"

245214 ],

246215 "cwcwidth": [

247216 "cython"

@@ -255,15 +224,9 @@

255224 "cypari2": [

256225 "cython"

257226 ],

258− "cypherpunkpay": [

259− "poetry-core"

260− ],

261227 "cysignals": [

262228 "cython"

263229 ],

264− "datadog": [

265− "hatchling"

266− ],

267230 "datrie": [

268231 "cython"

269232 ],

@@ -297,9 +260,6 @@

297260 "doc8": [

298261 "pbr"

299262 ],

300− "docstring-parser": [

301− "poetry-core"

302− ],

303263 "dtlssocket": [

304264 "cython"

305265 ],

@@ -341,8 +301,7 @@

341301 "poetry-core"

342302 ],

343303 "entrypoints": [

344− "flit",

345− "flit-core"

304+ "flit"

346305 ],

347306 "enturclient": [

348307 "poetry-core"

@@ -350,13 +309,6 @@

350309 "enumatch": [

351310 "poetry"

352311 ],

353− "exceptiongroup": [

354− "flit-core",

355− "flitBuildHook"

356− ],

357− "falcon": [

358− "cython"

359− ],

360312 "fastapi": [

361313 "flitBuildHook"

362314 ],

@@ -426,9 +378,6 @@

426378 "generic": [

427379 "poetry-core"

428380 ],

429− "gensim": [

430− "cython"

431− ],

432381 "glances-api": [

433382 "poetry-core"

434383 ],

@@ -543,15 +492,9 @@

543492 "ipwhl": [

544493 "flitBuildHook"

545494 ],

546− "iso8601": [

547− "poetry-core"

548− ],

549495 "isort": [

550496 "poetry-core"

551497 ],

552− "jarowinkler": [

553− "cython"

554− ],

555498 "jedi-language-server": [

556499 "poetry"

557500 ],

@@ -576,12 +519,6 @@

576519 "jupyterlab": [

577520 "jupyter-packaging"

578521 ],

579− "jupyterlab-code-formatter": [

580− "jupyter-packaging"

581− ],

582− "jupyterlab-pygments": [

583− "jupyter-packaging"

584− ],

585522 "keystoneauth1": [

586523 "pbr"

587524 ],

@@ -600,9 +537,6 @@

600537 "ldappool": [

601538 "pbr"

602539 ],

603− "levenshtein": [

604− "cython"

605− ],

606540 "libgpuarray": [

607541 "cython"

608542 ],

@@ -630,9 +564,6 @@

630564 "lockfile": [

631565 "pbr"

632566 ],

633− "lsassy": [

634− "poetry-core"

635− ],

636567 "luftdaten": [

637568 "poetry-core"

638569 ],

@@ -654,9 +585,6 @@

654585 "marisa-trie": [

655586 "cython"

656587 ],

657− "markdown-it-py": [

658− "flit-core"

659− ],

660588 "mask-rcnn": [

661589 "cython"

662590 ],

@@ -679,9 +607,6 @@

679607 "memory-allocator": [

680608 "cython"

681609 ],

682− "meteofrance-api": [

683− "poetry"

684− ],

685610 "metprint": [

686611 "poetry-core"

687612 ],

@@ -693,7 +618,6 @@

693618 "poetry"

694619 ],

695620 "mkdocs-jupyter": [

696− "ipython_genutils",

697621 "poetry-core"

698622 ],

699623 "mkdocs-literate-nav": [

@@ -750,9 +674,6 @@

750674 "netdata": [

751675 "poetry-core"

752676 ],

753− "netutils": [

754− "poetry-core"

755− ],

756677 "newversion": [

757678 "poetry-core"

758679 ],

@@ -768,9 +689,6 @@

768689 "nkdfu": [

769690 "flitBuildHook"

770691 ],

771− "notebook-shim": [

772− "jupyter-packaging"

773− ],

774692 "notus-scanner": [

775693 "poetry-core"

776694 ],

@@ -810,9 +728,6 @@

810728 "openvino": [

811729 "cython"

812730 ],

813− "ordered-set": [

814− "flit-core"

815− ],

816731 "ormar": [

817732 "poetry-core"

818733 ],

@@ -892,9 +807,6 @@

892807 "poetry": [

893808 "poetry-core"

894809 ],

895− "poetry-dynamic-versioning": [

896− "poetry-core"

897− ],

898810 "poetry2conda": [

899811 "poetry"

900812 ],

@@ -1018,9 +930,6 @@

1018930 "pymaven-patch": [

1019931 "pbr"

1020932 ],

1021− "pymdown-extensions": [

1022− "hatchling"

1023− ],

1024933 "pymfy": [

1025934 "poetry-core"

1026935 ],

@@ -1045,9 +954,6 @@

1045954 "pyoverkiz": [

1046955 "poetry-core"

1047956 ],

1048− "pyparsing": [

1049− "flit-core"

1050− ],

1051957 "pypass": [

1052958 "pbr"

1053959 ],

@@ -1072,21 +978,12 @@

1072978 "pyproject-flake8": [

1073979 "flit-core"

1074980 ],

1075− "pypsrp": [

1076− "poetry-core"

1077− ],

1078981 "pyquil": [

1079982 "poetry-core"

1080983 ],

1081− "pyrad": [

1082− "poetry-core"

1083− ],

1084984 "pyregion": [

1085985 "cython"

1086986 ],

1087− "pyrevolve": [

1088− "cython"

1089− ],

1090987 "pyrmvtransport": [

1091988 "flit"

1092989 ],

@@ -1102,9 +999,6 @@

1102999 "pysigma": [

11031000 "poetry-core"

11041001 ],

1105− "pysigma-backend-insightidr": [

1106− "poetry-core"

1107− ],

11081002 "pysigma-backend-splunk": [

11091003 "poetry-core"

11101004 ],

@@ -1114,30 +1008,14 @@

11141008 "pysigma-pipeline-sysmon": [

11151009 "poetry-core"

11161010 ],

1117− "pysigma-pipeline-windows": [

1118− "poetry-core"

1119− ],

1120− "pyslurm": [

1121− "cython"

1122− ],

11231011 "pysmf": [

11241012 "cython"

11251013 ],

11261014 "pysml": [

11271015 "poetry-core"

11281016 ],

1129− "pysnmp-pyasn1": [

1130− "poetry-core"

1131− ],

1132− "pysnmp-pysmi": [

1133− "poetry-core"

1134− ],

1135− "pysnmplib": [

1136− "poetry-core"

1137− ],

11381017 "pysnow": [

1139− "poetry",

1140− "poetry-core"

1018+ "poetry"

11411019 ],

11421020 "pysptk": [

11431021 "cython"

@@ -1157,9 +1035,6 @@

11571035 "pytest-httpserver": [

11581036 "poetry-core"

11591037 ],

1160− "pytest-isort": [

1161− "poetry-core"

1162− ],

11631038 "pytest-mockservers": [

11641039 "poetry-core"

11651040 ],

@@ -1222,9 +1097,6 @@

12221097 "python-openstackclient": [

12231098 "pbr"

12241099 ],

1225− "python-pae": [

1226− "poetry-core"

1227− ],

12281100 "python-pkcs11": [

12291101 "cython"

12301102 ],

@@ -1343,8 +1215,7 @@

13431215 "poetry-core"

13441216 ],

13451217 "rokuecp": [

1346− "poetry",

1347− "poetry-core"

1218+ "poetry"

13481219 ],

13491220 "roombapy": [

13501221 "poetry-core"

@@ -1409,9 +1280,6 @@

14091280 "sentinel": [

14101281 "poetry-core"

14111282 ],

1412− "seventeentrack": [

1413− "poetry-core"

1414− ],

14151283 "sfepy": [

14161284 "cython"

14171285 ],

@@ -1433,15 +1301,9 @@

14331301 "slowapi": [

14341302 "poetry-core"

14351303 ],

1436− "socksio": [

1437− "flit-core"

1438− ],

14391304 "solo-python": [

14401305 "flitBuildHook"

14411306 ],

1442− "soupsieve": [

1443− "hatchling"

1444− ],

14451307 "spacy-pkuseg": [

14461308 "cython"

14471309 ],

@@ -1563,8 +1425,7 @@

15631425 "cython"

15641426 ],

15651427 "testpath": [

1566− "flit",

1567− "flit-core"

1428+ "flit"

15681429 ],

15691430 "testrepository": [

15701431 "pbr"

@@ -1644,9 +1505,6 @@

16441505 "typing-extensions": [

16451506 "flit-core"

16461507 ],

1647− "uharfbuzz": [

1648− "cython"

1649− ],

16501508 "unpaddedbase64": [

16511509 "poetry-core"

16521510 ],

@@ -1692,14 +1550,8 @@

16921550 "yoda": [

16931551 "cython"

16941552 ],

1695− "yte": [

1696− "poetry-core"

1697− ],

16981553 "zeversolarlocal": [

16991554 "flit-core",

17001555 "flitBuildHook"

1701− ],

1702− "zwave-me-ws": [

1703− "poetry-core"

17041556 ]

17051557}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+4−98

@@ -8,14 +8,13 @@ let

88 { self

99 , drv

1010 , attr

11− , extraAttrs ? [ ]

1211 }:

1312 let

1413 buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};

1514 in

1615 (

1716 # Flit only works on Python3

18− if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv

17+ if (attr == "flit-core" || attr == "flit") && !self.isPy3k then drv

1918 else

2019 drv.overridePythonAttrs (

2120 old:

@@ -24,7 +23,7 @@ let

2423 { }

2524 else

2625 {

27− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ] ++ map (a: self.${a}) extraAttrs;

26+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ];

2827 }

2928 )

3029 );

@@ -56,16 +55,6 @@ lib.composeManyExtensions [

5655 systems)

5756 buildSystems)

5857

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−

6958 # Build fixes

7059 (self: super:

7160 let

@@ -448,17 +437,6 @@ lib.composeManyExtensions [

448437 }

449438 );

450439

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−

462440 # Environment markers are not always included (depending on how a dep was defined)

463441 enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;

464442

@@ -866,17 +844,6 @@ lib.composeManyExtensions [

866844 }

867845 );

868846

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−

880847 lxml = super.lxml.overridePythonAttrs (

881848 old: {

882849 nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];

@@ -1176,26 +1143,6 @@ lib.composeManyExtensions [

11761143 }

11771144 );

11781145

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−

11991146 osqp = super.osqp.overridePythonAttrs (

12001147 old: {

12011148 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];

@@ -1203,29 +1150,6 @@ lib.composeManyExtensions [

12031150 }

12041151 );

12051152

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−

12291153 pantalaimon = super.pantalaimon.overridePythonAttrs (old: {

12301154 nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];

12311155 postInstall = old.postInstall or "" + ''

@@ -1272,12 +1196,8 @@ lib.composeManyExtensions [

12721196

12731197 pillow = super.pillow.overridePythonAttrs (

12741198 old: {

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 ];

1199+ nativeBuildInputs = [ pkg-config self.pytest-runner ] ++ (old.nativeBuildInputs or [ ]);

1200+ buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]);

12811201 }

12821202 );

12831203

@@ -1326,14 +1246,6 @@ lib.composeManyExtensions [

13261246 }

13271247 );

13281248

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−

13371249 py-solc-x = super.py-solc-x.overridePythonAttrs (

13381250 old: {

13391251 preConfigure = ''

@@ -1948,12 +1860,6 @@ lib.composeManyExtensions [

19481860

19491861 });

19501862

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−

19571863 systemd-python = super.systemd-python.overridePythonAttrs (old: {

19581864 buildInputs = old.buildInputs ++ [ pkgs.systemd ];

19591865 nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];

pkgs/development/tools/protoc-gen-entgrpc/default.nixdeleted−28

@@ -1,28 +0,0 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

2−

3−buildGoModule rec {

4− pname = "protoc-gen-entgrpc";

5− version = "0.2.0";

6−

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+3−4

@@ -2,21 +2,20 @@

33rustPlatform.buildRustPackage rec {

44 pname = "cargo-sync-readme";

5− version = "1.1";

5+ version = "1.0";

77 src = fetchFromGitHub {

88 owner = "phaazon";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";

11+ sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";

1212 };

1313

14− cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";

14+ cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";

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";

2019 license = licenses.bsd3;

2120 maintainers = with maintainers; [ b4dm4n ];

2221 };

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-05-02";

15− cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";

14+ version = "2022-04-11";

15+ cargoSha256 = "sha256-pc8S+5g67vN9170ABiHGe1t4Go0F63UiOeLd71USYCI=";

1616

1717 src = fetchFromGitHub {

1818 owner = "rust-analyzer";

1919 repo = "rust-analyzer";

2020 rev = version;

21− sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

21+ sha256 = "sha256-miMIrDawSS1zXh6EuX03x5ACM2NTabksssSyutSNpjY=";

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.36";

18+ version = "2.0.0-beta.34";

1919

2020 src = fetchFromGitHub {

2121 owner = "wailsapp";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";

24+ sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";

2525 } + "/v2";

2626

27− vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";

27+ vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";

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− HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm

139+ $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.2";

11− sha256 = "sha256-70N1qRUv9p8oI9eyCjtTdnoEYWS7rHgkQpyyFtFojPA=";

10+ version = "14.19.1";

11+ sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk=";

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.2";

5+ version = "3.79.0";

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-STGMKWgI4C6ccg8DGUhdnEENOB2//gtpU0ljM4cQCXI=";

12+ sha256 = "sha256-gTh1VS/b+D8E67w6Q4u9h0EhpFZiA2gBGe4mo49+9KY=";

1313 };

1414

1515 dontUnpack = true;

pkgs/misc/rich-cli/default.nix+8−18

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

1−{ lib

2−, python3

3−}:

1+{ lib, python3 }:

53python3.pkgs.buildPythonApplication rec {

64 pname = "rich-cli";

7− version = "1.7.0";

8− format = "pyproject";

5+ version = "1.5.1";

107 src = python3.pkgs.fetchPypi {

118 inherit pname version;

12− sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";

9+ sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";

1310 };

1411

15− nativeBuildInputs = with python3.pkgs; [

16− poetry-core

17− ];

12+ format = "pyproject";

13+

14+ nativeBuildInputs = [ python3.pkgs.poetry-core ];

1815

1916 propagatedBuildInputs = with python3.pkgs; [

2017 rich

@@ -24,18 +21,11 @@ python3.pkgs.buildPythonApplication rec {

2421 rich-rst

2522 ];

2623

27− postPatch = ''

28− substituteInPlace pyproject.toml \

29− --replace 'rich = "^12.3.0"' 'rich = "*"'

30− '';

31−

32− pythonImportsCheck = [

33− "rich_cli"

34− ];

24+ buildInputs = [ python3 ];

3525

3626 meta = with lib; {

37− description = "Command Line Interface to Rich";

3827 homepage = "https://github.com/Textualize/rich-cli";

28+ description = "Command Line Interface to Rich";

3929 license = licenses.mit;

4030 maintainers = with maintainers; [ jyooru ];

4131 };

pkgs/os-specific/linux/nftables/default.nix+9−7

@@ -8,6 +8,8 @@

88, withXtables ? true , iptables

99}:

1010

11+with lib;

12+

1113stdenv.mkDerivation rec {

1214 version = "1.0.2";

1315 pname = "nftables";

@@ -26,8 +28,8 @@ stdenv.mkDerivation rec {

2628 buildInputs = [

2729 libmnl libnftnl libpcap

2830 gmp jansson libedit

29− ] ++ lib.optional withXtables iptables

30− ++ lib.optional withPython python3;

31+ ] ++ optional withXtables iptables

32+ ++ optional withPython python3;

3133

3234 preConfigure = ''

3335 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file

@@ -44,12 +46,12 @@ stdenv.mkDerivation rec {

4446 configureFlags = [

4547 "--with-json"

4648 "--with-cli=editline"

47− ] ++ lib.optional (!withDebugSymbols) "--disable-debug"

48− ++ lib.optional (!withPython) "--disable-python"

49− ++ lib.optional withPython "--enable-python"

50− ++ lib.optional withXtables "--with-xtables";

49+ ] ++ optional (!withDebugSymbols) "--disable-debug"

50+ ++ optional (!withPython) "--disable-python"

51+ ++ optional withPython "--enable-python"

52+ ++ optional withXtables "--with-xtables";

5153

52− meta = with lib; {

54+ meta = {

5355 description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

5456 homepage = "https://netfilter.org/projects/nftables/";

5557 license = licenses.gpl2Only;

pkgs/servers/home-assistant/component-packages.nix+14−35

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

22# Do not edit!

44{

5− version = "2022.5.0";

5+ version = "2022.4.7";

66 components = {

77 "abode" = ps: with ps; [

88 abodepy

@@ -157,6 +157,10 @@

157157 ];

158158 "arest" = ps: with ps; [

159159 ];

160+ "arlo" = ps: with ps; [

161+ ha-ffmpeg

162+ pyarlo

163+ ];

160164 "arris_tg2492lg" = ps: with ps; [

161165 arris-tg2492lg

162166 ];

@@ -550,6 +554,8 @@

550554 "digital_ocean" = ps: with ps; [

551555 digital-ocean

552556 ];

557+ "digitalloggers" = ps: with ps; [

558+ ]; # missing inputs: dlipower

553559 "directv" = ps: with ps; [

554560 directv

555561 ];

@@ -987,7 +993,8 @@

987993 ];

988994 "google" = ps: with ps; [

989995 aiohttp-cors

990− gcal-sync

996+ google-api-python-client

997+ httplib2

991998 oauth2client

992999 ];

9931000 "google_assistant" = ps: with ps; [

@@ -1241,15 +1248,9 @@

12411248 ];

12421249 "insteon" = ps: with ps; [

12431250 aiohttp-cors

1244− fnvhash

1245− home-assistant-frontend

1246− insteon-frontend-home-assistant

1247− lru-dict

1248− pillow

12491251 pyinsteon

12501252 pyserial

12511253 pyudev

1252− sqlalchemy

12531254 ];

12541255 "integration" = ps: with ps; [

12551256 ];

@@ -1390,10 +1391,8 @@

13901391 life360

13911392 ];

13921393 "lifx" = ps: with ps; [

1393− aiohttp-cors

13941394 aiolifx

13951395 aiolifx-effects

1396− ifaddr

13971396 ];

13981397 "lifx_cloud" = ps: with ps; [

13991398 ];

@@ -1515,9 +1514,6 @@

15151514 "mazda" = ps: with ps; [

15161515 pymazda

15171516 ];

1518− "meater" = ps: with ps; [

1519− meater-python

1520− ];

15211517 "media_extractor" = ps: with ps; [

15221518 aiohttp-cors

15231519 youtube-dl-light

@@ -2092,9 +2088,6 @@

20922088 ];

20932089 "qnap" = ps: with ps; [

20942090 ]; # missing inputs: qnapstats

2095− "qnap_qsw" = ps: with ps; [

2096− aioqsw

2097− ];

20982091 "qrcode" = ps: with ps; [

20992092 pillow

21002093 pyzbar

@@ -2316,10 +2309,6 @@

23162309 "sentry" = ps: with ps; [

23172310 sentry-sdk

23182311 ];

2319− "senz" = ps: with ps; [

2320− aiohttp-cors

2321− aiosenz

2322− ];

23232312 "serial" = ps: with ps; [

23242313 pyserial-asyncio

23252314 ];

@@ -2393,10 +2382,6 @@

23932382 ];

23942383 "slide" = ps: with ps; [

23952384 ]; # missing inputs: goslide-api

2396− "slimproto" = ps: with ps; [

2397− aiohttp-cors

2398− aioslimproto

2399− ];

24002385 "sma" = ps: with ps; [

24012386 pysma

24022387 ];

@@ -2435,7 +2420,7 @@

24352420 paho-mqtt

24362421 ];

24372422 "snmp" = ps: with ps; [

2438− pysnmplib

2423+ pysnmp

24392424 ];

24402425 "solaredge" = ps: with ps; [

24412426 solaredge

@@ -2762,9 +2747,6 @@

27622747 pytradfri

27632748 ]

27642749 ++ pytradfri.extras-require.async;

2765− "trafikverket_ferry" = ps: with ps; [

2766− pytrafikverket

2767− ];

27682750 "trafikverket_train" = ps: with ps; [

27692751 pytrafikverket

27702752 ];

@@ -2846,10 +2828,11 @@

28462828 ];

28472829 "update" = ps: with ps; [

28482830 ];

2831+ "updater" = ps: with ps; [

2832+ ];

28492833 "upnp" = ps: with ps; [

28502834 aiohttp-cors

28512835 async-upnp-client

2852− getmac

28532836 ifaddr

28542837 zeroconf

28552838 ];

@@ -3185,6 +3168,7 @@

31853168 "apprise"

31863169 "aprs"

31873170 "arcam_fmj"

3171+ "arlo"

31883172 "aseko_pool_live"

31893173 "asuswrt"

31903174 "atag"

@@ -3452,7 +3436,6 @@

34523436 "manual_mqtt"

34533437 "maxcube"

34543438 "mazda"

3455− "meater"

34563439 "media_player"

34573440 "media_source"

34583441 "melcloud"

@@ -3557,7 +3540,6 @@

35573540 "pvpc_hourly_pricing"

35583541 "python_script"

35593542 "qld_bushfire"

3560− "qnap_qsw"

35613543 "rachio"

35623544 "radarr"

35633545 "radio_browser"

@@ -3600,7 +3582,6 @@

36003582 "sensibo"

36013583 "sensor"

36023584 "sentry"

3603− "senz"

36043585 "seventeentrack"

36053586 "shell_command"

36063587 "shelly"

@@ -3614,7 +3595,6 @@

36143595 "siren"

36153596 "slack"

36163597 "sleepiq"

3617− "slimproto"

36183598 "sma"

36193599 "smappee"

36203600 "smart_meter_texas"

@@ -3668,7 +3648,6 @@

36683648 "tailscale"

36693649 "tankerkoenig"

36703650 "tasmota"

3671− "tautulli"

36723651 "tcp"

36733652 "telegram"

36743653 "telegram_bot"

@@ -3692,7 +3671,6 @@

36923671 "trace"

36933672 "tractive"

36943673 "tradfri"

3695− "trafikverket_ferry"

36963674 "trafikverket_train"

36973675 "trafikverket_weatherstation"

36983676 "transmission"

@@ -3711,6 +3689,7 @@

37113689 "upb"

37123690 "upcloud"

37133691 "update"

3692+ "updater"

37143693 "upnp"

37153694 "uptime"

37163695 "uptimerobot"

pkgs/servers/home-assistant/default.nix+4−15

@@ -30,6 +30,7 @@ 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=")

3334

3435 # pytest-aiohttp>0.3.0 breaks home-assistant tests

3536 (self: super: {

@@ -46,21 +47,9 @@ let

4647 aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {

4748 doCheck = false; # requires aiohttp>=1.0.0

4849 });

49− gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {

50− doCheck = false; # requires aiohttp>=1.0.0

51− });

5250 hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {

5351 doCheck = false; # requires aiohttp>=1.0.0

5452 });

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− });

6453 rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {

6554 doCheck = false; # requires pytest-aiohttp>=1.0.0

6655 });

@@ -121,7 +110,7 @@ let

121110 src = fetchFromGitHub {

122111 owner = "ManneW";

123112 repo = "vilfo-api-client-python";

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

113+ rev = "v$version}";

125114 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

126115 };

127116 });

@@ -179,7 +168,7 @@ let

179168 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

180169

181170 # Don't forget to run parse-requirements.py after updating

182− hassVersion = "2022.5.0";

171+ hassVersion = "2022.4.7";

183172

184173in python.pkgs.buildPythonApplication rec {

185174 pname = "homeassistant";

@@ -197,7 +186,7 @@ in python.pkgs.buildPythonApplication rec {

197186 owner = "home-assistant";

198187 repo = "core";

199188 rev = version;

200− hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";

189+ hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M=";

201190 };

202191

203192 # 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 = "20220504.0";

7+ version = "20220405.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-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";

15+ sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";

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.13.0";

145+ version = "3.12.0";

146146

147147 src = fetchFromGitHub {

148148 owner = pname;

149149 repo = pname;

150150 rev = "v${version}";

151− sha256 = "1d5mnj86x4bk6iygns0cc15w315wrzmqxcq0sc4n75xsg6wwp1zl";

151+ sha256 = "sha256-3c7PFIZy/TGf68XdaSC25Amr8Zfb0O+za4ermIzQjnY=";

152152 };

153153

154154 outputs = [ "bin" "lib" "man" "doc" "out" ];

pkgs/servers/keycloak/default.nix+4−4

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

1313

1414stdenv.mkDerivation rec {

1515 pname = "keycloak";

16− version = "18.0.0";

16+ version = "17.0.1";

1717

1818 src = fetchzip {

1919 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

20− sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";

20+ sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI=";

2121 };

2222

2323 nativeBuildInputs = [ makeWrapper jre ];

@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {

5757 '';

5858

5959 postFixup = ''

60− substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_DIR'

61− substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR'

60+ substituteInPlace $out/bin/kc.sh --replace '-Dkc.home.dir=$DIRNAME/../' '-Dkc.home.dir=$KC_HOME_DIR'

61+ substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR'

6262

6363 for script in $(find $out/bin -type f -executable); do

6464 wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

@@ -1,19 +1,19 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

1+{ lib, buildGoPackage, fetchFromGitHub }:

3−buildGoModule rec {

3+buildGoPackage rec {

44 pname = "aws-s3-exporter";

5− version = "0.5.0";

5+ version = "0.4.1";

7+ goPackagePath = "github.com/ribbybibby/s3_exporter";

79 src = fetchFromGitHub {

810 owner = "ribbybibby";

911 repo = "s3_exporter";

1012 rev = "v${version}";

11− sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";

13+ sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";

1214 };

1315

14− vendorSha256 = null;

15−

16− ldflags = [ "-s" "-w" ];

16+ doCheck = true;

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−, oath-toolkit }:

3+, oathToolkit }:

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 oath-toolkit ];

16+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];

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.4";

22+ version = "0.6.0.3";

2323

2424 src = fetchFromGitHub {

2525 owner = "OpenTabletDriver";

2626 repo = "OpenTabletDriver";

2727 rev = "v${version}";

28− sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8=";

28+ sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos=";

2929 };

3030

3131 debPkg = fetchurl {

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

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

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"; })

2423 (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

2524 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

2625 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

@@ -28,6 +27,7 @@

2827 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

2928 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

3029 (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,7 +48,6 @@ buildGo118Package rec {

4848 '';

4949

5050 passthru.tests.lxd = nixosTests.lxd;

51− passthru.tests.lxd-nftables = nixosTests.lxd-nftables;

5251

5352 nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

5453 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.45.1";

5+ version = "0.44.1";

77 src = fetchFromGitHub {

88 owner = "anchore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew=";

11+ sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U=";

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-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg=";

23+ vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI=";

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, oath-toolkit

12+, leveldb, oathToolkit

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 oath-toolkit leveldb libnl libcap_ng rdkafka

164+ snappy lz4 oathToolkit 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.16.0";

7+ version = "5.15.0";

99 src = fetchurl {

1010 url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

11− hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58=";

11+ sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk";

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.2";

5+ version = "2.15.1";

77 src = fetchFromGitHub {

88 owner = "twpayne";

99 repo = "chezmoi";

1010 rev = "v${version}";

11− sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28=";

11+ sha256 = "sha256-spIdY28ZC/+6bwWWwKW7Iu2E2eKD7MeRuxEAMN2e3H8=";

1212 };

1313

14− vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc=";

14+ vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";

1515

1616 doCheck = false;

1717

pkgs/tools/misc/lookatme/default.nixnew file+67

@@ -0,0 +1,67 @@

1+{ lib, python3, fetchFromGitHub }:

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/pssh/default.nix+4−7

@@ -1,14 +1,14 @@

1−{ lib, fetchFromGitHub, python3Packages, openssh, rsync }:

1+{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:

3−python3Packages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "pssh";

5− version = "2.3.4";

5+ version = "2.3.1";

77 src = fetchFromGitHub {

88 owner = "lilydjwg";

99 repo = "pssh";

1010 rev = "v${version}";

11− hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";

11+ sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";

1212 };

1313

1414 postPatch = ''

@@ -20,9 +20,6 @@ python3Packages.buildPythonApplication rec {

2020 done

2121 '';

2222

23− # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126

24− doCheck = false;

25−

2623 meta = with lib; {

2724 description = "Parallel SSH Tools";

2825 longDescription = ''

pkgs/tools/security/fulcio/default.nix+3−3

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

33buildGoModule rec {

44 pname = "fulcio";

5− version = "0.4.1";

5+ version = "0.4.0";

77 src = fetchFromGitHub {

88 owner = "sigstore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";

11+ sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";

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-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";

23+ vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";

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.1";

16+ version = "1.14.0";

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-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";

24+ sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E=";

2525 };

2626

27− vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";

27+ vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk=";

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.1";

9+ version = "0.36.0";

1010

1111 src = fetchFromGitHub {

1212 owner = "anchore";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "sha256-BJSjJrDXZHB4MY4RZCmuC5Gn9YJiCQwyOFrXiGX1h18=";

15+ sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw=";

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-aIFom4hGx7HTobCh9YRyqyf9gUpJIaxAstUUkHjSFnA=";

28+ vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI=";

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.5";

5+ version = "1.3.4";

77 src = fetchFromGitHub {

88 owner = "skylot";

99 repo = pname;

1010 rev = "v${version}";

11− hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";

11+ hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";

1212 };

1313

1414 deps = stdenv.mkDerivation {

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

4040 '';

4141

4242 outputHashMode = "recursive";

43− outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";

43+ outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";

4444 };

4545in stdenv.mkDerivation {

4646 inherit pname version src;

pkgs/tools/security/nmap/default.nix+18−6

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

11{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

22, pcre, libssh2

3+, graphicalSupport ? false

34, libX11 ? null

45, gtk2 ? null

6+, python2 ? null

57, makeWrapper ? null

68, withLua ? true

79}:

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

911with lib;

1012

1113stdenv.mkDerivation rec {

12− pname = "nmap";

14+ pname = "nmap${optionalString graphicalSupport "-graphical"}";

1315 version = "7.92";

1416

1517 src = fetchurl {

@@ -39,9 +41,7 @@ stdenv.mkDerivation rec {

3941 configureFlags = [

4042 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

4143 "--with-liblinear=included"

42− "--without-ndiff"

43− "--without-zenmap"

44− ];

44+ ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];

4545

4646 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

4747 "AR=${stdenv.cc.bintools.targetPrefix}ar"

@@ -49,8 +49,20 @@ stdenv.mkDerivation rec {

4949 "CC=${stdenv.cc.targetPrefix}gcc"

5050 ];

5151

52− nativeBuildInputs = [ pkg-config ];

53− buildInputs = [ pcre libssh2 libpcap openssl ];

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+ '';

5466

5567 enableParallelBuilding = true;

5668

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='oath-toolkit'

8+attr='oathToolkit'

99command='oathtool --version'

1010

1111color() {

pkgs/tools/security/pass/extensions/otp.nix+3−3

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

1−{ lib, stdenv, fetchFromGitHub, oath-toolkit }:

1+{ lib, stdenv, fetchFromGitHub, oathToolkit }:

33stdenv.mkDerivation rec {

44 pname = "pass-otp";

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

1111 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";

1212 };

1313

14− buildInputs = [ oath-toolkit ];

14+ buildInputs = [ oathToolkit ];

1515

1616 dontBuild = true;

1717

1818 patchPhase = ''

19− sed -i -e 's|OATH=\$(which oathtool)|OATH=${oath-toolkit}/bin/oathtool|' otp.bash

19+ sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/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−, oath-toolkit

4+, oathToolkit

55, qgpgme

66, plasma-framework

77, qt5 }:

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

2121 buildInputs = [

2222 ki18n

2323 kitemmodels

24− oath-toolkit

24+ oathToolkit

2525 qgpgme

2626 plasma-framework

2727 qt5.qtbase

pkgs/tools/system/runitor/default.nixdeleted−52

@@ -1,52 +0,0 @@

1−{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:

2−

3−buildGoModule rec {

4− pname = "runitor";

5− version = "0.9.2";

6− vendorSha256 = null;

7−

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.nixnew file+21

@@ -0,0 +1,21 @@

1+{lib, stdenv, fetchurl, python2, libxml2}:

3+assert libxml2.pythonSupport == true;

5+stdenv.mkDerivation rec {

6+ pname = "xpf";

7+ version = "0.2";

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,7 +3,6 @@

33, rsync

44, python3

55, fetchFromGitHub

6−, nixosTests

76}:

98python3.pkgs.buildPythonApplication rec {

@@ -38,8 +37,6 @@ python3.pkgs.buildPythonApplication rec {

3837

3938 doCheck = false;

4039

41− passthru.tests.lxd-image-server = nixosTests.lxd-image-server;

42−

4340 meta = with lib; {

4441 description = "Creates and manages a simplestreams lxd image server on top of nginx";

4542 homepage = "https://github.com/Avature/lxd-image-server";

pkgs/top-level/aliases.nix+1−9

@@ -92,7 +92,6 @@ 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

9695 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;

9796 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02

9897

@@ -147,7 +146,6 @@ mapAliases ({

147146

148147 c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10

149148 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

151149 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

152150 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

153151 callPackage_i686 = pkgsi686Linux.callPackage;

@@ -326,7 +324,6 @@ mapAliases ({

326324 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22

327325 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;

328326 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

330327 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03

331328 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22

332329 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

@@ -873,8 +870,7 @@ mapAliases ({

873870 nix_2_6 = nixVersions.nix_2_6;

874871 nixopsUnstable = nixops_unstable; # Added 2022-03-03

875872 nmap-unfree = nmap; # Added 2021-04-06

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

873+ nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22

878874 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

879875 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

880876 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

@@ -885,7 +881,6 @@ mapAliases ({

885881

886882 ### O ###

887883

888− oathToolkit = oath-toolkit; # Added 2022-04-04

889884 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

890885 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16

891886 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16

@@ -1006,7 +1001,6 @@ mapAliases ({

10061001 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19

10071002 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

10081003 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

10101004 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18

10111005 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22

10121006 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02

@@ -1311,7 +1305,6 @@ mapAliases ({

13111305 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

13121306 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

13131307 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

13151308 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

13161309

13171310 ### U ###

@@ -1398,7 +1391,6 @@ mapAliases ({

13981391 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22

13991392 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

14001393 xp-pen-g430 = pentablet-driver; # Added 2020-05-03

1401− xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26

14021394 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22

14031395 xf86_input_mtrack = throw ''

14041396 xf86_input_mtrack has been removed from nixpkgs as it is broken and

pkgs/top-level/all-packages.nix+29−18

@@ -406,8 +406,6 @@ 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−

411409 protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };

412410

413411 protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };

@@ -3362,10 +3360,6 @@ with pkgs;

33623360

33633361 earlyoom = callPackage ../os-specific/linux/earlyoom { };

33643362

3365− easycrypt = callPackage ../applications/science/logic/easycrypt { };

3366−

3367− easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { };

3368−

33693363 EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };

33703364

33713365 ecasound = callPackage ../applications/audio/ecasound { };

@@ -8737,6 +8731,10 @@ with pkgs;

87378731

87388732 nmap = callPackage ../tools/security/nmap { };

87398733

8734+ nmap-graphical = nmap.override {

8735+ graphicalSupport = true;

8736+ };

8737+

87408738 nmap-formatter = callPackage ../tools/security/nmap-formatter { };

87418739

87428740 nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };

@@ -8827,7 +8825,7 @@ with pkgs;

88278825

88288826 oapi-codegen = callPackage ../tools/networking/oapi-codegen { };

88298827

8830− oath-toolkit = callPackage ../tools/security/oath-toolkit { };

8828+ oathToolkit = callPackage ../tools/security/oath-toolkit { };

88318829

88328830 oatpp = callPackage ../development/libraries/oatpp { };

88338831

@@ -9499,9 +9497,7 @@ with pkgs;

94999497

95009498 proxify = callPackage ../tools/networking/proxify { };

95019499

9502− proxysql = callPackage ../servers/sql/proxysql {

9503− stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv;

9504− };

9500+ proxysql = callPackage ../servers/sql/proxysql { };

95059501

95069502 prs = callPackage ../tools/security/prs { };

95079503

@@ -11803,6 +11799,10 @@ with pkgs;

1180311799 inherit (darwin.apple_sdk.frameworks) AppKit;

1180411800 };

1180511801

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,6 +14495,9 @@ with pkgs;

1449514495

1449614496 inherit (ocamlPackages) reason;

1449714497

14498+ pixie = callPackage ../development/interpreters/pixie { };

14499+ dust = callPackage ../development/interpreters/pixie/dust.nix { };

14500+

1449814501 buildRubyGem = callPackage ../development/ruby-modules/gem { };

1449914502 defaultGemConfig = callPackage ../development/ruby-modules/gem-config {

1450014503 inherit (darwin) DarwinTools cctools;

@@ -25258,10 +25261,11 @@ with pkgs;

2525825261

2525925262 avrdudess = callPackage ../applications/misc/avrdudess { };

2526025263

25261− awesome = callPackage ../applications/window-managers/awesome {

25264+ awesome-4-0 = callPackage ../applications/window-managers/awesome {

2526225265 cairo = cairo.override { xcbSupport = true; };

2526325266 inherit (texFunctions) fontsConf;

2526425267 };

25268+ awesome = awesome-4-0;

2526525269

2526625270 awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };

2526725271

@@ -26108,10 +26112,6 @@ with pkgs;

2610826112 inherit (darwin.apple_sdk.frameworks) Security;

2610926113 };

2611026114

26111− firewalld = callPackage ../applications/networking/firewalld { };

26112−

26113− firewalld-gui = firewalld.override { withGui = true; };

26114−

2611526115 flacon = libsForQt5.callPackage ../applications/audio/flacon { };

2611626116

2611726117 flexget = callPackage ../applications/networking/flexget { };

@@ -27832,6 +27832,8 @@ with pkgs;

2783227832 inherit (luajitPackages) luafilesystem;

2783327833 };

2783427834

27835+ lookatme = callPackage ../tools/misc/lookatme {};

27836+

2783527837 looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };

2783627838

2783727839 ltc-tools = callPackage ../applications/audio/ltc-tools { };

@@ -29353,7 +29355,7 @@ with pkgs;

2935329355

2935429356 udevil = callPackage ../applications/misc/udevil {};

2935529357

29356− udiskie = callPackage ../applications/misc/udiskie { };

29358+ udiskie = python3.pkgs.callPackage ../applications/misc/udiskie { };

2935729359

2935829360 sacc = callPackage ../applications/networking/gopher/sacc { };

2935929361

@@ -30068,6 +30070,10 @@ with pkgs;

3006830070 swt = swt_jdk8;

3006930071 };

3007030072

30073+ twister = callPackage ../applications/networking/p2p/twister {

30074+ boost = boost16x;

30075+ };

30076+

3007130077 twmn = libsForQt5.callPackage ../applications/misc/twmn { };

3007230078

3007330079 testssl = callPackage ../applications/networking/testssl { };

@@ -33418,6 +33424,13 @@ with pkgs;

3341833424

3341933425 caffeWithCuda = caffe.override { cudaSupport = true; };

3342033426

33427+ caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {

33428+ inherit (python3Packages) python future six numpy pydot;

33429+ protobuf = protobuf3_1;

33430+ python-protobuf = python3Packages.protobuf.override { inherit protobuf; };

33431+ opencv3 = opencv3WithoutCuda; # Used only for image loading.

33432+ });

33433+

3342133434 caffeine-ng = callPackage ../tools/X11/caffeine-ng {};

3342233435

3342333436 cntk = callPackage ../applications/science/math/cntk {

@@ -34457,8 +34470,6 @@ with pkgs;

3445734470

3445834471 runit = callPackage ../tools/system/runit { };

3445934472

34460− runitor = callPackage ../tools/system/runitor { };

34461−

3446234473 refind = callPackage ../tools/bootloaders/refind { };

3446334474

3446434475 spectrojack = callPackage ../applications/audio/spectrojack { };

pkgs/top-level/python-packages.nix+1−16

@@ -2840,8 +2840,6 @@ in {

28402840

28412841 fastavro = callPackage ../development/python-modules/fastavro { };

28422842

2843− fastbencode = callPackage ../development/python-modules/fastbencode { };

2844−

28452843 fastcache = callPackage ../development/python-modules/fastcache { };

28462844

28472845 fastcore = callPackage ../development/python-modules/fastcore { };

@@ -3268,8 +3266,6 @@ in {

32683266

32693267 gbulb = callPackage ../development/python-modules/gbulb { };

32703268

3271− gcal-sync = callPackage ../development/python-modules/gcal-sync { };

3272−

32733269 gcovr = callPackage ../development/python-modules/gcovr { };

32743270

32753271 gcsfs = callPackage ../development/python-modules/gcsfs { };

@@ -4150,8 +4146,6 @@ in {

41504146

41514147 installer = callPackage ../development/python-modules/installer { };

41524148

4153− insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { };

4154−

41554149 intake = callPackage ../development/python-modules/intake { };

41564150

41574151 intake-parquet = callPackage ../development/python-modules/intake-parquet { };

@@ -5167,8 +5161,6 @@ in {

51675161

51685162 measurement = callPackage ../development/python-modules/measurement { };

51695163

5170− meater-python = callPackage ../development/python-modules/meater-python { };

5171−

51725164 mecab-python3 = callPackage ../development/python-modules/mecab-python3 { };

51735165

51745166 mechanicalsoup = callPackage ../development/python-modules/mechanicalsoup { };

@@ -5630,11 +5622,6 @@ in {

56305622

56315623 nextcord = callPackage ../development/python-modules/nextcord { };

56325624

5633− nftables = toPythonModule (pkgs.nftables.override {

5634− python3 = python;

5635− withPython = true;

5636− });

5637−

56385625 nghttp2 = (toPythonModule (pkgs.nghttp2.override {

56395626 inherit (self) python cython setuptools;

56405627 inherit (pkgs) ncurses;

@@ -9490,9 +9477,7 @@ in {

94909477

94919478 skytemple-icons = callPackage ../development/python-modules/skytemple-icons { };

94929479

9493− skytemple-rust = callPackage ../development/python-modules/skytemple-rust {

9494− inherit (pkgs.darwin.apple_sdk.frameworks) Foundation;

9495− };

9480+ skytemple-rust = callPackage ../development/python-modules/skytemple-rust { };

94969481

94979482 skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { };

94989483

pkgs/top-level/release-lib.nix+1−1

@@ -103,7 +103,7 @@ rec {

103103 forAllSystems = genAttrs supportedSystems;

104104

105105

106− # Generate attributes for all systems matching at least one of the given

106+ # Generate attributes for all sytems matching at least one of the given

107107 # patterns

108108 forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns);

109109