94d91a4 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge #141684: branch 'staging-next'

commit94d91a448b87a70204485bd768977c07575911e8 authorVladimír Čunát <v@cunat.cz> dateTue 2 Nov 2021, 07:39 (5 years ago) parent88e02d3 4b2ca10

329 files changed+3533−2781

compare with master

unifiedsplit

doc/languages-frameworks/python.section.md+2−2

@@ -765,7 +765,7 @@ and in this case the `python38` interpreter is automatically used.

765765### Interpreters {#interpreters}

766766

767767Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as

768−respectively `python27`, `python36`, `python37`, `python38` and `python39`. The

768+respectively `python27`, `python37`, `python38` and `python39`. The

769769aliases `python2` and `python3` correspond to respectively `python27` and

770770`python39`. The attribute `python` maps to `python2`. The PyPy interpreters

771771compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with

@@ -830,10 +830,10 @@ attribute set is created for each available Python interpreter. The available

830830sets are

831831

832832* `pkgs.python27Packages`

833−* `pkgs.python36Packages`

834833* `pkgs.python37Packages`

835834* `pkgs.python38Packages`

836835* `pkgs.python39Packages`

836+* `pkgs.python310Packages`

837837* `pkgs.pypyPackages`

838838

839839and the aliases

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml+14

@@ -15,6 +15,12 @@

1515 <section xml:id="sec-release-21.11-highlights">

1616 <title>Highlights</title>

1717 <itemizedlist>

18+ <listitem>

19+ <para>

20+ <literal>iptables</literal> now uses

21+ <literal>nf_tables</literal> backend.

22+ </para>

23+ </listitem>

1824 <listitem>

1925 <para>

2026 PHP now defaults to PHP 8.0, updated from 7.4.

@@ -410,6 +416,14 @@

410416 nobody/nogroup, which is unsafe.

411417 </para>

412418 </listitem>

419+ <listitem>

420+ <para>

421+ Since <literal>iptables</literal> now uses

422+ <literal>nf_tables</literal> backend and

423+ <literal>ipset</literal> doesn’t support it, some applications

424+ (ferm, shorewall, firehol) may have limited functionality.

425+ </para>

426+ </listitem>

413427 <listitem>

414428 <para>

415429 The <literal>paperless</literal> module and package have been

nixos/doc/manual/release-notes/rl-2111.section.md+4

@@ -6,6 +6,8 @@ In addition to numerous new and upgraded packages, this release has the followin

77## Highlights {#sec-release-21.11-highlights}

9+- `iptables` now uses `nf_tables` backend.

10+

911- PHP now defaults to PHP 8.0, updated from 7.4.

1012

1113- kOps now defaults to 1.21.1, which uses containerd as the default runtime.

@@ -125,6 +127,8 @@ In addition to numerous new and upgraded packages, this release has the followin

125127- The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.

126128 This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe.

127129

130+- Since `iptables` now uses `nf_tables` backend and `ipset` doesn't support it, some applications (ferm, shorewall, firehol) may have limited functionality.

131+

128132- The `paperless` module and package have been removed. All users should migrate to the

129133 successor `paperless-ng` instead. The Paperless project [has been

130134 archived](https://github.com/the-paperless-project/paperless/commit/9b0063c9731f7c5f65b1852cb8caff97f5e40ba4)

nixos/modules/hardware/printers.nix+2−7

@@ -116,19 +116,14 @@ in {

116116 description = "Ensure NixOS-configured CUPS printers";

117117 wantedBy = [ "multi-user.target" ];

118118 requires = [ cupsUnit ];

119− # in contrast to cups.socket, for cups.service, this is actually not enough,

120− # as the cups service reports its activation before clients can actually interact with it.

121− # Because of this, commands like `lpinfo -v` will report a bad file descriptor

122− # due to the missing UNIX socket without sufficient sleep time.

123119 after = [ cupsUnit ];

124120

125121 serviceConfig = {

126122 Type = "oneshot";

123+ RemainAfterExit = true;

127124 };

128125

129− # sleep 10 is required to wait until cups.service is actually initialized and has created its UNIX socket file

130− script = (optionalString (!config.services.printing.startWhenNeeded) "sleep 10\n")

131− + (concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters)

126+ script = concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters

132127 + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter);

133128 };

134129 };

nixos/modules/security/ca.nix+9−10

@@ -8,12 +8,10 @@ let

99 cacertPackage = pkgs.cacert.override {

1010 blacklist = cfg.caCertificateBlacklist;

11+ extraCertificateFiles = cfg.certificateFiles;

12+ extraCertificateStrings = cfg.certificates;

1113 };

12−

13− caCertificates = pkgs.runCommand "ca-certificates.crt" {

14− files = cfg.certificateFiles ++ [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ];

15− preferLocalBuild = true;

16− } "awk 1 $files > $out"; # awk ensures a newline between each pair of consecutive files

14+ caBundle = "${cacertPackage}/etc/ssl/certs/ca-bundle.crt";

1715

1816in

1917

@@ -74,16 +72,17 @@ in

7472

7573 config = {

7674

77− security.pki.certificateFiles = [ "${cacertPackage}/etc/ssl/certs/ca-bundle.crt" ];

78−

7975 # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.

80− environment.etc."ssl/certs/ca-certificates.crt".source = caCertificates;

76+ environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;

8177

8278 # Old NixOS compatibility.

83− environment.etc."ssl/certs/ca-bundle.crt".source = caCertificates;

79+ environment.etc."ssl/certs/ca-bundle.crt".source = caBundle;

8480

8581 # CentOS/Fedora compatibility.

86− environment.etc."pki/tls/certs/ca-bundle.crt".source = caCertificates;

82+ environment.etc."pki/tls/certs/ca-bundle.crt".source = caBundle;

83+

84+ # P11-Kit trust source.

85+ environment.etc."ssl/trust-source".source = "${cacertPackage.p11kit}/etc/ssl/trust-source";

8786

8887 };

8988

nixos/modules/services/networking/networkmanager.nix−7

@@ -502,13 +502,6 @@ in {

502502

503503 systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];

504504

505− # override unit as recommended by upstream - see https://github.com/NixOS/nixpkgs/issues/88089

506− # TODO: keep an eye on modem-manager releases as this will eventually be added to the upstream unit

507− systemd.services.ModemManager.serviceConfig.ExecStart = [

508− ""

509− "${pkgs.modemmanager}/sbin/ModemManager --filter-policy=STRICT"

510− ];

511−

512505 systemd.services.NetworkManager-dispatcher = {

513506 wantedBy = [ "network.target" ];

514507 restartTriggers = [ configFile overrideNameserversScript ];

nixos/tests/all-tests.nix+1

@@ -435,6 +435,7 @@ in

435435 systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {};

436436 systemd-boot = handleTest ./systemd-boot.nix {};

437437 systemd-confinement = handleTest ./systemd-confinement.nix {};

438+ systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};

438439 systemd-journal = handleTest ./systemd-journal.nix {};

439440 systemd-networkd = handleTest ./systemd-networkd.nix {};

440441 systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {};

nixos/tests/custom-ca.nix+2−6

@@ -109,9 +109,7 @@ in

109109

110110 environment.systemPackages = with pkgs; [

111111 xdotool

112− # Firefox was disabled here, because we needed to disable p11-kit support in nss,

113− # which is why it will not use the system certificate store for the time being.

114− # firefox

112+ firefox

115113 chromium

116114 qutebrowser

117115 midori

@@ -153,9 +151,7 @@ in

153151 machine.fail("curl -fv https://bad.example.com")

154152

155153 browsers = {

156− # Firefox was disabled here, because we needed to disable p11-kit support in nss,

157− # which is why it will not use the system certificate store for the time being.

158− #"firefox": "Security Risk",

154+ "firefox": "Security Risk",

159155 "chromium": "not private",

160156 "qutebrowser -T": "Certificate error",

161157 "midori": "Security"

nixos/tests/printing.nix+2−10

@@ -53,18 +53,10 @@ in {

5353

5454 start_all()

5555

56− with subtest("Make sure that cups is up on both sides"):

56+ with subtest("Make sure that cups is up on both sides and printers are set up"):

5757 serviceServer.wait_for_unit("cups.service")

5858 serviceClient.wait_for_unit("cups.service")

59−

60− with subtest(

61− "Wait until cups is fully initialized and ensure-printers has "

62− "executed with 10s delay"

63− ):

64− serviceClient.sleep(20)

65− socketActivatedClient.wait_until_succeeds(

66− "systemctl show ensure-printers | grep -q -E 'code=exited ; status=0'"

67− )

59+ socketActivatedClient.wait_for_unit("ensure-printers.service")

6860

6961

7062 def test_printing(client, server):

nixos/tests/systemd-cryptenroll.nixnew file+55

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

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

2+ name = "systemd-cryptenroll";

3+ meta = with pkgs.lib.maintainers; {

4+ maintainers = [ ymatsiuk ];

5+ };

7+ machine = { pkgs, lib, ... }: {

8+ environment.systemPackages = [ pkgs.cryptsetup ];

9+ virtualisation = {

10+ emptyDiskImages = [ 512 ];

11+ memorySize = 1024;

12+ qemu.options = [

13+ "-chardev socket,id=chrtpm,path=/tmp/swtpm-sock"

14+ "-tpmdev emulator,id=tpm0,chardev=chrtpm"

15+ "-device tpm-tis,tpmdev=tpm0"

16+ ];

17+ };

18+ };

19+

20+ testScript = ''

21+ import subprocess

22+ import tempfile

23+

24+ def start_swtpm(tpmstate):

25+ subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir="+tpmstate, "--ctrl", "type=unixio,path=/tmp/swtpm-sock", "--log", "level=0", "--tpm2"])

26+

27+ with tempfile.TemporaryDirectory() as tpmstate:

28+ start_swtpm(tpmstate)

29+ machine.start()

30+

31+ # Verify the TPM device is available and accessible by systemd-cryptenroll

32+ machine.succeed("test -e /dev/tpm0")

33+ machine.succeed("test -e /dev/tpmrm0")

34+ machine.succeed("systemd-cryptenroll --tpm2-device=list")

35+

36+ # Create LUKS partition

37+ machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -")

38+ # Enroll new LUKS key and bind it to Secure Boot state

39+ # For more details on PASSWORD variable, check the following issue:

40+ # https://github.com/systemd/systemd/issues/20955

41+ machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb")

42+ # Add LUKS partition to /etc/crypttab to test auto unlock

43+ machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab")

44+ machine.shutdown()

45+

46+ start_swtpm(tpmstate)

47+ machine.start()

48+

49+ # Test LUKS partition automatic unlock on boot

50+ machine.wait_for_unit("systemd-cryptsetup@luks.service")

51+ # Wipe TPM2 slot

52+ machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb")

53+ '';

54+})

55+

pkgs/applications/audio/bambootracker/default.nix−4

@@ -30,13 +30,9 @@ mkDerivation rec {

3030

3131 postConfigure = "make qmake_all";

3232

33− # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin

34− # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper

35− # (see https://github.com/NixOS/nixpkgs/issues/102044)

3633 postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

3734 mkdir -p $out/Applications

3835 mv $out/{bin,Applications}/BambooTracker.app

39− wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker

4036 ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker

4137 '';

4238

pkgs/applications/audio/fluidsynth/default.nix+2−2

@@ -11,8 +11,8 @@ let

1111 sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";

1212 };

1313 "2" = {

14− fluidsynthVersion = "2.0.6";

15− sha256 = "0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a";

14+ fluidsynthVersion = "2.2.3";

15+ sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";

1616 };

1717 };

1818in

pkgs/applications/audio/munt/default.nix−1

@@ -36,7 +36,6 @@ mkDerivation rec {

3636 postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

3737 mkdir $out/Applications

3838 mv $out/bin/${mainProgram}.app $out/Applications/

39− wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}

4039 ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram}

4140 '';

4241

pkgs/applications/editors/mindforger/default.nix−1

@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {

5252 postInstall = lib.optionalString stdenv.isDarwin ''

5353 mkdir "$out"/Applications

5454 mv app/mindforger.app "$out"/Applications/

55− wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger

5655 '';

5756

5857 meta = with lib; {

pkgs/applications/gis/openorienteering-mapper/default.nix−3

@@ -76,9 +76,6 @@ mkDerivation rec {

7676 postInstall = with stdenv; lib.optionalString isDarwin ''

7777 mkdir -p $out/Applications

7878 mv $out/Mapper.app $out/Applications

79− # Fixes "This application failed to start because it could not find or load the Qt

80− # platform plugin "cocoa"."

81− wrapQtApp $out/Applications/Mapper.app/Contents/MacOS/Mapper

8279 mkdir -p $out/bin

8380 ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper

8481 '';

pkgs/applications/graphics/fbida/default.nix+10−1

@@ -10,6 +10,15 @@ stdenv.mkDerivation rec {

1010 sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";

1111 };

1212

13+ patches = [

14+ # Upstream patch to fix build on -fno-common toolchains.

15+ (fetchurl {

16+ name = "no-common.patch";

17+ url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2";

18+ sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi";

19+ })

20+ ];

21+

1322 nativeBuildInputs = [ pkg-config which ];

1423 buildInputs = [

1524 libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp

@@ -19,7 +28,7 @@ stdenv.mkDerivation rec {

1928

2029 makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ];

2130

22− patchPhase = ''

31+ postPatch = ''

2332 sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile

2433 sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile

2534 '';

pkgs/applications/graphics/openscad/default.nix−2

@@ -65,8 +65,6 @@ mkDerivation rec {

6565 mv $out/bin/*.app $out/Applications

6666 rmdir $out/bin || true

6767

68− wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD

69−

7068 mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \

7169 $out/share/openscad/{examples,color-schemes,locale,libraries,fonts,templates}

7270

pkgs/applications/kde/fetch.sh+1−1

@@ -1 +1 @@

1−WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.1/src -A '*.tar.xz' )

1+WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.2/src -A '*.tar.xz' )

pkgs/applications/kde/marble.nix+1−10

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

22, extra-cmake-modules, kdoctools

33, qtscript, qtsvg, qtquickcontrols, qtwebengine

44, krunner, shared-mime-info, kparts, knewstuff

5−, gpsd, perl, fetchpatch

5+, gpsd, perl

66}:

88mkDerivation {

@@ -18,15 +18,6 @@ mkDerivation {

1818 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts

1919 knewstuff gpsd

2020 ];

21− patches = [

22− (fetchpatch {

23− # Backport fix to allow compilation with gpsd 3.23.1

24− # Remove when marble compiles without the patch.

25− # See: https://invent.kde.org/education/marble/-/merge_requests/57

26− url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";

27− sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";

28− })

29− ];

3021 preConfigure = ''

3122 cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"

3223 '';

pkgs/applications/kde/srcs.nix+904−904

@@ -4,1811 +4,1811 @@

55{

66 akonadi = {

7− version = "21.08.1";

7+ version = "21.08.2";

88 src = fetchurl {

9− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-21.08.1.tar.xz";

10− sha256 = "02abs3mxwna30rgidlndj4jq0swy3id236ckw726vp3r8m9qimd6";

11− name = "akonadi-21.08.1.tar.xz";

9+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-21.08.2.tar.xz";

10+ sha256 = "0jwhjdqha82hbyg2wmzjl5qi2rgmyd2sghdw85s77y63bxm9f0s2";

11+ name = "akonadi-21.08.2.tar.xz";

1212 };

1313 };

1414 akonadi-calendar = {

15− version = "21.08.1";

15+ version = "21.08.2";

1616 src = fetchurl {

17− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-21.08.1.tar.xz";

18− sha256 = "1p8myayr6kfgp805wdpy39f9bjxw1fafv6kn35h1zsl1fgyc4812";

19− name = "akonadi-calendar-21.08.1.tar.xz";

17+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-calendar-21.08.2.tar.xz";

18+ sha256 = "0k4cbcr6cw9rcrzidlbjbpshmsfh0p2m8bd9inkgzxi08drwizsa";

19+ name = "akonadi-calendar-21.08.2.tar.xz";

2020 };

2121 };

2222 akonadi-calendar-tools = {

23− version = "21.08.1";

23+ version = "21.08.2";

2424 src = fetchurl {

25− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-tools-21.08.1.tar.xz";

26− sha256 = "0j8cc0x2bx64crgvprksnmng4yi7fk71s5pfyjrnw8d9xnj7vvvg";

27− name = "akonadi-calendar-tools-21.08.1.tar.xz";

25+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-calendar-tools-21.08.2.tar.xz";

26+ sha256 = "1hxah75grydlaz6hzd3ng91dsap860111alph7vnrqcakhcfm0yc";

27+ name = "akonadi-calendar-tools-21.08.2.tar.xz";

2828 };

2929 };

3030 akonadi-contacts = {

31− version = "21.08.1";

31+ version = "21.08.2";

3232 src = fetchurl {

33− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-contacts-21.08.1.tar.xz";

34− sha256 = "13sjy2jg4bbg7dm182apppmcpkhmiwhkpnkjhh13dhz8v7488vnc";

35− name = "akonadi-contacts-21.08.1.tar.xz";

33+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-contacts-21.08.2.tar.xz";

34+ sha256 = "1ap2c16c0z4m7f3zsp5w5wqwcdr3fn1n2kvb6d647c3knszgibvg";

35+ name = "akonadi-contacts-21.08.2.tar.xz";

3636 };

3737 };

3838 akonadi-import-wizard = {

39− version = "21.08.1";

39+ version = "21.08.2";

4040 src = fetchurl {

41− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-import-wizard-21.08.1.tar.xz";

42− sha256 = "1v0nzaijy6nahjx4j1wsvi8s6s3zk79b8h01n3r6gwilbxklqnqs";

43− name = "akonadi-import-wizard-21.08.1.tar.xz";

41+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-import-wizard-21.08.2.tar.xz";

42+ sha256 = "0hgbjdkl4nva9dy9ljn8f5g4v9bw1rl84x2m0x94msf6bih20nr3";

43+ name = "akonadi-import-wizard-21.08.2.tar.xz";

4444 };

4545 };

4646 akonadi-mime = {

47− version = "21.08.1";

47+ version = "21.08.2";

4848 src = fetchurl {

49− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-mime-21.08.1.tar.xz";

50− sha256 = "15lm1248diqhnv1qldcyyfi1v7w8h13jvwhp80py93hijq07iwz5";

51− name = "akonadi-mime-21.08.1.tar.xz";

49+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-mime-21.08.2.tar.xz";

50+ sha256 = "0fkv26zl92xijkibpxvbqcmip24qrq58lan3w9s642gqh972a6x3";

51+ name = "akonadi-mime-21.08.2.tar.xz";

5252 };

5353 };

5454 akonadi-notes = {

55− version = "21.08.1";

55+ version = "21.08.2";

5656 src = fetchurl {

57− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-notes-21.08.1.tar.xz";

58− sha256 = "1r43pvxpk3f183qaiydxg83xc1y5zss7xgxq5p1vnwgqyifibh3h";

59− name = "akonadi-notes-21.08.1.tar.xz";

57+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-notes-21.08.2.tar.xz";

58+ sha256 = "0r19g9a0asqlw1qsh9vidbwpgbslfwqc8g577hdkhahfvg7hplmq";

59+ name = "akonadi-notes-21.08.2.tar.xz";

6060 };

6161 };

6262 akonadi-search = {

63− version = "21.08.1";

63+ version = "21.08.2";

6464 src = fetchurl {

65− url = "${mirror}/stable/release-service/21.08.1/src/akonadi-search-21.08.1.tar.xz";

66− sha256 = "1w5vps398kadl6p2jhsj18jqfn4lyysx09jzj6q9cvkvzmq4im6i";

67− name = "akonadi-search-21.08.1.tar.xz";

65+ url = "${mirror}/stable/release-service/21.08.2/src/akonadi-search-21.08.2.tar.xz";

66+ sha256 = "1a1pf9q93z0cv7v2fxksiw3vn5dylg0lgniv98z9p6zv0wijxhn5";

67+ name = "akonadi-search-21.08.2.tar.xz";

6868 };

6969 };

7070 akonadiconsole = {

71− version = "21.08.1";

71+ version = "21.08.2";

7272 src = fetchurl {

73− url = "${mirror}/stable/release-service/21.08.1/src/akonadiconsole-21.08.1.tar.xz";

74− sha256 = "1dplpb6z3glps82bzlqhnx29k13m6b7q2wvdlcw9hfqrp2xgzyfk";

75− name = "akonadiconsole-21.08.1.tar.xz";

73+ url = "${mirror}/stable/release-service/21.08.2/src/akonadiconsole-21.08.2.tar.xz";

74+ sha256 = "07vr4nwjzz6y1babwnhhidpv8pldx7vk2mq98midqji87xxh7r10";

75+ name = "akonadiconsole-21.08.2.tar.xz";

7676 };

7777 };

7878 akregator = {

79− version = "21.08.1";

79+ version = "21.08.2";

8080 src = fetchurl {

81− url = "${mirror}/stable/release-service/21.08.1/src/akregator-21.08.1.tar.xz";

82− sha256 = "03rv9m3f7vrn80jfdmnbzxsl226s82liyfam1cysxl2skkmvpimm";

83− name = "akregator-21.08.1.tar.xz";

81+ url = "${mirror}/stable/release-service/21.08.2/src/akregator-21.08.2.tar.xz";

82+ sha256 = "15qkkfrxiwcd1gz5skqj8sb8fkr1mkc51wc2chqr4jv6aa0lbf5r";

83+ name = "akregator-21.08.2.tar.xz";

8484 };

8585 };

8686 analitza = {

87− version = "21.08.1";

87+ version = "21.08.2";

8888 src = fetchurl {

89− url = "${mirror}/stable/release-service/21.08.1/src/analitza-21.08.1.tar.xz";

90− sha256 = "0aagcj2dvm5aq24m6r5z79qsq2ra8xwzj7b1f64kcq8sabw7dbn4";

91− name = "analitza-21.08.1.tar.xz";

89+ url = "${mirror}/stable/release-service/21.08.2/src/analitza-21.08.2.tar.xz";

90+ sha256 = "1y4amcl3sjpxhlqzyjmnpycgv3jfdn4458zch9qzakvjxamq6m9c";

91+ name = "analitza-21.08.2.tar.xz";

9292 };

9393 };

9494 ark = {

95− version = "21.08.1";

95+ version = "21.08.2";

9696 src = fetchurl {

97− url = "${mirror}/stable/release-service/21.08.1/src/ark-21.08.1.tar.xz";

98− sha256 = "1ss33qizhg325k4hhf8339xg52iv4s32qjm048zhi2jaz54pdnv0";

99− name = "ark-21.08.1.tar.xz";

97+ url = "${mirror}/stable/release-service/21.08.2/src/ark-21.08.2.tar.xz";

98+ sha256 = "0hxzd0qr07wyz5v76nj4qj4db4lav53xapknmakif1fkghj1r51g";

99+ name = "ark-21.08.2.tar.xz";

100100 };

101101 };

102102 artikulate = {

103− version = "21.08.1";

103+ version = "21.08.2";

104104 src = fetchurl {

105− url = "${mirror}/stable/release-service/21.08.1/src/artikulate-21.08.1.tar.xz";

106− sha256 = "0x71m715iw1hv6xy36sd2gzd0cnsbn09wipp02nx2dc161lavnxk";

107− name = "artikulate-21.08.1.tar.xz";

105+ url = "${mirror}/stable/release-service/21.08.2/src/artikulate-21.08.2.tar.xz";

106+ sha256 = "0b4fvxwrynnwr8mm87h60mhk293invaq8vw4y9dk6hv36l1z5fbf";

107+ name = "artikulate-21.08.2.tar.xz";

108108 };

109109 };

110110 audiocd-kio = {

111− version = "21.08.1";

111+ version = "21.08.2";

112112 src = fetchurl {

113− url = "${mirror}/stable/release-service/21.08.1/src/audiocd-kio-21.08.1.tar.xz";

114− sha256 = "1aqzgmpypzska5lgjwjpnbl6q2cbyiirph6h8ph5wnnb992lx8li";

115− name = "audiocd-kio-21.08.1.tar.xz";

113+ url = "${mirror}/stable/release-service/21.08.2/src/audiocd-kio-21.08.2.tar.xz";

114+ sha256 = "1l0wym8gisgwv2mg2jsvpj8hb2yvmzd7dcximg540ljphv3hp1p2";

115+ name = "audiocd-kio-21.08.2.tar.xz";

116116 };

117117 };

118118 baloo-widgets = {

119− version = "21.08.1";

119+ version = "21.08.2";

120120 src = fetchurl {

121− url = "${mirror}/stable/release-service/21.08.1/src/baloo-widgets-21.08.1.tar.xz";

122− sha256 = "01f0hpgvlwxn3yms6yyi0ykryb78c9plp0q2z0ywk1p4lx4iywhd";

123− name = "baloo-widgets-21.08.1.tar.xz";

121+ url = "${mirror}/stable/release-service/21.08.2/src/baloo-widgets-21.08.2.tar.xz";

122+ sha256 = "1fk8qvqh1xx6139wvyfk607vkb7w3d79gc3v3c8s96pkp5b228ax";

123+ name = "baloo-widgets-21.08.2.tar.xz";

124124 };

125125 };

126126 blinken = {

127− version = "21.08.1";

127+ version = "21.08.2";

128128 src = fetchurl {

129− url = "${mirror}/stable/release-service/21.08.1/src/blinken-21.08.1.tar.xz";

130− sha256 = "1bfkiwg2cwn4dizwcjb0ynzvvdxndf5172a8z0ch9b2wxlaljh87";

131− name = "blinken-21.08.1.tar.xz";

129+ url = "${mirror}/stable/release-service/21.08.2/src/blinken-21.08.2.tar.xz";

130+ sha256 = "1ciq6fk9430p8sihc1q40djjw4994w1lghps9kr3415ryv08bfci";

131+ name = "blinken-21.08.2.tar.xz";

132132 };

133133 };

134134 bomber = {

135− version = "21.08.1";

135+ version = "21.08.2";

136136 src = fetchurl {

137− url = "${mirror}/stable/release-service/21.08.1/src/bomber-21.08.1.tar.xz";

138− sha256 = "1ppsnnbwsf1y9pavnpxr64k845gx1yn5p1mqswpcqgp9zd58f338";

139− name = "bomber-21.08.1.tar.xz";

137+ url = "${mirror}/stable/release-service/21.08.2/src/bomber-21.08.2.tar.xz";

138+ sha256 = "0wk6j89m8lbp83yfz2xwy78x99cvph9p36jzscpp4i894j6fad61";

139+ name = "bomber-21.08.2.tar.xz";

140140 };

141141 };

142142 bovo = {

143− version = "21.08.1";

143+ version = "21.08.2";

144144 src = fetchurl {

145− url = "${mirror}/stable/release-service/21.08.1/src/bovo-21.08.1.tar.xz";

146− sha256 = "0qs96ds0clbvf7q487h9bq7l4haymdcyxzq8rlfd74qpki9cb9aa";

147− name = "bovo-21.08.1.tar.xz";

145+ url = "${mirror}/stable/release-service/21.08.2/src/bovo-21.08.2.tar.xz";

146+ sha256 = "1k5ncxxx64yj2b71jlpz7ll935mrilhrhphwz1h8n8pdr6dn91mf";

147+ name = "bovo-21.08.2.tar.xz";

148148 };

149149 };

150150 calendarsupport = {

151− version = "21.08.1";

151+ version = "21.08.2";

152152 src = fetchurl {

153− url = "${mirror}/stable/release-service/21.08.1/src/calendarsupport-21.08.1.tar.xz";

154− sha256 = "0n9mbwdgyc4530g1rn9b393qq8pgpcclcpip9p72q8qc630jsvbw";

155− name = "calendarsupport-21.08.1.tar.xz";

153+ url = "${mirror}/stable/release-service/21.08.2/src/calendarsupport-21.08.2.tar.xz";

154+ sha256 = "01plq4qzp94lxcc2gp04afnlvmni8993c8mf6kl256158z0y24ik";

155+ name = "calendarsupport-21.08.2.tar.xz";

156156 };

157157 };

158158 cantor = {

159− version = "21.08.1";

159+ version = "21.08.2";

160160 src = fetchurl {

161− url = "${mirror}/stable/release-service/21.08.1/src/cantor-21.08.1.tar.xz";

162− sha256 = "18gl6bw8mnn9sp4jws5b57k9w9scqg53ynw6yrabx2796k0hwfiw";

163− name = "cantor-21.08.1.tar.xz";

161+ url = "${mirror}/stable/release-service/21.08.2/src/cantor-21.08.2.tar.xz";

162+ sha256 = "07xxwm3aa00v6cax7nyv326glapll01qh4libszhhn8pwpiyl00w";

163+ name = "cantor-21.08.2.tar.xz";

164164 };

165165 };

166166 cervisia = {

167− version = "21.08.1";

167+ version = "21.08.2";

168168 src = fetchurl {

169− url = "${mirror}/stable/release-service/21.08.1/src/cervisia-21.08.1.tar.xz";

170− sha256 = "0dah0lgzpdzxyvccqk2k2qbl5x4dl53qp23d0rxb5cg1ba5h7n2l";

171− name = "cervisia-21.08.1.tar.xz";

169+ url = "${mirror}/stable/release-service/21.08.2/src/cervisia-21.08.2.tar.xz";

170+ sha256 = "0x4hisqfkizjxzl34s0yc6dn5r5fyh7f5yaadq5g47fdcah5cmmf";

171+ name = "cervisia-21.08.2.tar.xz";

172172 };

173173 };

174174 dolphin = {

175− version = "21.08.1";

175+ version = "21.08.2";

176176 src = fetchurl {

177− url = "${mirror}/stable/release-service/21.08.1/src/dolphin-21.08.1.tar.xz";

178− sha256 = "1vmk9iaylw427x203ccdjhlbah3dr5fz7l3lc113nczq54kcwpbf";

179− name = "dolphin-21.08.1.tar.xz";

177+ url = "${mirror}/stable/release-service/21.08.2/src/dolphin-21.08.2.tar.xz";

178+ sha256 = "18aiqpf8qsig64gpcn6b1f0fs5mvzbdg8ncbhcjq0gy8gh3xamj2";

179+ name = "dolphin-21.08.2.tar.xz";

180180 };

181181 };

182182 dolphin-plugins = {

183− version = "21.08.1";

183+ version = "21.08.2";

184184 src = fetchurl {

185− url = "${mirror}/stable/release-service/21.08.1/src/dolphin-plugins-21.08.1.tar.xz";

186− sha256 = "0gnmr73ly0djngp3imdi4zm72icj3gilqcshb4ks3rq3lwk408rr";

187− name = "dolphin-plugins-21.08.1.tar.xz";

185+ url = "${mirror}/stable/release-service/21.08.2/src/dolphin-plugins-21.08.2.tar.xz";

186+ sha256 = "0278pmakd4xqc8ckyxkzvf1xj1jp7jdq3a86i0n0k691zfljnan7";

187+ name = "dolphin-plugins-21.08.2.tar.xz";

188188 };

189189 };

190190 dragon = {

191− version = "21.08.1";

191+ version = "21.08.2";

192192 src = fetchurl {

193− url = "${mirror}/stable/release-service/21.08.1/src/dragon-21.08.1.tar.xz";

194− sha256 = "050jrizyip362fanrbx3fwp4n69sr7d4y2w6n70aqv8hhi90xqjy";

195− name = "dragon-21.08.1.tar.xz";

193+ url = "${mirror}/stable/release-service/21.08.2/src/dragon-21.08.2.tar.xz";

194+ sha256 = "0ddijz96z58582w298jp11vns9fx3rmzqd3x1qplxvp4sl0hp9l7";

195+ name = "dragon-21.08.2.tar.xz";

196196 };

197197 };

198198 elisa = {

199− version = "21.08.1";

199+ version = "21.08.2";

200200 src = fetchurl {

201− url = "${mirror}/stable/release-service/21.08.1/src/elisa-21.08.1.tar.xz";

202− sha256 = "12kr5aixw5gdmy2vj6id0wmznkwg6p1ysxcqayk8bwvv2qz2pygr";

203− name = "elisa-21.08.1.tar.xz";

201+ url = "${mirror}/stable/release-service/21.08.2/src/elisa-21.08.2.tar.xz";

202+ sha256 = "14wi7dva0bfagxw49bs80qszqcv6k16s0569mh1c4m97gzlzgv35";

203+ name = "elisa-21.08.2.tar.xz";

204204 };

205205 };

206206 eventviews = {

207− version = "21.08.1";

207+ version = "21.08.2";

208208 src = fetchurl {

209− url = "${mirror}/stable/release-service/21.08.1/src/eventviews-21.08.1.tar.xz";

210− sha256 = "04z5cb4vhxcwxp8dwv7w4400zmj090gr7dm4d4h4x39312d25rhh";

211− name = "eventviews-21.08.1.tar.xz";

209+ url = "${mirror}/stable/release-service/21.08.2/src/eventviews-21.08.2.tar.xz";

210+ sha256 = "0d1ahknazkjav9641i1wggj9f67cr3s3y176v1j6ljhr4dl3m3xj";

211+ name = "eventviews-21.08.2.tar.xz";

212212 };

213213 };

214214 ffmpegthumbs = {

215− version = "21.08.1";

215+ version = "21.08.2";

216216 src = fetchurl {

217− url = "${mirror}/stable/release-service/21.08.1/src/ffmpegthumbs-21.08.1.tar.xz";

218− sha256 = "13v5y99fvj0p9f9hqafw652qzb7z267fjfsqykv7wb3pv274f11w";

219− name = "ffmpegthumbs-21.08.1.tar.xz";

217+ url = "${mirror}/stable/release-service/21.08.2/src/ffmpegthumbs-21.08.2.tar.xz";

218+ sha256 = "1gsxcm86aq3r485ivk532a949z5l4129kildbd752c2qy0hdy5z1";

219+ name = "ffmpegthumbs-21.08.2.tar.xz";

220220 };

221221 };

222222 filelight = {

223− version = "21.08.1";

223+ version = "21.08.2";

224224 src = fetchurl {

225− url = "${mirror}/stable/release-service/21.08.1/src/filelight-21.08.1.tar.xz";

226− sha256 = "0smvvh7g9p0vh4s3xd0pk6whszk8vmqv9ww1jp0y3dy6ai2cwixi";

227− name = "filelight-21.08.1.tar.xz";

225+ url = "${mirror}/stable/release-service/21.08.2/src/filelight-21.08.2.tar.xz";

226+ sha256 = "0phisyrnxc6i19253fdayx8cn51y6vxd66gfdy08hi4r31ih57jd";

227+ name = "filelight-21.08.2.tar.xz";

228228 };

229229 };

230230 granatier = {

231− version = "21.08.1";

231+ version = "21.08.2";

232232 src = fetchurl {

233− url = "${mirror}/stable/release-service/21.08.1/src/granatier-21.08.1.tar.xz";

234− sha256 = "1n7bvkh118530hi0aka9wwz7kycljwawb5d0wxzjb74kqp5rp0lv";

235− name = "granatier-21.08.1.tar.xz";

233+ url = "${mirror}/stable/release-service/21.08.2/src/granatier-21.08.2.tar.xz";

234+ sha256 = "1bly3jlmn9d2im05srr3v28mw8wmr3hnw180wi8lpfzianh589v7";

235+ name = "granatier-21.08.2.tar.xz";

236236 };

237237 };

238238 grantlee-editor = {

239− version = "21.08.1";

239+ version = "21.08.2";

240240 src = fetchurl {

241− url = "${mirror}/stable/release-service/21.08.1/src/grantlee-editor-21.08.1.tar.xz";

242− sha256 = "1nfqylrnkvhjiygah527i9q16987n99ry69nwd1000xvf7r1k2yd";

243− name = "grantlee-editor-21.08.1.tar.xz";

241+ url = "${mirror}/stable/release-service/21.08.2/src/grantlee-editor-21.08.2.tar.xz";

242+ sha256 = "1sm35c4r5sawcrclv1sc6ij4gsll87zwmissahgf30km32vz0rbv";

243+ name = "grantlee-editor-21.08.2.tar.xz";

244244 };

245245 };

246246 grantleetheme = {

247− version = "21.08.1";

247+ version = "21.08.2";

248248 src = fetchurl {

249− url = "${mirror}/stable/release-service/21.08.1/src/grantleetheme-21.08.1.tar.xz";

250− sha256 = "0zscb0wb85g1r0zcqb50ylg1r0640mjk985ifffnjzxlx4ayqglm";

251− name = "grantleetheme-21.08.1.tar.xz";

249+ url = "${mirror}/stable/release-service/21.08.2/src/grantleetheme-21.08.2.tar.xz";

250+ sha256 = "0xm19a21y8b4cqiqg6mhxip1xxk7hrz88z1sijhhgc8d14i7mkdk";

251+ name = "grantleetheme-21.08.2.tar.xz";

252252 };

253253 };

254254 gwenview = {

255− version = "21.08.1";

255+ version = "21.08.2";

256256 src = fetchurl {

257− url = "${mirror}/stable/release-service/21.08.1/src/gwenview-21.08.1.tar.xz";

258− sha256 = "187br8271z00v02vllpxqwk8x6y38gg43xixczd8x4j0p6rgv8a0";

259− name = "gwenview-21.08.1.tar.xz";

257+ url = "${mirror}/stable/release-service/21.08.2/src/gwenview-21.08.2.tar.xz";

258+ sha256 = "0yignay0g4vz3zj9xpziinsqd8pwywd1cq43f0n5hmzxrrv0abcf";

259+ name = "gwenview-21.08.2.tar.xz";

260260 };

261261 };

262262 incidenceeditor = {

263− version = "21.08.1";

263+ version = "21.08.2";

264264 src = fetchurl {

265− url = "${mirror}/stable/release-service/21.08.1/src/incidenceeditor-21.08.1.tar.xz";

266− sha256 = "1xyb106ck64qq4z083g0qx9n3rax5ma41jsfwl8am8w5q4szxw31";

267− name = "incidenceeditor-21.08.1.tar.xz";

265+ url = "${mirror}/stable/release-service/21.08.2/src/incidenceeditor-21.08.2.tar.xz";

266+ sha256 = "0xrz3kzf4mc37zgfbjgc23l7wxry9m6d5igvyf1qm33yxwr4w78q";

267+ name = "incidenceeditor-21.08.2.tar.xz";

268268 };

269269 };

270270 itinerary = {

271− version = "21.08.1";

271+ version = "21.08.2";

272272 src = fetchurl {

273− url = "${mirror}/stable/release-service/21.08.1/src/itinerary-21.08.1.tar.xz";

274− sha256 = "018871y48yd2z2qsrnjhymb72nn4by2l8lrz38gcd9fq2dwlh5fs";

275− name = "itinerary-21.08.1.tar.xz";

273+ url = "${mirror}/stable/release-service/21.08.2/src/itinerary-21.08.2.tar.xz";

274+ sha256 = "059n7xy3gjbqxl9cn7nxng9y4662ggi2lh2zj3yv0knwy78ccwjk";

275+ name = "itinerary-21.08.2.tar.xz";

276276 };

277277 };

278278 juk = {

279− version = "21.08.1";

279+ version = "21.08.2";

280280 src = fetchurl {

281− url = "${mirror}/stable/release-service/21.08.1/src/juk-21.08.1.tar.xz";

282− sha256 = "0q2q31r72d28hhabrnwglhcz6h3ay70i4fg7gyn658njvx8gl26b";

283− name = "juk-21.08.1.tar.xz";

281+ url = "${mirror}/stable/release-service/21.08.2/src/juk-21.08.2.tar.xz";

282+ sha256 = "0c74s9ylx1xh1y581ygm6zyafwv3l5d7297wfg50f64nyr5npxm2";

283+ name = "juk-21.08.2.tar.xz";

284284 };

285285 };

286286 k3b = {

287− version = "21.08.1";

287+ version = "21.08.2";

288288 src = fetchurl {

289− url = "${mirror}/stable/release-service/21.08.1/src/k3b-21.08.1.tar.xz";

290− sha256 = "1gs4api78ngyb03sgknhc1cil6rx7rd1y66674lmi3sssyhi6bkz";

291− name = "k3b-21.08.1.tar.xz";

289+ url = "${mirror}/stable/release-service/21.08.2/src/k3b-21.08.2.tar.xz";

290+ sha256 = "1g9xgzklsyard3ghcmr9irixcilga6kcj46jav884y8w7zxb4mrd";

291+ name = "k3b-21.08.2.tar.xz";

292292 };

293293 };

294294 kaccounts-integration = {

295− version = "21.08.1";

295+ version = "21.08.2";

296296 src = fetchurl {

297− url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-integration-21.08.1.tar.xz";

298− sha256 = "1860njydckpdz34y7g94pa4xz0229j1szj8ihvql05kgysdm11qp";

299− name = "kaccounts-integration-21.08.1.tar.xz";

297+ url = "${mirror}/stable/release-service/21.08.2/src/kaccounts-integration-21.08.2.tar.xz";

298+ sha256 = "1ckwm2kwb83kl89491wrmpd748zhkwd1vyaffwiyaqkp4rkrjph0";

299+ name = "kaccounts-integration-21.08.2.tar.xz";

300300 };

301301 };

302302 kaccounts-providers = {

303− version = "21.08.1";

303+ version = "21.08.2";

304304 src = fetchurl {

305− url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-providers-21.08.1.tar.xz";

306− sha256 = "1w5k7y8xakp1lf4ca3wip7af3f9avd04i6zixv7kq9w3fh1mndp0";

307− name = "kaccounts-providers-21.08.1.tar.xz";

305+ url = "${mirror}/stable/release-service/21.08.2/src/kaccounts-providers-21.08.2.tar.xz";

306+ sha256 = "15q1ibhxwxcvsjn6b2whyynhipq5b571d98bz20dn25fff88xllg";

307+ name = "kaccounts-providers-21.08.2.tar.xz";

308308 };

309309 };

310310 kaddressbook = {

311− version = "21.08.1";

311+ version = "21.08.2";

312312 src = fetchurl {

313− url = "${mirror}/stable/release-service/21.08.1/src/kaddressbook-21.08.1.tar.xz";

314− sha256 = "05lrxban904szlqhri71qqfykyygsxwgsx9w406s213vwkakirxb";

315− name = "kaddressbook-21.08.1.tar.xz";

313+ url = "${mirror}/stable/release-service/21.08.2/src/kaddressbook-21.08.2.tar.xz";

314+ sha256 = "1pvd31zpam13jv0mhxzaagdlvnav60znd68l24y1dw5i98wk7n72";

315+ name = "kaddressbook-21.08.2.tar.xz";

316316 };

317317 };

318318 kajongg = {

319− version = "21.08.1";

319+ version = "21.08.2";

320320 src = fetchurl {

321− url = "${mirror}/stable/release-service/21.08.1/src/kajongg-21.08.1.tar.xz";

322− sha256 = "1izm0n2nsvxh9zvws53q4hkpzjihjwwccspas7k10ryasgp4nwsb";

323− name = "kajongg-21.08.1.tar.xz";

321+ url = "${mirror}/stable/release-service/21.08.2/src/kajongg-21.08.2.tar.xz";

322+ sha256 = "0c8kxh6kbk7ml16df4gmr142rjllc7v0v7m3kw4ksngk93f7vz2s";

323+ name = "kajongg-21.08.2.tar.xz";

324324 };

325325 };

326326 kalarm = {

327− version = "21.08.1";

327+ version = "21.08.2";

328328 src = fetchurl {

329− url = "${mirror}/stable/release-service/21.08.1/src/kalarm-21.08.1.tar.xz";

330− sha256 = "088461j6piwas0g4chpj579r3bhyncmyajsfh2hz4679ir5lf6yh";

331− name = "kalarm-21.08.1.tar.xz";

329+ url = "${mirror}/stable/release-service/21.08.2/src/kalarm-21.08.2.tar.xz";

330+ sha256 = "06cww023m4ng4g3v344lci0rvapk4zyzf1vi5jlajfs5d8bfkgf5";

331+ name = "kalarm-21.08.2.tar.xz";

332332 };

333333 };

334334 kalarmcal = {

335− version = "21.08.1";

335+ version = "21.08.2";

336336 src = fetchurl {

337− url = "${mirror}/stable/release-service/21.08.1/src/kalarmcal-21.08.1.tar.xz";

338− sha256 = "1s0yrh0y54rjp4d6y8vcixxrlsdra1xr8j3lxswl2h866p87v7fa";

339− name = "kalarmcal-21.08.1.tar.xz";

337+ url = "${mirror}/stable/release-service/21.08.2/src/kalarmcal-21.08.2.tar.xz";

338+ sha256 = "0xdcazbbkm2z0r2g1avwh9bvdkvv0fy6qhhddlmfzj4cwh4c9vih";

339+ name = "kalarmcal-21.08.2.tar.xz";

340340 };

341341 };

342342 kalgebra = {

343− version = "21.08.1";

343+ version = "21.08.2";

344344 src = fetchurl {

345− url = "${mirror}/stable/release-service/21.08.1/src/kalgebra-21.08.1.tar.xz";

346− sha256 = "0a8hmzdslr92v9a8pjf7rnmpf040l9cizzlx8xrxqk2bdb7qls5w";

347− name = "kalgebra-21.08.1.tar.xz";

345+ url = "${mirror}/stable/release-service/21.08.2/src/kalgebra-21.08.2.tar.xz";

346+ sha256 = "07fw8ab8gy9mam5dij6i9nl1zv4fp13vari6nzdk337klhsdbsjr";

347+ name = "kalgebra-21.08.2.tar.xz";

348348 };

349349 };

350350 kalzium = {

351− version = "21.08.1";

351+ version = "21.08.2";

352352 src = fetchurl {

353− url = "${mirror}/stable/release-service/21.08.1/src/kalzium-21.08.1.tar.xz";

354− sha256 = "0ijxyzryry1j9gfdmk56dlzyb4iz0v4vmjzjnqkv6sq2lm47lhyp";

355− name = "kalzium-21.08.1.tar.xz";

353+ url = "${mirror}/stable/release-service/21.08.2/src/kalzium-21.08.2.tar.xz";

354+ sha256 = "0hjkpgclm67nyninywdmcpi7vn3jmf7ikbd4afg4bhj5mcz2a4vg";

355+ name = "kalzium-21.08.2.tar.xz";

356356 };

357357 };

358358 kamera = {

359− version = "21.08.1";

359+ version = "21.08.2";

360360 src = fetchurl {

361− url = "${mirror}/stable/release-service/21.08.1/src/kamera-21.08.1.tar.xz";

362− sha256 = "0cmppa8bc9iqbdk0pbnzrj1qqryqmrdgs7hliay3hsl7gjlz9zgy";

363− name = "kamera-21.08.1.tar.xz";

361+ url = "${mirror}/stable/release-service/21.08.2/src/kamera-21.08.2.tar.xz";

362+ sha256 = "1arb93sa730ha8bgbcvp6bng8s4fp9yvcv0qvkhk2nl4db4m5rng";

363+ name = "kamera-21.08.2.tar.xz";

364364 };

365365 };

366366 kamoso = {

367− version = "21.08.1";

367+ version = "21.08.2";

368368 src = fetchurl {

369− url = "${mirror}/stable/release-service/21.08.1/src/kamoso-21.08.1.tar.xz";

370− sha256 = "15nqy97m913f0sdjs15bjivs7hvxghlhlw5579fsnfahg5iz5qp6";

371− name = "kamoso-21.08.1.tar.xz";

369+ url = "${mirror}/stable/release-service/21.08.2/src/kamoso-21.08.2.tar.xz";

370+ sha256 = "0rkd9mk7rgha40j19rwpyqmn8lchqahakn4p3sbab7h3p3cq2b7p";

371+ name = "kamoso-21.08.2.tar.xz";

372372 };

373373 };

374374 kanagram = {

375− version = "21.08.1";

375+ version = "21.08.2";

376376 src = fetchurl {

377− url = "${mirror}/stable/release-service/21.08.1/src/kanagram-21.08.1.tar.xz";

378− sha256 = "1jqrmgyd2ijqb1sq17r7mijvcix6syys02kyasyilwgibbnlzjz1";

379− name = "kanagram-21.08.1.tar.xz";

377+ url = "${mirror}/stable/release-service/21.08.2/src/kanagram-21.08.2.tar.xz";

378+ sha256 = "12iq58jc36rp664c92s7442gnxq6k1fi4017a4hwqq67b9ismgzl";

379+ name = "kanagram-21.08.2.tar.xz";

380380 };

381381 };

382382 kapman = {

383− version = "21.08.1";

383+ version = "21.08.2";

384384 src = fetchurl {

385− url = "${mirror}/stable/release-service/21.08.1/src/kapman-21.08.1.tar.xz";

386− sha256 = "072376xqm4a8fwvslf9grsklvzb50d9f098z4qba1lh3y3ivp7wm";

387− name = "kapman-21.08.1.tar.xz";

385+ url = "${mirror}/stable/release-service/21.08.2/src/kapman-21.08.2.tar.xz";

386+ sha256 = "04yv6j2bjlgclp916k2gibhhv5d64sxk181cqw7sh5j4aq555a3r";

387+ name = "kapman-21.08.2.tar.xz";

388388 };

389389 };

390390 kapptemplate = {

391− version = "21.08.1";

391+ version = "21.08.2";

392392 src = fetchurl {

393− url = "${mirror}/stable/release-service/21.08.1/src/kapptemplate-21.08.1.tar.xz";

394− sha256 = "1crll3dr299qpigh2w9psvpi0r4jmb8y0b0facfcfcs6j9ldfbw5";

395− name = "kapptemplate-21.08.1.tar.xz";

393+ url = "${mirror}/stable/release-service/21.08.2/src/kapptemplate-21.08.2.tar.xz";

394+ sha256 = "0vgfz4pz9yjns4dpks8mrp8zzipka4chw257l1db25khibksgh48";

395+ name = "kapptemplate-21.08.2.tar.xz";

396396 };

397397 };

398398 kate = {

399− version = "21.08.1";

399+ version = "21.08.2";

400400 src = fetchurl {

401− url = "${mirror}/stable/release-service/21.08.1/src/kate-21.08.1.tar.xz";

402− sha256 = "0k9kf8x5gbj5vbnr6lfhizi8122p76xixw480a3zsqi57i4bxk0z";

403− name = "kate-21.08.1.tar.xz";

401+ url = "${mirror}/stable/release-service/21.08.2/src/kate-21.08.2.tar.xz";

402+ sha256 = "1cm6iq3cqmp0kvsxhv0vlqy1dyzmis9fb0a6298q0lyjkmsri26n";

403+ name = "kate-21.08.2.tar.xz";

404404 };

405405 };

406406 katomic = {

407− version = "21.08.1";

407+ version = "21.08.2";

408408 src = fetchurl {

409− url = "${mirror}/stable/release-service/21.08.1/src/katomic-21.08.1.tar.xz";

410− sha256 = "1595swszpw2ia9dh5c6wgrz04qlcvw84l474imkms4gv1cz583pb";

411− name = "katomic-21.08.1.tar.xz";

409+ url = "${mirror}/stable/release-service/21.08.2/src/katomic-21.08.2.tar.xz";

410+ sha256 = "0lng3fpc1b255n8hayla3lpb77rmgvx8bkzi1s152kq7bf2mnxj7";

411+ name = "katomic-21.08.2.tar.xz";

412412 };

413413 };

414414 kbackup = {

415− version = "21.08.1";

415+ version = "21.08.2";

416416 src = fetchurl {

417− url = "${mirror}/stable/release-service/21.08.1/src/kbackup-21.08.1.tar.xz";

418− sha256 = "04795m0r4icfpv6166ingb82mfai0g6q48f9qvcqn029z0f347ya";

419− name = "kbackup-21.08.1.tar.xz";

417+ url = "${mirror}/stable/release-service/21.08.2/src/kbackup-21.08.2.tar.xz";

418+ sha256 = "06xvw94m6zr7zj0i54if9vanbflnj88b0c16751br6ibp2m9zvlp";

419+ name = "kbackup-21.08.2.tar.xz";

420420 };

421421 };

422422 kblackbox = {

423− version = "21.08.1";

423+ version = "21.08.2";

424424 src = fetchurl {

425− url = "${mirror}/stable/release-service/21.08.1/src/kblackbox-21.08.1.tar.xz";

426− sha256 = "019nd86wmm1m8yz0lsayx37mqyzhx1pa5kbddajf5032dscncymd";

427− name = "kblackbox-21.08.1.tar.xz";

425+ url = "${mirror}/stable/release-service/21.08.2/src/kblackbox-21.08.2.tar.xz";

426+ sha256 = "093k42259lwbhmq6pm5hv1iqm4maqd63qic80p748wmh88bsh8yg";

427+ name = "kblackbox-21.08.2.tar.xz";

428428 };

429429 };

430430 kblocks = {

431− version = "21.08.1";

431+ version = "21.08.2";

432432 src = fetchurl {

433− url = "${mirror}/stable/release-service/21.08.1/src/kblocks-21.08.1.tar.xz";

434− sha256 = "1grgkikl7zcs58y86kaw6slq7wvqa51g85kvwrysniv6l3yzhvxj";

435− name = "kblocks-21.08.1.tar.xz";

433+ url = "${mirror}/stable/release-service/21.08.2/src/kblocks-21.08.2.tar.xz";

434+ sha256 = "0p4k3wr8756qfxr09daqp7z3461ljnd3yv34h893j5dini1lfy3d";

435+ name = "kblocks-21.08.2.tar.xz";

436436 };

437437 };

438438 kbounce = {

439− version = "21.08.1";

439+ version = "21.08.2";

440440 src = fetchurl {

441− url = "${mirror}/stable/release-service/21.08.1/src/kbounce-21.08.1.tar.xz";

442− sha256 = "18sd3yzz0mj9j666pnkm49ngfzh7aw125a5zyf1k947z6ayv5zix";

443− name = "kbounce-21.08.1.tar.xz";

441+ url = "${mirror}/stable/release-service/21.08.2/src/kbounce-21.08.2.tar.xz";

442+ sha256 = "06zd4p8glpzp7q4a8qcmnj1lszgfdircfkgc8ay5abmfx2rr9hcw";

443+ name = "kbounce-21.08.2.tar.xz";

444444 };

445445 };

446446 kbreakout = {

447− version = "21.08.1";

447+ version = "21.08.2";

448448 src = fetchurl {

449− url = "${mirror}/stable/release-service/21.08.1/src/kbreakout-21.08.1.tar.xz";

450− sha256 = "0264w926ldfhdx22z1iqk41w5a9gnycff4vdjf0i6rzyws2qsb0g";

451− name = "kbreakout-21.08.1.tar.xz";

449+ url = "${mirror}/stable/release-service/21.08.2/src/kbreakout-21.08.2.tar.xz";

450+ sha256 = "1gj37ryhak1czv95ksigssmbmicdpirzi1l5zsv1w7jdh4nqcz54";

451+ name = "kbreakout-21.08.2.tar.xz";

452452 };

453453 };

454454 kbruch = {

455− version = "21.08.1";

455+ version = "21.08.2";

456456 src = fetchurl {

457− url = "${mirror}/stable/release-service/21.08.1/src/kbruch-21.08.1.tar.xz";

458− sha256 = "1rbkwzca3m93p3z294cwkiyycg0w87r6j37v0zyiq802pwkkpm34";

459− name = "kbruch-21.08.1.tar.xz";

457+ url = "${mirror}/stable/release-service/21.08.2/src/kbruch-21.08.2.tar.xz";

458+ sha256 = "1syy188f3sg3r22f7dklzman0h8fz6r1n4r5z986240q0r316rbn";

459+ name = "kbruch-21.08.2.tar.xz";

460460 };

461461 };

462462 kcachegrind = {

463− version = "21.08.1";

463+ version = "21.08.2";

464464 src = fetchurl {

465− url = "${mirror}/stable/release-service/21.08.1/src/kcachegrind-21.08.1.tar.xz";

466− sha256 = "09zgilcya7asj2si747snli6h0s7wzgjzkns9f53rwvq06xbp2zv";

467− name = "kcachegrind-21.08.1.tar.xz";

465+ url = "${mirror}/stable/release-service/21.08.2/src/kcachegrind-21.08.2.tar.xz";

466+ sha256 = "126qa061bwz2d4s721vbv2099mz07vw3i1yw7vm0b3ih43h95149";

467+ name = "kcachegrind-21.08.2.tar.xz";

468468 };

469469 };

470470 kcalc = {

471− version = "21.08.1";

471+ version = "21.08.2";

472472 src = fetchurl {

473− url = "${mirror}/stable/release-service/21.08.1/src/kcalc-21.08.1.tar.xz";

474− sha256 = "0si3mp1xbk6gps5fhc9fv1vskx37pgwx72i2x1kcm7azif26nzsk";

475− name = "kcalc-21.08.1.tar.xz";

473+ url = "${mirror}/stable/release-service/21.08.2/src/kcalc-21.08.2.tar.xz";

474+ sha256 = "01923w7zav2iia5pffs33vhblzh26lr1zpf2274cgplsbb5lcc9p";

475+ name = "kcalc-21.08.2.tar.xz";

476476 };

477477 };

478478 kcalutils = {

479− version = "21.08.1";

479+ version = "21.08.2";

480480 src = fetchurl {

481− url = "${mirror}/stable/release-service/21.08.1/src/kcalutils-21.08.1.tar.xz";

482− sha256 = "1xrggb8vv8lrjyhdb9yf2fzs36q766if78hlymgfndj1z37s0m6m";

483− name = "kcalutils-21.08.1.tar.xz";

481+ url = "${mirror}/stable/release-service/21.08.2/src/kcalutils-21.08.2.tar.xz";

482+ sha256 = "0kvfpsz6zxdbgl4qvk3q55fjgjql1chx844cys26anhza0ld9afz";

483+ name = "kcalutils-21.08.2.tar.xz";

484484 };

485485 };

486486 kcharselect = {

487− version = "21.08.1";

487+ version = "21.08.2";

488488 src = fetchurl {

489− url = "${mirror}/stable/release-service/21.08.1/src/kcharselect-21.08.1.tar.xz";

490− sha256 = "0qbhmyczc13kmbls06732i91s8n6w396dfj1z50z28wrkyqls8zr";

491− name = "kcharselect-21.08.1.tar.xz";

489+ url = "${mirror}/stable/release-service/21.08.2/src/kcharselect-21.08.2.tar.xz";

490+ sha256 = "08x060xmnyzqyadimwdqz767q29rmd48m8aqr3dsrzvb969ijnha";

491+ name = "kcharselect-21.08.2.tar.xz";

492492 };

493493 };

494494 kcolorchooser = {

495− version = "21.08.1";

495+ version = "21.08.2";

496496 src = fetchurl {

497− url = "${mirror}/stable/release-service/21.08.1/src/kcolorchooser-21.08.1.tar.xz";

498− sha256 = "13zdyksijxflvjb3zaszl6q7wzwz0pxsq8hyi5pb2gb7gryz65h7";

499− name = "kcolorchooser-21.08.1.tar.xz";

497+ url = "${mirror}/stable/release-service/21.08.2/src/kcolorchooser-21.08.2.tar.xz";

498+ sha256 = "00vn2001crd0in3zd016xkhm38qgl7m03k1n90fiashjlnfd0928";

499+ name = "kcolorchooser-21.08.2.tar.xz";

500500 };

501501 };

502502 kcron = {

503− version = "21.08.1";

503+ version = "21.08.2";

504504 src = fetchurl {

505− url = "${mirror}/stable/release-service/21.08.1/src/kcron-21.08.1.tar.xz";

506− sha256 = "0c9d3rlml2adk11bp541l1zpbgp3q6mfhb7bpq4alrwlrbd4fxan";

507− name = "kcron-21.08.1.tar.xz";

505+ url = "${mirror}/stable/release-service/21.08.2/src/kcron-21.08.2.tar.xz";

506+ sha256 = "1ryfa084cfp7v11lbr58j4rx3n4m70ynpzbyavin31x1zzbw7bh8";

507+ name = "kcron-21.08.2.tar.xz";

508508 };

509509 };

510510 kde-dev-scripts = {

511− version = "21.08.1";

511+ version = "21.08.2";

512512 src = fetchurl {

513− url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-scripts-21.08.1.tar.xz";

514− sha256 = "1pv0qj7xpvxqgcrjbr9989cax0aan64cbipia4kmlg7kriz5wz6c";

515− name = "kde-dev-scripts-21.08.1.tar.xz";

513+ url = "${mirror}/stable/release-service/21.08.2/src/kde-dev-scripts-21.08.2.tar.xz";

514+ sha256 = "093i4k4qqmjlffjyz7wqfv4lpsq6x9rc4svldbq5iszk8a7ldal5";

515+ name = "kde-dev-scripts-21.08.2.tar.xz";

516516 };

517517 };

518518 kde-dev-utils = {

519− version = "21.08.1";

519+ version = "21.08.2";

520520 src = fetchurl {

521− url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-utils-21.08.1.tar.xz";

522− sha256 = "02ksa35xh8vw08pqik7q8v3wax1fcvx2inicm1b2z2c4gq5k766l";

523− name = "kde-dev-utils-21.08.1.tar.xz";

521+ url = "${mirror}/stable/release-service/21.08.2/src/kde-dev-utils-21.08.2.tar.xz";

522+ sha256 = "1gidcxnixymzvdqjyzwdc9bfphvrbq7xx1miabn221gjc42bkggs";

523+ name = "kde-dev-utils-21.08.2.tar.xz";

524524 };

525525 };

526526 kdebugsettings = {

527− version = "21.08.1";

527+ version = "21.08.2";

528528 src = fetchurl {

529− url = "${mirror}/stable/release-service/21.08.1/src/kdebugsettings-21.08.1.tar.xz";

530− sha256 = "1fmnmvyzlhczbsxdpnm3bi50pdh2659raizaqbal2yjxcp6rlb90";

531− name = "kdebugsettings-21.08.1.tar.xz";

529+ url = "${mirror}/stable/release-service/21.08.2/src/kdebugsettings-21.08.2.tar.xz";

530+ sha256 = "1wpj1hldrpbi538fd69i36zr3q3dg04i5bcmy41i1brzbddxl6sv";

531+ name = "kdebugsettings-21.08.2.tar.xz";

532532 };

533533 };

534534 kdeconnect-kde = {

535− version = "21.08.1";

535+ version = "21.08.2";

536536 src = fetchurl {

537− url = "${mirror}/stable/release-service/21.08.1/src/kdeconnect-kde-21.08.1.tar.xz";

538− sha256 = "01nwzsryxg7kkxb6g4h0lwn6g5zx4k64vizqk4gsvkif8d5zfc33";

539− name = "kdeconnect-kde-21.08.1.tar.xz";

537+ url = "${mirror}/stable/release-service/21.08.2/src/kdeconnect-kde-21.08.2.tar.xz";

538+ sha256 = "09dv3l5g0wjilpga11mkxbyy3d8xk46pb2i35yvjbgi9yzp0xzfv";

539+ name = "kdeconnect-kde-21.08.2.tar.xz";

540540 };

541541 };

542542 kdeedu-data = {

543− version = "21.08.1";

543+ version = "21.08.2";

544544 src = fetchurl {

545− url = "${mirror}/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz";

546− sha256 = "19hc9mykw8q0krcxmrjq4mhn5dljfrv9pzv38dm80w3yfflj8y65";

547− name = "kdeedu-data-21.08.1.tar.xz";

545+ url = "${mirror}/stable/release-service/21.08.2/src/kdeedu-data-21.08.2.tar.xz";

546+ sha256 = "0zm7gl4nz1b6m9m8hw5zklf5nbfh6qms7qbrrdxzcn6kj50zx6m2";

547+ name = "kdeedu-data-21.08.2.tar.xz";

548548 };

549549 };

550550 kdegraphics-mobipocket = {

551− version = "21.08.1";

551+ version = "21.08.2";

552552 src = fetchurl {

553− url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-mobipocket-21.08.1.tar.xz";

554− sha256 = "06zpm5d58q10dalm2lm7v7lcjmainn3lmagra6a1f007yshm3i32";

555− name = "kdegraphics-mobipocket-21.08.1.tar.xz";

553+ url = "${mirror}/stable/release-service/21.08.2/src/kdegraphics-mobipocket-21.08.2.tar.xz";

554+ sha256 = "15wd7sfwfz3n1a0m0l2ymyhsdxjajw3kkl4piv9956amcg1bxlcp";

555+ name = "kdegraphics-mobipocket-21.08.2.tar.xz";

556556 };

557557 };

558558 kdegraphics-thumbnailers = {

559− version = "21.08.1";

559+ version = "21.08.2";

560560 src = fetchurl {

561− url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-thumbnailers-21.08.1.tar.xz";

562− sha256 = "0hqdxsnv6xgvy2knnhq733hbfgzhr6f4fi63l80saysqvpjyrxly";

563− name = "kdegraphics-thumbnailers-21.08.1.tar.xz";

561+ url = "${mirror}/stable/release-service/21.08.2/src/kdegraphics-thumbnailers-21.08.2.tar.xz";

562+ sha256 = "1261kn4fa2lrissqc9cb5s7rd94pzfzq79kjw3gagbhrjfs91872";

563+ name = "kdegraphics-thumbnailers-21.08.2.tar.xz";

564564 };

565565 };

566566 kdenetwork-filesharing = {

567− version = "21.08.1";

567+ version = "21.08.2";

568568 src = fetchurl {

569− url = "${mirror}/stable/release-service/21.08.1/src/kdenetwork-filesharing-21.08.1.tar.xz";

570− sha256 = "1q5wisy6gz94lbf3dnmxp3rq0c5b1laajph8lnlm9dhfxxmrkacf";

571− name = "kdenetwork-filesharing-21.08.1.tar.xz";

569+ url = "${mirror}/stable/release-service/21.08.2/src/kdenetwork-filesharing-21.08.2.tar.xz";

570+ sha256 = "0xyph51w7ba0jrp9dds0v97k7av2h5a3098h7wpwd0sclj2hbnwc";

571+ name = "kdenetwork-filesharing-21.08.2.tar.xz";

572572 };

573573 };

574574 kdenlive = {

575− version = "21.08.1";

575+ version = "21.08.2";

576576 src = fetchurl {

577− url = "${mirror}/stable/release-service/21.08.1/src/kdenlive-21.08.1.tar.xz";

578− sha256 = "0gjv1fm07f1qckpmlvia58myg9si9z46nwxiz1lcca5mx5k7rpcz";

579− name = "kdenlive-21.08.1.tar.xz";

577+ url = "${mirror}/stable/release-service/21.08.2/src/kdenlive-21.08.2.tar.xz";

578+ sha256 = "10x160sdj7dk27aa7iyvfmpgfidc8pisfmx6a50z0b23y54kg77m";

579+ name = "kdenlive-21.08.2.tar.xz";

580580 };

581581 };

582582 kdepim-addons = {

583− version = "21.08.1";

583+ version = "21.08.2";

584584 src = fetchurl {

585− url = "${mirror}/stable/release-service/21.08.1/src/kdepim-addons-21.08.1.tar.xz";

586− sha256 = "08vpjcqnjh99bbmwp3h64anp53zafifblqy2f7bqkvwifmlrqvz8";

587− name = "kdepim-addons-21.08.1.tar.xz";

585+ url = "${mirror}/stable/release-service/21.08.2/src/kdepim-addons-21.08.2.tar.xz";

586+ sha256 = "050kbxh89drd0yd9gzjjipmz1cvxkk5riivr5fcccqayyvskvyh2";

587+ name = "kdepim-addons-21.08.2.tar.xz";

588588 };

589589 };

590590 kdepim-runtime = {

591− version = "21.08.1";

591+ version = "21.08.2";

592592 src = fetchurl {

593− url = "${mirror}/stable/release-service/21.08.1/src/kdepim-runtime-21.08.1.tar.xz";

594− sha256 = "0ai6v5sysh5pzwpvbhjzi1fvfp608abpndh9nhnm7b87hca73vm9";

595− name = "kdepim-runtime-21.08.1.tar.xz";

593+ url = "${mirror}/stable/release-service/21.08.2/src/kdepim-runtime-21.08.2.tar.xz";

594+ sha256 = "0vzly768f2g0zhprl1970k16kza128izhrby2mm1wdskrmdrvflq";

595+ name = "kdepim-runtime-21.08.2.tar.xz";

596596 };

597597 };

598598 kdesdk-kioslaves = {

599− version = "21.08.1";

599+ version = "21.08.2";

600600 src = fetchurl {

601− url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-kioslaves-21.08.1.tar.xz";

602− sha256 = "0cz2cmcgksfkgl2nh0nnyz38q3rp1dfwhnajgcif5q0ka528v33w";

603− name = "kdesdk-kioslaves-21.08.1.tar.xz";

601+ url = "${mirror}/stable/release-service/21.08.2/src/kdesdk-kioslaves-21.08.2.tar.xz";

602+ sha256 = "1g4i7sc30m7sjmmgjf12b83yhcwpdnvb7gzdjs1da5np5nq96j4y";

603+ name = "kdesdk-kioslaves-21.08.2.tar.xz";

604604 };

605605 };

606606 kdesdk-thumbnailers = {

607− version = "21.08.1";

607+ version = "21.08.2";

608608 src = fetchurl {

609− url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-thumbnailers-21.08.1.tar.xz";

610− sha256 = "1cvh2p3vfzbqbr9cfa1bchgflmp9mi12qx1j6j1jdaqqwhz43kj6";

611− name = "kdesdk-thumbnailers-21.08.1.tar.xz";

609+ url = "${mirror}/stable/release-service/21.08.2/src/kdesdk-thumbnailers-21.08.2.tar.xz";

610+ sha256 = "1bdwdpvdqx19j714fnxfhi3b647ynm1cgrkny7i27pkqlyw72hjg";

611+ name = "kdesdk-thumbnailers-21.08.2.tar.xz";

612612 };

613613 };

614614 kdf = {

615− version = "21.08.1";

615+ version = "21.08.2";

616616 src = fetchurl {

617− url = "${mirror}/stable/release-service/21.08.1/src/kdf-21.08.1.tar.xz";

618− sha256 = "1xmn7dhbnj9bhaw545ry0qwayxh3jhpgx9xa2fjcc0dhn8yx1spv";

619− name = "kdf-21.08.1.tar.xz";

617+ url = "${mirror}/stable/release-service/21.08.2/src/kdf-21.08.2.tar.xz";

618+ sha256 = "1z2m9a4rzjsjxv9pkassn3j7pxkqrpq04hw0j6q913q69a999rwg";

619+ name = "kdf-21.08.2.tar.xz";

620620 };

621621 };

622622 kdialog = {

623− version = "21.08.1";

623+ version = "21.08.2";

624624 src = fetchurl {

625− url = "${mirror}/stable/release-service/21.08.1/src/kdialog-21.08.1.tar.xz";

626− sha256 = "1mxmj5cm5h1dhqkblcqdc7ba9x04sqj6gp0b12gii7jsz3g0pa94";

627− name = "kdialog-21.08.1.tar.xz";

625+ url = "${mirror}/stable/release-service/21.08.2/src/kdialog-21.08.2.tar.xz";

626+ sha256 = "08klapfcxwp3mf7jv7swsia4719fq6aqdv7lnxr16j8sd6h3z0yx";

627+ name = "kdialog-21.08.2.tar.xz";

628628 };

629629 };

630630 kdiamond = {

631− version = "21.08.1";

631+ version = "21.08.2";

632632 src = fetchurl {

633− url = "${mirror}/stable/release-service/21.08.1/src/kdiamond-21.08.1.tar.xz";

634− sha256 = "0l8z71k0a300yp03mkpabi3a9xydky6x19sk7xhq727canrb3nwz";

635− name = "kdiamond-21.08.1.tar.xz";

633+ url = "${mirror}/stable/release-service/21.08.2/src/kdiamond-21.08.2.tar.xz";

634+ sha256 = "1k458rs0x82jf4sjzcry4xzazwfn9drg41736749nc5d26k6csz1";

635+ name = "kdiamond-21.08.2.tar.xz";

636636 };

637637 };

638638 keditbookmarks = {

639− version = "21.08.1";

639+ version = "21.08.2";

640640 src = fetchurl {

641− url = "${mirror}/stable/release-service/21.08.1/src/keditbookmarks-21.08.1.tar.xz";

642− sha256 = "0j9m5l3llb969ras4bvsswahqqpwrv1zscjpdscchk72vxi2ky4w";

643− name = "keditbookmarks-21.08.1.tar.xz";

641+ url = "${mirror}/stable/release-service/21.08.2/src/keditbookmarks-21.08.2.tar.xz";

642+ sha256 = "07yscqr3zzjvb1snl1k0ilmpgv8wrxvjrjdcr1410llfwd80fpvi";

643+ name = "keditbookmarks-21.08.2.tar.xz";

644644 };

645645 };

646646 kfind = {

647− version = "21.08.1";

647+ version = "21.08.2";

648648 src = fetchurl {

649− url = "${mirror}/stable/release-service/21.08.1/src/kfind-21.08.1.tar.xz";

650− sha256 = "0d3milbrznwls197a5bjrdwarpdly4pyask7j97ia7nx0z91k35f";

651− name = "kfind-21.08.1.tar.xz";

649+ url = "${mirror}/stable/release-service/21.08.2/src/kfind-21.08.2.tar.xz";

650+ sha256 = "1rqn77m8i3fvknkq4gdl4fyihxkc34537010d6i992pxcx9yxv4d";

651+ name = "kfind-21.08.2.tar.xz";

652652 };

653653 };

654654 kfloppy = {

655− version = "21.08.1";

655+ version = "21.08.2";

656656 src = fetchurl {

657− url = "${mirror}/stable/release-service/21.08.1/src/kfloppy-21.08.1.tar.xz";

658− sha256 = "1nxkjaarvr7fq494hb4pk6nf9731f74zsxhfia3lzb2qf3rnxhvg";

659− name = "kfloppy-21.08.1.tar.xz";

657+ url = "${mirror}/stable/release-service/21.08.2/src/kfloppy-21.08.2.tar.xz";

658+ sha256 = "0g54qwrmqkd3jxi6nwprzd0jckzdq3iawibfsfblkchnd8hnlxiw";

659+ name = "kfloppy-21.08.2.tar.xz";

660660 };

661661 };

662662 kfourinline = {

663− version = "21.08.1";

663+ version = "21.08.2";

664664 src = fetchurl {

665− url = "${mirror}/stable/release-service/21.08.1/src/kfourinline-21.08.1.tar.xz";

666− sha256 = "0niwvc1fxvxk5xi90n753y7gjhljrnm3jjzxgjxs9ca5y1c7jcac";

667− name = "kfourinline-21.08.1.tar.xz";

665+ url = "${mirror}/stable/release-service/21.08.2/src/kfourinline-21.08.2.tar.xz";

666+ sha256 = "0z28lzx9jqp2krgwf6cpwv4hhyl8q8azgw3ni24c8hjl81sxidvb";

667+ name = "kfourinline-21.08.2.tar.xz";

668668 };

669669 };

670670 kgeography = {

671− version = "21.08.1";

671+ version = "21.08.2";

672672 src = fetchurl {

673− url = "${mirror}/stable/release-service/21.08.1/src/kgeography-21.08.1.tar.xz";

674− sha256 = "0wqblfs4h8pr0c3m9qv5xpz1sq1zxxbbgv42d0m12fhlbmhx0l64";

675− name = "kgeography-21.08.1.tar.xz";

673+ url = "${mirror}/stable/release-service/21.08.2/src/kgeography-21.08.2.tar.xz";

674+ sha256 = "16rqlh2n4xz5rcs0p9ppzsk7wh060zf1i5yfx4cjrswfn2wk5brv";

675+ name = "kgeography-21.08.2.tar.xz";

676676 };

677677 };

678678 kget = {

679− version = "21.08.1";

679+ version = "21.08.2";

680680 src = fetchurl {

681− url = "${mirror}/stable/release-service/21.08.1/src/kget-21.08.1.tar.xz";

682− sha256 = "06lng1sr1l5a7qcbld7xn97vlaxnq4f98sai2llmjkyna3awzi6r";

683− name = "kget-21.08.1.tar.xz";

681+ url = "${mirror}/stable/release-service/21.08.2/src/kget-21.08.2.tar.xz";

682+ sha256 = "11h073nkk5axr263wz5wjq8pdad2wk3nmhixx12ilkqqinb0pi6h";

683+ name = "kget-21.08.2.tar.xz";

684684 };

685685 };

686686 kgoldrunner = {

687− version = "21.08.1";

687+ version = "21.08.2";

688688 src = fetchurl {

689− url = "${mirror}/stable/release-service/21.08.1/src/kgoldrunner-21.08.1.tar.xz";

690− sha256 = "1dggs4fbfqc7q97j8fpi2v6q52165yikaps15mracn319c8mbx85";

691− name = "kgoldrunner-21.08.1.tar.xz";

689+ url = "${mirror}/stable/release-service/21.08.2/src/kgoldrunner-21.08.2.tar.xz";

690+ sha256 = "13y8a1zxfy16sbdf2c94wdx15ghmb436pzx7kvvsfv8d5yizlzdz";

691+ name = "kgoldrunner-21.08.2.tar.xz";

692692 };

693693 };

694694 kgpg = {

695− version = "21.08.1";

695+ version = "21.08.2";

696696 src = fetchurl {

697− url = "${mirror}/stable/release-service/21.08.1/src/kgpg-21.08.1.tar.xz";

698− sha256 = "0q4k7ahh1qr4fnkw4na5kyp4kq922a45hjgz9qzh7whn6zqrhsxs";

699− name = "kgpg-21.08.1.tar.xz";

697+ url = "${mirror}/stable/release-service/21.08.2/src/kgpg-21.08.2.tar.xz";

698+ sha256 = "051z9h12zqmhgvr8pk17vsfzld25mpklk1z6nknlf3hydjnq6ns1";

699+ name = "kgpg-21.08.2.tar.xz";

700700 };

701701 };

702702 khangman = {

703− version = "21.08.1";

703+ version = "21.08.2";

704704 src = fetchurl {

705− url = "${mirror}/stable/release-service/21.08.1/src/khangman-21.08.1.tar.xz";

706− sha256 = "1jv7vbk4za17l73b10xx1ckv56qhsvlf2irlys917bk39jhxmwpp";

707− name = "khangman-21.08.1.tar.xz";

705+ url = "${mirror}/stable/release-service/21.08.2/src/khangman-21.08.2.tar.xz";

706+ sha256 = "0xrwsg5pv1y5lh6d2na1gx8aiimpbl8y2i9a4qj3qg5l4nf0inal";

707+ name = "khangman-21.08.2.tar.xz";

708708 };

709709 };

710710 khelpcenter = {

711− version = "21.08.1";

711+ version = "21.08.2";

712712 src = fetchurl {

713− url = "${mirror}/stable/release-service/21.08.1/src/khelpcenter-21.08.1.tar.xz";

714− sha256 = "09ayg8kb4b4v30xjm8ca5csw1axipn1336mq2sfqra5qwkj8d93y";

715− name = "khelpcenter-21.08.1.tar.xz";

713+ url = "${mirror}/stable/release-service/21.08.2/src/khelpcenter-21.08.2.tar.xz";

714+ sha256 = "0ivm1z7c6yy6dm9sb88ggiww9c2k526lhpipkgiwm6kslzallxsn";

715+ name = "khelpcenter-21.08.2.tar.xz";

716716 };

717717 };

718718 kidentitymanagement = {

719− version = "21.08.1";

719+ version = "21.08.2";

720720 src = fetchurl {

721− url = "${mirror}/stable/release-service/21.08.1/src/kidentitymanagement-21.08.1.tar.xz";

722− sha256 = "0xhkz33w0z9jlxlqb06w5fiyj1qz2mjssrbba2kdm55q67lj1b76";

723− name = "kidentitymanagement-21.08.1.tar.xz";

721+ url = "${mirror}/stable/release-service/21.08.2/src/kidentitymanagement-21.08.2.tar.xz";

722+ sha256 = "0kaws0w21sm0mb0fd5av7gid8gvyz0zxxjrbx0kf3c52dwkrmw5c";

723+ name = "kidentitymanagement-21.08.2.tar.xz";

724724 };

725725 };

726726 kig = {

727− version = "21.08.1";

727+ version = "21.08.2";

728728 src = fetchurl {

729− url = "${mirror}/stable/release-service/21.08.1/src/kig-21.08.1.tar.xz";

730− sha256 = "0gvp07mnkpfamdq78bv2r1m84l4xp23qh2i6iscdhjdh05dzyl6s";

731− name = "kig-21.08.1.tar.xz";

729+ url = "${mirror}/stable/release-service/21.08.2/src/kig-21.08.2.tar.xz";

730+ sha256 = "1i5lszzj200mda7vbc8c6bzdlx8ycf2d8kk28pl2n17ajra33iim";

731+ name = "kig-21.08.2.tar.xz";

732732 };

733733 };

734734 kigo = {

735− version = "21.08.1";

735+ version = "21.08.2";

736736 src = fetchurl {

737− url = "${mirror}/stable/release-service/21.08.1/src/kigo-21.08.1.tar.xz";

738− sha256 = "1y7fh9acng4a135bz7skg7hgmyisaxgwli4ddv7y5h3r1rlhfd47";

739− name = "kigo-21.08.1.tar.xz";

737+ url = "${mirror}/stable/release-service/21.08.2/src/kigo-21.08.2.tar.xz";

738+ sha256 = "0ss15k2qpmrf4xvsjpqpvf9pvw8wijmk4zqqhvsjrbd5xrk53bkf";

739+ name = "kigo-21.08.2.tar.xz";

740740 };

741741 };

742742 killbots = {

743− version = "21.08.1";

743+ version = "21.08.2";

744744 src = fetchurl {

745− url = "${mirror}/stable/release-service/21.08.1/src/killbots-21.08.1.tar.xz";

746− sha256 = "02rh60ww43r3zqv3v7zs42j7nl8b5373mykbql80amxnbj5965mn";

747− name = "killbots-21.08.1.tar.xz";

745+ url = "${mirror}/stable/release-service/21.08.2/src/killbots-21.08.2.tar.xz";

746+ sha256 = "11cgkx5wpzgzx62frn90h35ga2scrvyxv7sasfsxldf3yiv15m30";

747+ name = "killbots-21.08.2.tar.xz";

748748 };

749749 };

750750 kimagemapeditor = {

751− version = "21.08.1";

751+ version = "21.08.2";

752752 src = fetchurl {

753− url = "${mirror}/stable/release-service/21.08.1/src/kimagemapeditor-21.08.1.tar.xz";

754− sha256 = "1mrf0k923gwy4cfh7g5yv0nnm4kx0j0yk9sz051sbvvbm4hbxqjg";

755− name = "kimagemapeditor-21.08.1.tar.xz";

753+ url = "${mirror}/stable/release-service/21.08.2/src/kimagemapeditor-21.08.2.tar.xz";

754+ sha256 = "0k1jl5d9qxdg9lrz19vzjbsnpnf236hmckvwy9c620sik0rzpj12";

755+ name = "kimagemapeditor-21.08.2.tar.xz";

756756 };

757757 };

758758 kimap = {

759− version = "21.08.1";

759+ version = "21.08.2";

760760 src = fetchurl {

761− url = "${mirror}/stable/release-service/21.08.1/src/kimap-21.08.1.tar.xz";

762− sha256 = "19b8awcbrn61dwqli10v883i8s18sjz8w335c2sxlhzqgdijgxhl";

763− name = "kimap-21.08.1.tar.xz";

761+ url = "${mirror}/stable/release-service/21.08.2/src/kimap-21.08.2.tar.xz";

762+ sha256 = "0qdl94zqk0qvy5mcnbhskh7dskcx8g1bkv4qv8zjjj9rz1r2rm2x";

763+ name = "kimap-21.08.2.tar.xz";

764764 };

765765 };

766766 kio-extras = {

767− version = "21.08.1";

767+ version = "21.08.2";

768768 src = fetchurl {

769− url = "${mirror}/stable/release-service/21.08.1/src/kio-extras-21.08.1.tar.xz";

770− sha256 = "0wlgd0cc56gzicgi16nx4592i6f6594d1mvz7d0266xrwmm8n688";

771− name = "kio-extras-21.08.1.tar.xz";

769+ url = "${mirror}/stable/release-service/21.08.2/src/kio-extras-21.08.2.tar.xz";

770+ sha256 = "0735c9n50qflkcl8j032m84wvb6alv8rr9yfhyzflzv56k8r4034";

771+ name = "kio-extras-21.08.2.tar.xz";

772772 };

773773 };

774774 kio-gdrive = {

775− version = "21.08.1";

775+ version = "21.08.2";

776776 src = fetchurl {

777− url = "${mirror}/stable/release-service/21.08.1/src/kio-gdrive-21.08.1.tar.xz";

778− sha256 = "1vqm8b819hg1yfjlz1x3yis9qkbclahp7l00cpqbxnra0ph9b1vw";

779− name = "kio-gdrive-21.08.1.tar.xz";

777+ url = "${mirror}/stable/release-service/21.08.2/src/kio-gdrive-21.08.2.tar.xz";

778+ sha256 = "0mbh5ccw3iyfnhqkidds9kq8bm7dwpx5zrnbqi93fach7zmpidk2";

779+ name = "kio-gdrive-21.08.2.tar.xz";

780780 };

781781 };

782782 kipi-plugins = {

783− version = "21.08.1";

783+ version = "21.08.2";

784784 src = fetchurl {

785− url = "${mirror}/stable/release-service/21.08.1/src/kipi-plugins-21.08.1.tar.xz";

786− sha256 = "1w6sw3wn0nj15jv6qp0yg7psg1m87b3izgn303z74vzkhqw04pid";

787− name = "kipi-plugins-21.08.1.tar.xz";

785+ url = "${mirror}/stable/release-service/21.08.2/src/kipi-plugins-21.08.2.tar.xz";

786+ sha256 = "0ygji1dm6bzyn6f455l1avbw12kl5vdhx1g8lwvgfc51vflv3vxp";

787+ name = "kipi-plugins-21.08.2.tar.xz";

788788 };

789789 };

790790 kirigami-gallery = {

791− version = "21.08.1";

791+ version = "21.08.2";

792792 src = fetchurl {

793− url = "${mirror}/stable/release-service/21.08.1/src/kirigami-gallery-21.08.1.tar.xz";

794− sha256 = "0db1a5czq0xg0dhhmphds5vrz2lq771zwmps7gq6ahpfj01vyavd";

795− name = "kirigami-gallery-21.08.1.tar.xz";

793+ url = "${mirror}/stable/release-service/21.08.2/src/kirigami-gallery-21.08.2.tar.xz";

794+ sha256 = "1i5aly7pwc39avarqmi8wwzv6bbza5pxaz5v8jm6b57d5mampkn8";

795+ name = "kirigami-gallery-21.08.2.tar.xz";

796796 };

797797 };

798798 kiriki = {

799− version = "21.08.1";

799+ version = "21.08.2";

800800 src = fetchurl {

801− url = "${mirror}/stable/release-service/21.08.1/src/kiriki-21.08.1.tar.xz";

802− sha256 = "0x7iq3y2jc4wykgcyrgm8gmrkvlhs8gsxdl0495n1x1invsnmj00";

803− name = "kiriki-21.08.1.tar.xz";

801+ url = "${mirror}/stable/release-service/21.08.2/src/kiriki-21.08.2.tar.xz";

802+ sha256 = "1l3sc3fi4b8hc9dyrsi66src52wygckngiwqq8hf4mj2h0hf9s55";

803+ name = "kiriki-21.08.2.tar.xz";

804804 };

805805 };

806806 kiten = {

807− version = "21.08.1";

807+ version = "21.08.2";

808808 src = fetchurl {

809− url = "${mirror}/stable/release-service/21.08.1/src/kiten-21.08.1.tar.xz";

810− sha256 = "1skyfw5bshy6z8xvhs5q9f3c8nwqbm4mc74jcs6yhzc3i4mp82n3";

811− name = "kiten-21.08.1.tar.xz";

809+ url = "${mirror}/stable/release-service/21.08.2/src/kiten-21.08.2.tar.xz";

810+ sha256 = "12jmsg26y4ldkh5qyz2bzyd14wk401p7kl48m5ngxv95qxw2ix9s";

811+ name = "kiten-21.08.2.tar.xz";

812812 };

813813 };

814814 kitinerary = {

815− version = "21.08.1";

815+ version = "21.08.2";

816816 src = fetchurl {

817− url = "${mirror}/stable/release-service/21.08.1/src/kitinerary-21.08.1.tar.xz";

818− sha256 = "0r7mrcs7gh9ffscksvkh5v78dr2y1nh26p8r8ginafachg32p0mi";

819− name = "kitinerary-21.08.1.tar.xz";

817+ url = "${mirror}/stable/release-service/21.08.2/src/kitinerary-21.08.2.tar.xz";

818+ sha256 = "1l21q95rszdm1gp1msr9mzlj8ay115dl4cxchhm1mz7w7h53scg3";

819+ name = "kitinerary-21.08.2.tar.xz";

820820 };

821821 };

822822 kjumpingcube = {

823− version = "21.08.1";

823+ version = "21.08.2";

824824 src = fetchurl {

825− url = "${mirror}/stable/release-service/21.08.1/src/kjumpingcube-21.08.1.tar.xz";

826− sha256 = "1kh3jqp3m96lal6salcrqhgzg1pbacx20xn41c1jy272ch57r2jj";

827− name = "kjumpingcube-21.08.1.tar.xz";

825+ url = "${mirror}/stable/release-service/21.08.2/src/kjumpingcube-21.08.2.tar.xz";

826+ sha256 = "1akg30mz8j6w6dzc43z56siiljblqpah80ghbashq3h2wq3q1lxz";

827+ name = "kjumpingcube-21.08.2.tar.xz";

828828 };

829829 };

830830 kldap = {

831− version = "21.08.1";

831+ version = "21.08.2";

832832 src = fetchurl {

833− url = "${mirror}/stable/release-service/21.08.1/src/kldap-21.08.1.tar.xz";

834− sha256 = "1m92kd6mrz3dxap6rzw0r85wij030a60n10hkgkjkxb8npgvl14g";

835− name = "kldap-21.08.1.tar.xz";

833+ url = "${mirror}/stable/release-service/21.08.2/src/kldap-21.08.2.tar.xz";

834+ sha256 = "1vc94n9wq1422bp9ky2sapy8wra0gi5gfl6dz0h8wxnxflb28zvw";

835+ name = "kldap-21.08.2.tar.xz";

836836 };

837837 };

838838 kleopatra = {

839− version = "21.08.1";

839+ version = "21.08.2";

840840 src = fetchurl {

841− url = "${mirror}/stable/release-service/21.08.1/src/kleopatra-21.08.1.tar.xz";

842− sha256 = "1j1jd8ivcw2r2nlzzhr24kxcvfp5q1206gpkchd5mvsl6q34fmzx";

843− name = "kleopatra-21.08.1.tar.xz";

841+ url = "${mirror}/stable/release-service/21.08.2/src/kleopatra-21.08.2.tar.xz";

842+ sha256 = "1ym40xxwl9qqz8sbsck606vzxys5qhkca8g23gqn3sxx3kk8zpn9";

843+ name = "kleopatra-21.08.2.tar.xz";

844844 };

845845 };

846846 klettres = {

847− version = "21.08.1";

847+ version = "21.08.2";

848848 src = fetchurl {

849− url = "${mirror}/stable/release-service/21.08.1/src/klettres-21.08.1.tar.xz";

850− sha256 = "0scgccwsma1hc1zp52h4rqddwizsqzwsh6gql5lf4qxhr8ihgj4m";

851− name = "klettres-21.08.1.tar.xz";

849+ url = "${mirror}/stable/release-service/21.08.2/src/klettres-21.08.2.tar.xz";

850+ sha256 = "1n3qw190nznz0h4l68iy9azky57f8pflx10dihhl541jspgga5lg";

851+ name = "klettres-21.08.2.tar.xz";

852852 };

853853 };

854854 klickety = {

855− version = "21.08.1";

855+ version = "21.08.2";

856856 src = fetchurl {

857− url = "${mirror}/stable/release-service/21.08.1/src/klickety-21.08.1.tar.xz";

858− sha256 = "0r8dr4blwv1l6b8585qw7q258qr9pgk97pmrfmpssb90yxni2c1c";

859− name = "klickety-21.08.1.tar.xz";

857+ url = "${mirror}/stable/release-service/21.08.2/src/klickety-21.08.2.tar.xz";

858+ sha256 = "1vi4xx4y7s225b3vgi2z8l1d5z4fgz3v5jfg4zq6v1pis46zpmwz";

859+ name = "klickety-21.08.2.tar.xz";

860860 };

861861 };

862862 klines = {

863− version = "21.08.1";

863+ version = "21.08.2";

864864 src = fetchurl {

865− url = "${mirror}/stable/release-service/21.08.1/src/klines-21.08.1.tar.xz";

866− sha256 = "1iyk91spsnfrkbjyf6jng6rgximcav2zf2xqkq1q2vvyhwwpchn6";

867− name = "klines-21.08.1.tar.xz";

865+ url = "${mirror}/stable/release-service/21.08.2/src/klines-21.08.2.tar.xz";

866+ sha256 = "1gxaadl8gnbaliwbnr6ychp1da5dgppk58jgv5z0zngacwy80d97";

867+ name = "klines-21.08.2.tar.xz";

868868 };

869869 };

870870 kmag = {

871− version = "21.08.1";

871+ version = "21.08.2";

872872 src = fetchurl {

873− url = "${mirror}/stable/release-service/21.08.1/src/kmag-21.08.1.tar.xz";

874− sha256 = "1hdjcya1jv6adz0d9hp1sq7y8f6fvzpw30fchmjkdm9y2kf8il6c";

875− name = "kmag-21.08.1.tar.xz";

873+ url = "${mirror}/stable/release-service/21.08.2/src/kmag-21.08.2.tar.xz";

874+ sha256 = "0y68vg95fjhfsjvvn2i214jrv06f6811j1asjxrgvwcmwdf0fnc0";

875+ name = "kmag-21.08.2.tar.xz";

876876 };

877877 };

878878 kmahjongg = {

879− version = "21.08.1";

879+ version = "21.08.2";

880880 src = fetchurl {

881− url = "${mirror}/stable/release-service/21.08.1/src/kmahjongg-21.08.1.tar.xz";

882− sha256 = "1wrzyiv07cffn5xiachqa8k9spcsi3iwvdj6prgbgdndbffw2gim";

883− name = "kmahjongg-21.08.1.tar.xz";

881+ url = "${mirror}/stable/release-service/21.08.2/src/kmahjongg-21.08.2.tar.xz";

882+ sha256 = "1fx4almqcz8x3pzbrjv9yd9kfb7akrfy45z7idhyb31dkdaxi40w";

883+ name = "kmahjongg-21.08.2.tar.xz";

884884 };

885885 };

886886 kmail = {

887− version = "21.08.1";

887+ version = "21.08.2";

888888 src = fetchurl {

889− url = "${mirror}/stable/release-service/21.08.1/src/kmail-21.08.1.tar.xz";

890− sha256 = "08q7c8l2nfrvw5xgc2dzcmidcpsjfya3jjnssziy3hpznmf8jpjr";

891− name = "kmail-21.08.1.tar.xz";

889+ url = "${mirror}/stable/release-service/21.08.2/src/kmail-21.08.2.tar.xz";

890+ sha256 = "0way147xqjhapswdfqnnvav8dk41lf2050jzmd6jz7qj0dina977";

891+ name = "kmail-21.08.2.tar.xz";

892892 };

893893 };

894894 kmail-account-wizard = {

895− version = "21.08.1";

895+ version = "21.08.2";

896896 src = fetchurl {

897− url = "${mirror}/stable/release-service/21.08.1/src/kmail-account-wizard-21.08.1.tar.xz";

898− sha256 = "1xqm4737p5l5cwqlnn7xladz4yna7aghl84hlbvzrfcc72v5xkal";

899− name = "kmail-account-wizard-21.08.1.tar.xz";

897+ url = "${mirror}/stable/release-service/21.08.2/src/kmail-account-wizard-21.08.2.tar.xz";

898+ sha256 = "0ac4p9jy3n45i0aj0fn2151pdbjmvkzyr3qlzdidzf386y7m7y9b";

899+ name = "kmail-account-wizard-21.08.2.tar.xz";

900900 };

901901 };

902902 kmailtransport = {

903− version = "21.08.1";

903+ version = "21.08.2";

904904 src = fetchurl {

905− url = "${mirror}/stable/release-service/21.08.1/src/kmailtransport-21.08.1.tar.xz";

906− sha256 = "0zd03s4848n3g1w8fm0q3kq5sy91zhjw3hc2w6ncv6cgbb9s50dv";

907− name = "kmailtransport-21.08.1.tar.xz";

905+ url = "${mirror}/stable/release-service/21.08.2/src/kmailtransport-21.08.2.tar.xz";

906+ sha256 = "0q76wanhby9gb9c07z8gpkmdqn6rv82bh6fz182m7bdzkqh4rbxx";

907+ name = "kmailtransport-21.08.2.tar.xz";

908908 };

909909 };

910910 kmbox = {

911− version = "21.08.1";

911+ version = "21.08.2";

912912 src = fetchurl {

913− url = "${mirror}/stable/release-service/21.08.1/src/kmbox-21.08.1.tar.xz";

914− sha256 = "027x76lrjssrhqpr651fyqqkdv6jmiad901cssv7w54r2dpzs6w3";

915− name = "kmbox-21.08.1.tar.xz";

913+ url = "${mirror}/stable/release-service/21.08.2/src/kmbox-21.08.2.tar.xz";

914+ sha256 = "055vx2cr9zqab887grjans5cassh2g86r1lcn64jb61sh1cvzj7y";

915+ name = "kmbox-21.08.2.tar.xz";

916916 };

917917 };

918918 kmime = {

919− version = "21.08.1";

919+ version = "21.08.2";

920920 src = fetchurl {

921− url = "${mirror}/stable/release-service/21.08.1/src/kmime-21.08.1.tar.xz";

922− sha256 = "0prsmiv0g6icclhv7mkha66pddmdqz2mi69njz0xwz6m3ax068jw";

923− name = "kmime-21.08.1.tar.xz";

921+ url = "${mirror}/stable/release-service/21.08.2/src/kmime-21.08.2.tar.xz";

922+ sha256 = "1dg0vm576gqvj7ia80zcdyf9cyg3fzvj7j3fkxx79mw17binlzg4";

923+ name = "kmime-21.08.2.tar.xz";

924924 };

925925 };

926926 kmines = {

927− version = "21.08.1";

927+ version = "21.08.2";

928928 src = fetchurl {

929− url = "${mirror}/stable/release-service/21.08.1/src/kmines-21.08.1.tar.xz";

930− sha256 = "0nx07cghq20rja8rncrayx87v357s036whdfyzc6qkhdmlmkh6qj";

931− name = "kmines-21.08.1.tar.xz";

929+ url = "${mirror}/stable/release-service/21.08.2/src/kmines-21.08.2.tar.xz";

930+ sha256 = "0vzspy446pwbd04zyq7x0s7q6nrhmdnzq3jfvv6nnazhjmxpfafv";

931+ name = "kmines-21.08.2.tar.xz";

932932 };

933933 };

934934 kmix = {

935− version = "21.08.1";

935+ version = "21.08.2";

936936 src = fetchurl {

937− url = "${mirror}/stable/release-service/21.08.1/src/kmix-21.08.1.tar.xz";

938− sha256 = "0jc0b1j32gg7az0z7m1cvfdjrwss4q91hm1cfhrk5fq12620vivf";

939− name = "kmix-21.08.1.tar.xz";

937+ url = "${mirror}/stable/release-service/21.08.2/src/kmix-21.08.2.tar.xz";

938+ sha256 = "1srv1alrq2w87rmv9jriz1y37rb0fp7w14291ky64gf23phwmfdq";

939+ name = "kmix-21.08.2.tar.xz";

940940 };

941941 };

942942 kmousetool = {

943− version = "21.08.1";

943+ version = "21.08.2";

944944 src = fetchurl {

945− url = "${mirror}/stable/release-service/21.08.1/src/kmousetool-21.08.1.tar.xz";

946− sha256 = "04a5zrxg48svrvdf8gf3qc7cj7cayzhw0q4l1v8nzs2ykc330xq1";

947− name = "kmousetool-21.08.1.tar.xz";

945+ url = "${mirror}/stable/release-service/21.08.2/src/kmousetool-21.08.2.tar.xz";

946+ sha256 = "1b09z6793zjjspcrhz4f1vxk3zbs4qdrkdp59q61i7ganm49znma";

947+ name = "kmousetool-21.08.2.tar.xz";

948948 };

949949 };

950950 kmouth = {

951− version = "21.08.1";

951+ version = "21.08.2";

952952 src = fetchurl {

953− url = "${mirror}/stable/release-service/21.08.1/src/kmouth-21.08.1.tar.xz";

954− sha256 = "1rmqppmjjcrc7xp63csdgp440f003nia6hcnixxlya8pwn90bpwr";

955− name = "kmouth-21.08.1.tar.xz";

953+ url = "${mirror}/stable/release-service/21.08.2/src/kmouth-21.08.2.tar.xz";

954+ sha256 = "1b9bc0vnqihaqa4wfa9sqcrq92q1kyw0w1ikkx3pb8rzdzkk4cv2";

955+ name = "kmouth-21.08.2.tar.xz";

956956 };

957957 };

958958 kmplot = {

959− version = "21.08.1";

959+ version = "21.08.2";

960960 src = fetchurl {

961− url = "${mirror}/stable/release-service/21.08.1/src/kmplot-21.08.1.tar.xz";

962− sha256 = "0mkcrdg0v98hdy5lgkyfv4x019w4sm7yiyfpryhx1wiqcpibxwl1";

963− name = "kmplot-21.08.1.tar.xz";

961+ url = "${mirror}/stable/release-service/21.08.2/src/kmplot-21.08.2.tar.xz";

962+ sha256 = "0p81x7qlpj1b84wzqqb7sxmbmnxfys0clg1k07d2hw4rb8gisgic";

963+ name = "kmplot-21.08.2.tar.xz";

964964 };

965965 };

966966 knavalbattle = {

967− version = "21.08.1";

967+ version = "21.08.2";

968968 src = fetchurl {

969− url = "${mirror}/stable/release-service/21.08.1/src/knavalbattle-21.08.1.tar.xz";

970− sha256 = "1lvq223jspc5y0z6qaf648m85a58yp88b0jm8510p77ymxhyvgm7";

971− name = "knavalbattle-21.08.1.tar.xz";

969+ url = "${mirror}/stable/release-service/21.08.2/src/knavalbattle-21.08.2.tar.xz";

970+ sha256 = "0zhp8zmnsjv1ainlc98waixv2p05w8jh91clb8747rc8x4k3phxk";

971+ name = "knavalbattle-21.08.2.tar.xz";

972972 };

973973 };

974974 knetwalk = {

975− version = "21.08.1";

975+ version = "21.08.2";

976976 src = fetchurl {

977− url = "${mirror}/stable/release-service/21.08.1/src/knetwalk-21.08.1.tar.xz";

978− sha256 = "1akv78yaym474b57d9qxqp3vivs405m1zm6x0plf2g1adp93myz2";

979− name = "knetwalk-21.08.1.tar.xz";

977+ url = "${mirror}/stable/release-service/21.08.2/src/knetwalk-21.08.2.tar.xz";

978+ sha256 = "1jb6w790jfngifhgp4clgakiacw0lbn40jnj00zlzcg751vl6ajl";

979+ name = "knetwalk-21.08.2.tar.xz";

980980 };

981981 };

982982 knights = {

983− version = "21.08.1";

983+ version = "21.08.2";

984984 src = fetchurl {

985− url = "${mirror}/stable/release-service/21.08.1/src/knights-21.08.1.tar.xz";

986− sha256 = "1m00nryw69k4dyb0vvnjz3fwasf67ghkq78l7k8ck9vvzrihmwd1";

987− name = "knights-21.08.1.tar.xz";

985+ url = "${mirror}/stable/release-service/21.08.2/src/knights-21.08.2.tar.xz";

986+ sha256 = "0v72niszn93671c4313f3cz2y8wq5nsww0c4irsbz9jpivcq080z";

987+ name = "knights-21.08.2.tar.xz";

988988 };

989989 };

990990 knotes = {

991− version = "21.08.1";

991+ version = "21.08.2";

992992 src = fetchurl {

993− url = "${mirror}/stable/release-service/21.08.1/src/knotes-21.08.1.tar.xz";

994− sha256 = "1av537f02zsz72mqkzlcrv977kf96nrdwsj4fx7kmdbhf5x9rvgv";

995− name = "knotes-21.08.1.tar.xz";

993+ url = "${mirror}/stable/release-service/21.08.2/src/knotes-21.08.2.tar.xz";

994+ sha256 = "1g3rmkpwbicga09qwhxn47rhiv9rfaacpzapsrhddh63831bl999";

995+ name = "knotes-21.08.2.tar.xz";

996996 };

997997 };

998998 kolf = {

999− version = "21.08.1";

999+ version = "21.08.2";

10001000 src = fetchurl {

1001− url = "${mirror}/stable/release-service/21.08.1/src/kolf-21.08.1.tar.xz";

1002− sha256 = "15wk2c2pzpg39hv6s1b80mf5l7gkbxlprahjq6wh6f6a5hm3wkxb";

1003− name = "kolf-21.08.1.tar.xz";

1001+ url = "${mirror}/stable/release-service/21.08.2/src/kolf-21.08.2.tar.xz";

1002+ sha256 = "1dziji28syv7rirm959ahcch6696sc4y6pnfp40v11j1pw58jm8p";

1003+ name = "kolf-21.08.2.tar.xz";

10041004 };

10051005 };

10061006 kollision = {

1007− version = "21.08.1";

1007+ version = "21.08.2";

10081008 src = fetchurl {

1009− url = "${mirror}/stable/release-service/21.08.1/src/kollision-21.08.1.tar.xz";

1010− sha256 = "15ddxccj29094lxrihchc17x2a2xnjk790dqhfja9d235vkg3lpb";

1011− name = "kollision-21.08.1.tar.xz";

1009+ url = "${mirror}/stable/release-service/21.08.2/src/kollision-21.08.2.tar.xz";

1010+ sha256 = "04hb91gqy58lvhwy0hx27xcd1pvqm378lcavswh7b142f63mhmjf";

1011+ name = "kollision-21.08.2.tar.xz";

10121012 };

10131013 };

10141014 kolourpaint = {

1015− version = "21.08.1";

1015+ version = "21.08.2";

10161016 src = fetchurl {

1017− url = "${mirror}/stable/release-service/21.08.1/src/kolourpaint-21.08.1.tar.xz";

1018− sha256 = "0vjssni7c8dx1617gsnkp8dip92agys8n1ydzdly6jpwhvlr382a";

1019− name = "kolourpaint-21.08.1.tar.xz";

1017+ url = "${mirror}/stable/release-service/21.08.2/src/kolourpaint-21.08.2.tar.xz";

1018+ sha256 = "0p64dp63m8ycy5qrgd6fdgf670y5iqdyw4gjbkwphg01qp8kpj6d";

1019+ name = "kolourpaint-21.08.2.tar.xz";

10201020 };

10211021 };

10221022 kompare = {

1023− version = "21.08.1";

1023+ version = "21.08.2";

10241024 src = fetchurl {

1025− url = "${mirror}/stable/release-service/21.08.1/src/kompare-21.08.1.tar.xz";

1026− sha256 = "0sigh2c91ff7r6yclx18lcwqbwh4gbj55n5fjpd1fw9rb7xf9j3n";

1027− name = "kompare-21.08.1.tar.xz";

1025+ url = "${mirror}/stable/release-service/21.08.2/src/kompare-21.08.2.tar.xz";

1026+ sha256 = "14bbqxdzj67g2m6zmz28ax6v4bzz9nmyy45flqzm8jqvq9afqb1d";

1027+ name = "kompare-21.08.2.tar.xz";

10281028 };

10291029 };

10301030 konqueror = {

1031− version = "21.08.1";

1031+ version = "21.08.2";

10321032 src = fetchurl {

1033− url = "${mirror}/stable/release-service/21.08.1/src/konqueror-21.08.1.tar.xz";

1034− sha256 = "155dc8nd3kgr25wpjisnp9z2jr1f31vcnm8ywa98p4i59kaaxh7h";

1035− name = "konqueror-21.08.1.tar.xz";

1033+ url = "${mirror}/stable/release-service/21.08.2/src/konqueror-21.08.2.tar.xz";

1034+ sha256 = "0v5l1nqa0fm4q17l0rncriwyvkgq0pdg2q4kjc92kvvdvrpm3jjp";

1035+ name = "konqueror-21.08.2.tar.xz";

10361036 };

10371037 };

10381038 konquest = {

1039− version = "21.08.1";

1039+ version = "21.08.2";

10401040 src = fetchurl {

1041− url = "${mirror}/stable/release-service/21.08.1/src/konquest-21.08.1.tar.xz";

1042− sha256 = "0i0pm5zq2ipm1ipsam19c771v16bxlhilidny336rzwfa1vik0zl";

1043− name = "konquest-21.08.1.tar.xz";

1041+ url = "${mirror}/stable/release-service/21.08.2/src/konquest-21.08.2.tar.xz";

1042+ sha256 = "0shky9cys79prdgr6bcmi50gvfmqr0famdq6gqacv9krbja4pl20";

1043+ name = "konquest-21.08.2.tar.xz";

10441044 };

10451045 };

10461046 konsole = {

1047− version = "21.08.1";

1047+ version = "21.08.2";

10481048 src = fetchurl {

1049− url = "${mirror}/stable/release-service/21.08.1/src/konsole-21.08.1.tar.xz";

1050− sha256 = "0v74yrblwakbmy0p4x5j9lhmqyavgsffahr51bh5r5qcgx0cafjv";

1051− name = "konsole-21.08.1.tar.xz";

1049+ url = "${mirror}/stable/release-service/21.08.2/src/konsole-21.08.2.tar.xz";

1050+ sha256 = "1lhpgags85y0s5p44dpa2k0b9vq46m7h19pha59w1wy72an884ig";

1051+ name = "konsole-21.08.2.tar.xz";

10521052 };

10531053 };

10541054 kontact = {

1055− version = "21.08.1";

1055+ version = "21.08.2";

10561056 src = fetchurl {

1057− url = "${mirror}/stable/release-service/21.08.1/src/kontact-21.08.1.tar.xz";

1058− sha256 = "1aqyrkmc7hnzja1spm75ybrb9c3yg37rklcgdr7myyyhjxmvnrzg";

1059− name = "kontact-21.08.1.tar.xz";

1057+ url = "${mirror}/stable/release-service/21.08.2/src/kontact-21.08.2.tar.xz";

1058+ sha256 = "1a7d7xfby796kk9hbqqnnhjnn5yvk99hglm4270azlcgbjxf4s2j";

1059+ name = "kontact-21.08.2.tar.xz";

10601060 };

10611061 };

10621062 kontactinterface = {

1063− version = "21.08.1";

1063+ version = "21.08.2";

10641064 src = fetchurl {

1065− url = "${mirror}/stable/release-service/21.08.1/src/kontactinterface-21.08.1.tar.xz";

1066− sha256 = "1l251rw80c329sgrv25r8cn242v0kl7pvcfv9xkakql7dw707xs9";

1067− name = "kontactinterface-21.08.1.tar.xz";

1065+ url = "${mirror}/stable/release-service/21.08.2/src/kontactinterface-21.08.2.tar.xz";

1066+ sha256 = "0wavclk0z55z8xmqiq6wjhlf2byiggmj9fr5kwdk8wsjfj30npwg";

1067+ name = "kontactinterface-21.08.2.tar.xz";

10681068 };

10691069 };

10701070 kontrast = {

1071− version = "21.08.1";

1071+ version = "21.08.2";

10721072 src = fetchurl {

1073− url = "${mirror}/stable/release-service/21.08.1/src/kontrast-21.08.1.tar.xz";

1074− sha256 = "05nw7z05maxpcr37andv60fn9s8kprz474bkza980ah05xzvkkvb";

1075− name = "kontrast-21.08.1.tar.xz";

1073+ url = "${mirror}/stable/release-service/21.08.2/src/kontrast-21.08.2.tar.xz";

1074+ sha256 = "12pmkkgrj848whwfz523ciix2a4dm3wgw1vva30svyvlv6qyrgwa";

1075+ name = "kontrast-21.08.2.tar.xz";

10761076 };

10771077 };

10781078 konversation = {

1079− version = "21.08.1";

1079+ version = "21.08.2";

10801080 src = fetchurl {

1081− url = "${mirror}/stable/release-service/21.08.1/src/konversation-21.08.1.tar.xz";

1082− sha256 = "0v3nvyjc13jav8x9krg9sd9p533j7ndan0fqb5p0virwk1dznvfy";

1083− name = "konversation-21.08.1.tar.xz";

1081+ url = "${mirror}/stable/release-service/21.08.2/src/konversation-21.08.2.tar.xz";

1082+ sha256 = "1blaxxpp0831frw2v4ylvq23ffyqabbq1zcqj0v4kq736acdl8pa";

1083+ name = "konversation-21.08.2.tar.xz";

10841084 };

10851085 };

10861086 kopeninghours = {

1087− version = "21.08.1";

1087+ version = "21.08.2";

10881088 src = fetchurl {

1089− url = "${mirror}/stable/release-service/21.08.1/src/kopeninghours-21.08.1.tar.xz";

1090− sha256 = "09yskjfkr190vkp8xgj2hicfyg1mx9mqm7pgn4133qfn08xh52vd";

1091− name = "kopeninghours-21.08.1.tar.xz";

1089+ url = "${mirror}/stable/release-service/21.08.2/src/kopeninghours-21.08.2.tar.xz";

1090+ sha256 = "1g4g3hc0zpklnw8an49dk25zfw740w4slkm52191q2ajymp589l0";

1091+ name = "kopeninghours-21.08.2.tar.xz";

10921092 };

10931093 };

10941094 kopete = {

1095− version = "21.08.1";

1095+ version = "21.08.2";

10961096 src = fetchurl {

1097− url = "${mirror}/stable/release-service/21.08.1/src/kopete-21.08.1.tar.xz";

1098− sha256 = "131nic6w1bzc0l94b8jkzac2dckaz64y2fgplyiqjidicm0cyrd1";

1099− name = "kopete-21.08.1.tar.xz";

1097+ url = "${mirror}/stable/release-service/21.08.2/src/kopete-21.08.2.tar.xz";

1098+ sha256 = "015pjfc5kxhm5nmjv8fx4jlczp0l3vhqrkxgfvq83a200nlvg2pm";

1099+ name = "kopete-21.08.2.tar.xz";

11001100 };

11011101 };

11021102 korganizer = {

1103− version = "21.08.1";

1103+ version = "21.08.2";

11041104 src = fetchurl {

1105− url = "${mirror}/stable/release-service/21.08.1/src/korganizer-21.08.1.tar.xz";

1106− sha256 = "0x05i3c0nj46bnnd7msz1rpghbr2p6sywfsa15d6l1j72i2ay0vr";

1107− name = "korganizer-21.08.1.tar.xz";

1105+ url = "${mirror}/stable/release-service/21.08.2/src/korganizer-21.08.2.tar.xz";

1106+ sha256 = "0izrzg5xxqgz0wq0vkv1i1xcf0xnzgfwixy8f4gcvihpqxyvixb7";

1107+ name = "korganizer-21.08.2.tar.xz";

11081108 };

11091109 };

11101110 kosmindoormap = {

1111− version = "21.08.1";

1111+ version = "21.08.2";

11121112 src = fetchurl {

1113− url = "${mirror}/stable/release-service/21.08.1/src/kosmindoormap-21.08.1.tar.xz";

1114− sha256 = "1v31cik859b994xka37z0l86nd0crykbsnafyxpmqdzf942ixixb";

1115− name = "kosmindoormap-21.08.1.tar.xz";

1113+ url = "${mirror}/stable/release-service/21.08.2/src/kosmindoormap-21.08.2.tar.xz";

1114+ sha256 = "0yf4n48x041wl07f575hzqdkn1qmx3idpxswinsk9r8zdr2dwch7";

1115+ name = "kosmindoormap-21.08.2.tar.xz";

11161116 };

11171117 };

11181118 kpat = {

1119− version = "21.08.1";

1119+ version = "21.08.2";

11201120 src = fetchurl {

1121− url = "${mirror}/stable/release-service/21.08.1/src/kpat-21.08.1.tar.xz";

1122− sha256 = "1dxihma5mad2kbg7wzfbnaq3gmgwav70rqrj5fpji42pvlqx4vyn";

1123− name = "kpat-21.08.1.tar.xz";

1121+ url = "${mirror}/stable/release-service/21.08.2/src/kpat-21.08.2.tar.xz";

1122+ sha256 = "16cj3w4cibar1q12wam3i623kzddhl39ychvi3nphlni5cmr4x42";

1123+ name = "kpat-21.08.2.tar.xz";

11241124 };

11251125 };

11261126 kpimtextedit = {

1127− version = "21.08.1";

1127+ version = "21.08.2";

11281128 src = fetchurl {

1129− url = "${mirror}/stable/release-service/21.08.1/src/kpimtextedit-21.08.1.tar.xz";

1130− sha256 = "1zaavf0gpaibk22fz8ij0fqrlp18lj07hgdg6ynhdmhamw59sfr5";

1131− name = "kpimtextedit-21.08.1.tar.xz";

1129+ url = "${mirror}/stable/release-service/21.08.2/src/kpimtextedit-21.08.2.tar.xz";

1130+ sha256 = "0v479g998amh822lxr0l2d9xhlrwbij9prlrn1z9y9al056cic7h";

1131+ name = "kpimtextedit-21.08.2.tar.xz";

11321132 };

11331133 };

11341134 kpkpass = {

1135− version = "21.08.1";

1135+ version = "21.08.2";

11361136 src = fetchurl {

1137− url = "${mirror}/stable/release-service/21.08.1/src/kpkpass-21.08.1.tar.xz";

1138− sha256 = "0z8dk548awy37iq8zz41x2wm2i9bhpfa2g0ghlwvhj7sy97ap1vk";

1139− name = "kpkpass-21.08.1.tar.xz";

1137+ url = "${mirror}/stable/release-service/21.08.2/src/kpkpass-21.08.2.tar.xz";

1138+ sha256 = "003rmp8svnz74qfd3727l7p5wj56j9x8w3dwk19ysyklh2rbaj2p";

1139+ name = "kpkpass-21.08.2.tar.xz";

11401140 };

11411141 };

11421142 kpmcore = {

1143− version = "21.08.1";

1143+ version = "21.08.2";

11441144 src = fetchurl {

1145− url = "${mirror}/stable/release-service/21.08.1/src/kpmcore-21.08.1.tar.xz";

1146− sha256 = "1aw21x70kgm1dmhqr384k6rbsd1fx70zd94i0slq5zyf37zx6b9l";

1147− name = "kpmcore-21.08.1.tar.xz";

1145+ url = "${mirror}/stable/release-service/21.08.2/src/kpmcore-21.08.2.tar.xz";

1146+ sha256 = "0rn8x0add1qflsbgppmhz1zbnjvy39d5wckxga0vmhdix2m3d60g";

1147+ name = "kpmcore-21.08.2.tar.xz";

11481148 };

11491149 };

11501150 kpublictransport = {

1151− version = "21.08.1";

1151+ version = "21.08.2";

11521152 src = fetchurl {

1153− url = "${mirror}/stable/release-service/21.08.1/src/kpublictransport-21.08.1.tar.xz";

1154− sha256 = "1dbbsdrzhqaiz6d4hlyy1f50m6hi0arafxrxr65gh9h4zs2ym4qs";

1155− name = "kpublictransport-21.08.1.tar.xz";

1153+ url = "${mirror}/stable/release-service/21.08.2/src/kpublictransport-21.08.2.tar.xz";

1154+ sha256 = "1g4k1wxhvjya0k79ysr92kq37fbdfly5qdrmp11apvar4la4xmr8";

1155+ name = "kpublictransport-21.08.2.tar.xz";

11561156 };

11571157 };

11581158 kqtquickcharts = {

1159− version = "21.08.1";

1159+ version = "21.08.2";

11601160 src = fetchurl {

1161− url = "${mirror}/stable/release-service/21.08.1/src/kqtquickcharts-21.08.1.tar.xz";

1162− sha256 = "0ghmxzy3jqzy3zdpp5zhjv3mcq6micnnk1jhnlq03v4z981rrs6h";

1163− name = "kqtquickcharts-21.08.1.tar.xz";

1161+ url = "${mirror}/stable/release-service/21.08.2/src/kqtquickcharts-21.08.2.tar.xz";

1162+ sha256 = "04cxw88lv7mj74znzfl3m9jzks11z837y3bch40qdn8ysk9wqjhn";

1163+ name = "kqtquickcharts-21.08.2.tar.xz";

11641164 };

11651165 };

11661166 krdc = {

1167− version = "21.08.1";

1167+ version = "21.08.2";

11681168 src = fetchurl {

1169− url = "${mirror}/stable/release-service/21.08.1/src/krdc-21.08.1.tar.xz";

1170− sha256 = "038m7wgpg33sqqqq7iy4rvficsi7x2012rimxb1gn2azg5kcwk6v";

1171− name = "krdc-21.08.1.tar.xz";

1169+ url = "${mirror}/stable/release-service/21.08.2/src/krdc-21.08.2.tar.xz";

1170+ sha256 = "0zrpfbs4r0d4wnficmhn0av7877hbrl4jvxpi0qiy2gdc7zksnbd";

1171+ name = "krdc-21.08.2.tar.xz";

11721172 };

11731173 };

11741174 kreversi = {

1175− version = "21.08.1";

1175+ version = "21.08.2";

11761176 src = fetchurl {

1177− url = "${mirror}/stable/release-service/21.08.1/src/kreversi-21.08.1.tar.xz";

1178− sha256 = "1gh7zhqzyh2m34v3gyb902c6cvw33rbib5g8p3dwsmm5v2bfgggj";

1179− name = "kreversi-21.08.1.tar.xz";

1177+ url = "${mirror}/stable/release-service/21.08.2/src/kreversi-21.08.2.tar.xz";

1178+ sha256 = "18z2aclpd0xln1n442jg13n5j2yip6dldfvd5z56g7n23l9paywq";

1179+ name = "kreversi-21.08.2.tar.xz";

11801180 };

11811181 };

11821182 krfb = {

1183− version = "21.08.1";

1183+ version = "21.08.2";

11841184 src = fetchurl {

1185− url = "${mirror}/stable/release-service/21.08.1/src/krfb-21.08.1.tar.xz";

1186− sha256 = "0l28l9wmfxf6vihxr86pwxj027fkz0k0pwkif8had0s4swc9jfnx";

1187− name = "krfb-21.08.1.tar.xz";

1185+ url = "${mirror}/stable/release-service/21.08.2/src/krfb-21.08.2.tar.xz";

1186+ sha256 = "1hn21d0cp2k6zair2wwf492y0ip69f1b5axaaz9fqgmgqn0l47qb";

1187+ name = "krfb-21.08.2.tar.xz";

11881188 };

11891189 };

11901190 kross-interpreters = {

1191− version = "21.08.1";

1191+ version = "21.08.2";

11921192 src = fetchurl {

1193− url = "${mirror}/stable/release-service/21.08.1/src/kross-interpreters-21.08.1.tar.xz";

1194− sha256 = "1fznrng6mz9s8ynzr48p05n6akkmzn3fifbgpxs98nhzlz2ay574";

1195− name = "kross-interpreters-21.08.1.tar.xz";

1193+ url = "${mirror}/stable/release-service/21.08.2/src/kross-interpreters-21.08.2.tar.xz";

1194+ sha256 = "07f153ib1gmbfnkchzymvwlng3sgn28zspxkrx75g8xa5jszwwym";

1195+ name = "kross-interpreters-21.08.2.tar.xz";

11961196 };

11971197 };

11981198 kruler = {

1199− version = "21.08.1";

1199+ version = "21.08.2";

12001200 src = fetchurl {

1201− url = "${mirror}/stable/release-service/21.08.1/src/kruler-21.08.1.tar.xz";

1202− sha256 = "0l78hk7zjwjxba094gjvajh32v4avdc80h5r0rv94k2r3gckfjv4";

1203− name = "kruler-21.08.1.tar.xz";

1201+ url = "${mirror}/stable/release-service/21.08.2/src/kruler-21.08.2.tar.xz";

1202+ sha256 = "082z14vcp1ww42jrlxl128gp6y5iqrz360cipvj4xph4q7lpgb0r";

1203+ name = "kruler-21.08.2.tar.xz";

12041204 };

12051205 };

12061206 kshisen = {

1207− version = "21.08.1";

1207+ version = "21.08.2";

12081208 src = fetchurl {

1209− url = "${mirror}/stable/release-service/21.08.1/src/kshisen-21.08.1.tar.xz";

1210− sha256 = "107y828nkdzza5hi68pxxk5gp017dy2yxdmmhmg6ylppk5gfp6dp";

1211− name = "kshisen-21.08.1.tar.xz";

1209+ url = "${mirror}/stable/release-service/21.08.2/src/kshisen-21.08.2.tar.xz";

1210+ sha256 = "12mi59n8sm7wqf53wbi2nlh4d2i673x93rlqz6qxkaqznlpf7lrr";

1211+ name = "kshisen-21.08.2.tar.xz";

12121212 };

12131213 };

12141214 ksirk = {

1215− version = "21.08.1";

1215+ version = "21.08.2";

12161216 src = fetchurl {

1217− url = "${mirror}/stable/release-service/21.08.1/src/ksirk-21.08.1.tar.xz";

1218− sha256 = "0l6bfpima9whgfdkbghhfh36p6kjs8j26gz5zc7r8fcswv66ya21";

1219− name = "ksirk-21.08.1.tar.xz";

1217+ url = "${mirror}/stable/release-service/21.08.2/src/ksirk-21.08.2.tar.xz";

1218+ sha256 = "1j6nzyl3ppi68d1y84yals0y90km5mxzz4x44frn3k3bb1n1imzc";

1219+ name = "ksirk-21.08.2.tar.xz";

12201220 };

12211221 };

12221222 ksmtp = {

1223− version = "21.08.1";

1223+ version = "21.08.2";

12241224 src = fetchurl {

1225− url = "${mirror}/stable/release-service/21.08.1/src/ksmtp-21.08.1.tar.xz";

1226− sha256 = "0pl167gjhpmdvhsjm6hcygxwjs8v1z4xfc7x0c69bac8rdrzrlb6";

1227− name = "ksmtp-21.08.1.tar.xz";

1225+ url = "${mirror}/stable/release-service/21.08.2/src/ksmtp-21.08.2.tar.xz";

1226+ sha256 = "08bdi23qwvayl9w1nsfgpxpxmxrw820qcmvw03ivdk1h7m6sl3yh";

1227+ name = "ksmtp-21.08.2.tar.xz";

12281228 };

12291229 };

12301230 ksnakeduel = {

1231− version = "21.08.1";

1231+ version = "21.08.2";

12321232 src = fetchurl {

1233− url = "${mirror}/stable/release-service/21.08.1/src/ksnakeduel-21.08.1.tar.xz";

1234− sha256 = "1jk4mdxg2b1aa1686rimhjqh91ijaf8n7fahvswwbl473zfjf748";

1235− name = "ksnakeduel-21.08.1.tar.xz";

1233+ url = "${mirror}/stable/release-service/21.08.2/src/ksnakeduel-21.08.2.tar.xz";

1234+ sha256 = "0n7digcymwrcg24y2libp0x67s1rj2qmps4yzp2bxpgasx9pf6ik";

1235+ name = "ksnakeduel-21.08.2.tar.xz";

12361236 };

12371237 };

12381238 kspaceduel = {

1239− version = "21.08.1";

1239+ version = "21.08.2";

12401240 src = fetchurl {

1241− url = "${mirror}/stable/release-service/21.08.1/src/kspaceduel-21.08.1.tar.xz";

1242− sha256 = "0q2mpidkhgjz3nm88j3m8wdb06y3m8ixr0540q0s9i9d997jdkch";

1243− name = "kspaceduel-21.08.1.tar.xz";

1241+ url = "${mirror}/stable/release-service/21.08.2/src/kspaceduel-21.08.2.tar.xz";

1242+ sha256 = "1gjb23dw8fh61b7s23b2bfkgcfxqvndrv1x7lkk2bpi4i4g6sqz3";

1243+ name = "kspaceduel-21.08.2.tar.xz";

12441244 };

12451245 };

12461246 ksquares = {

1247− version = "21.08.1";

1247+ version = "21.08.2";

12481248 src = fetchurl {

1249− url = "${mirror}/stable/release-service/21.08.1/src/ksquares-21.08.1.tar.xz";

1250− sha256 = "0z7h5vig5zablvdlv7lanmsjjbqq931pqjyynm75mygrrbavgcfq";

1251− name = "ksquares-21.08.1.tar.xz";

1249+ url = "${mirror}/stable/release-service/21.08.2/src/ksquares-21.08.2.tar.xz";

1250+ sha256 = "10sl49mjjlpqyh6f930iz1nncy2dqzm1b8hksn8zxz5kwi2gvfrc";

1251+ name = "ksquares-21.08.2.tar.xz";

12521252 };

12531253 };

12541254 ksudoku = {

1255− version = "21.08.1";

1255+ version = "21.08.2";

12561256 src = fetchurl {

1257− url = "${mirror}/stable/release-service/21.08.1/src/ksudoku-21.08.1.tar.xz";

1258− sha256 = "0aax14xwg42wr8g563nbpn7m55gs4k50kwk0zn79pf62i78g10lp";

1259− name = "ksudoku-21.08.1.tar.xz";

1257+ url = "${mirror}/stable/release-service/21.08.2/src/ksudoku-21.08.2.tar.xz";

1258+ sha256 = "15svd1paf1hx5aqmdrh6bcdag7k8iq18fpjflk3vkkip6s76lrv6";

1259+ name = "ksudoku-21.08.2.tar.xz";

12601260 };

12611261 };

12621262 ksystemlog = {

1263− version = "21.08.1";

1263+ version = "21.08.2";

12641264 src = fetchurl {

1265− url = "${mirror}/stable/release-service/21.08.1/src/ksystemlog-21.08.1.tar.xz";

1266− sha256 = "1vv0wbb3npbq8r0mq8y5lc36qx1hxdjxygfcnw2h9hm4dwl8mc5v";

1267− name = "ksystemlog-21.08.1.tar.xz";

1265+ url = "${mirror}/stable/release-service/21.08.2/src/ksystemlog-21.08.2.tar.xz";

1266+ sha256 = "1qnnhbi75glgvcvpmpy5zrq6x6hygl7r7v4h99lfm48jdfpyxilj";

1267+ name = "ksystemlog-21.08.2.tar.xz";

12681268 };

12691269 };

12701270 kteatime = {

1271− version = "21.08.1";

1271+ version = "21.08.2";

12721272 src = fetchurl {

1273− url = "${mirror}/stable/release-service/21.08.1/src/kteatime-21.08.1.tar.xz";

1274− sha256 = "0gjnvcvrnb3049ln64chnjgr7xm722ighjscxxhqz61i872dgb72";

1275− name = "kteatime-21.08.1.tar.xz";

1273+ url = "${mirror}/stable/release-service/21.08.2/src/kteatime-21.08.2.tar.xz";

1274+ sha256 = "02vkh3dyacba9x0zl8j8g8isj50h8wz7mjnfqgxc67azcwwx41sp";

1275+ name = "kteatime-21.08.2.tar.xz";

12761276 };

12771277 };

12781278 ktimer = {

1279− version = "21.08.1";

1279+ version = "21.08.2";

12801280 src = fetchurl {

1281− url = "${mirror}/stable/release-service/21.08.1/src/ktimer-21.08.1.tar.xz";

1282− sha256 = "1l79yrg6g78gf8av1h6yr4mxyd1n63g4r38qp4csvpnjpx7y8ijd";

1283− name = "ktimer-21.08.1.tar.xz";

1281+ url = "${mirror}/stable/release-service/21.08.2/src/ktimer-21.08.2.tar.xz";

1282+ sha256 = "0rfmrh7i8c23r6wdyh4w55980vlj2p127mbpiw5brj4dazdjll5x";

1283+ name = "ktimer-21.08.2.tar.xz";

12841284 };

12851285 };

12861286 ktnef = {

1287− version = "21.08.1";

1287+ version = "21.08.2";

12881288 src = fetchurl {

1289− url = "${mirror}/stable/release-service/21.08.1/src/ktnef-21.08.1.tar.xz";

1290− sha256 = "08wk4ssasqqixwnp59smv64c8m4jf89vpcwc3zvz4h92sfk0pk33";

1291− name = "ktnef-21.08.1.tar.xz";

1289+ url = "${mirror}/stable/release-service/21.08.2/src/ktnef-21.08.2.tar.xz";

1290+ sha256 = "05l4g38f2m3qjl6q45j12zarpazsizjl2pyqh87vhaxgnf4fbqqp";

1291+ name = "ktnef-21.08.2.tar.xz";

12921292 };

12931293 };

12941294 ktorrent = {

1295− version = "21.08.1";

1295+ version = "21.08.2";

12961296 src = fetchurl {

1297− url = "${mirror}/stable/release-service/21.08.1/src/ktorrent-21.08.1.tar.xz";

1298− sha256 = "1r7w43ns4zy94y82dbghrjgqv1sbdj01rni0iijirzjjikr5av9m";

1299− name = "ktorrent-21.08.1.tar.xz";

1297+ url = "${mirror}/stable/release-service/21.08.2/src/ktorrent-21.08.2.tar.xz";

1298+ sha256 = "1nd72jcvsc0kabd23ddy93dxp59ihg5npa8r3vbzvic89xlpkivi";

1299+ name = "ktorrent-21.08.2.tar.xz";

13001300 };

13011301 };

13021302 ktouch = {

1303− version = "21.08.1";

1303+ version = "21.08.2";

13041304 src = fetchurl {

1305− url = "${mirror}/stable/release-service/21.08.1/src/ktouch-21.08.1.tar.xz";

1306− sha256 = "00pyrp00dqbanb2w0cxmxh8aahih714q85prjij6iy5sv0917zr7";

1307− name = "ktouch-21.08.1.tar.xz";

1305+ url = "${mirror}/stable/release-service/21.08.2/src/ktouch-21.08.2.tar.xz";

1306+ sha256 = "16r3hj160y1517dk1nzvikwkjlfbzmjpx54k9jc98csaplbv683l";

1307+ name = "ktouch-21.08.2.tar.xz";

13081308 };

13091309 };

13101310 ktp-accounts-kcm = {

1311− version = "21.08.1";

1311+ version = "21.08.2";

13121312 src = fetchurl {

1313− url = "${mirror}/stable/release-service/21.08.1/src/ktp-accounts-kcm-21.08.1.tar.xz";

1314− sha256 = "0pn8g5w4p2synwfskw9m805nj2wk9g7yff423243qc3fxl572sv8";

1315− name = "ktp-accounts-kcm-21.08.1.tar.xz";

1313+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-accounts-kcm-21.08.2.tar.xz";

1314+ sha256 = "0fxlkbx8kzlbfyfj7ac6m0y6vc80n3nlm5skrq106vbm1nnh565p";

1315+ name = "ktp-accounts-kcm-21.08.2.tar.xz";

13161316 };

13171317 };

13181318 ktp-approver = {

1319− version = "21.08.1";

1319+ version = "21.08.2";

13201320 src = fetchurl {

1321− url = "${mirror}/stable/release-service/21.08.1/src/ktp-approver-21.08.1.tar.xz";

1322− sha256 = "1q2rsg9520ra7ap3ipvv0sdyc2mzbzap2ygzkwbm80fpspl6b973";

1323− name = "ktp-approver-21.08.1.tar.xz";

1321+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-approver-21.08.2.tar.xz";

1322+ sha256 = "1pbc2f477xysv707j1xbcw799pxas31j5cmf26wrkbjmzxh5nhnd";

1323+ name = "ktp-approver-21.08.2.tar.xz";

13241324 };

13251325 };

13261326 ktp-auth-handler = {

1327− version = "21.08.1";

1327+ version = "21.08.2";

13281328 src = fetchurl {

1329− url = "${mirror}/stable/release-service/21.08.1/src/ktp-auth-handler-21.08.1.tar.xz";

1330− sha256 = "0yzh2sqsyic3d979mj3m8d9m42y37w3h2s7gsyifw08gf5sna48p";

1331− name = "ktp-auth-handler-21.08.1.tar.xz";

1329+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-auth-handler-21.08.2.tar.xz";

1330+ sha256 = "1fwzm15s8q8h47kfqw4jz2vfv81fc4azxg7c9r4vvlh23grlzbx8";

1331+ name = "ktp-auth-handler-21.08.2.tar.xz";

13321332 };

13331333 };

13341334 ktp-call-ui = {

1335− version = "21.08.1";

1335+ version = "21.08.2";

13361336 src = fetchurl {

1337− url = "${mirror}/stable/release-service/21.08.1/src/ktp-call-ui-21.08.1.tar.xz";

1338− sha256 = "0m8x3mfhy5rnv9wp15zrl5fiwdkm66pc8szkncqnjxw2nv721s3m";

1339− name = "ktp-call-ui-21.08.1.tar.xz";

1337+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-call-ui-21.08.2.tar.xz";

1338+ sha256 = "0d4iaqpl67w3q7rrk2h9glq91ha03hvnrywi6271nc4892r4b2ys";

1339+ name = "ktp-call-ui-21.08.2.tar.xz";

13401340 };

13411341 };

13421342 ktp-common-internals = {

1343− version = "21.08.1";

1343+ version = "21.08.2";

13441344 src = fetchurl {

1345− url = "${mirror}/stable/release-service/21.08.1/src/ktp-common-internals-21.08.1.tar.xz";

1346− sha256 = "12jcfr3cvyhzn62jnlnfmp39wyxa06bih4qz8gxzv56nl434qzv0";

1347− name = "ktp-common-internals-21.08.1.tar.xz";

1345+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-common-internals-21.08.2.tar.xz";

1346+ sha256 = "1jc8dv4563y4xlx13sz07lmkfnxraidqpxq08plapkliq56hv2xd";

1347+ name = "ktp-common-internals-21.08.2.tar.xz";

13481348 };

13491349 };

13501350 ktp-contact-list = {

1351− version = "21.08.1";

1351+ version = "21.08.2";

13521352 src = fetchurl {

1353− url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-list-21.08.1.tar.xz";

1354− sha256 = "1d4d0bvi9c813c3gyws3gc8zca1az2f3ych2r1cgpdhhbqjrf3wl";

1355− name = "ktp-contact-list-21.08.1.tar.xz";

1353+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-contact-list-21.08.2.tar.xz";

1354+ sha256 = "1glh9np0q82x9z7pb3xzvq1mwmfggzq8lc5in1lhhjzhpnla2n21";

1355+ name = "ktp-contact-list-21.08.2.tar.xz";

13561356 };

13571357 };

13581358 ktp-contact-runner = {

1359− version = "21.08.1";

1359+ version = "21.08.2";

13601360 src = fetchurl {

1361− url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-runner-21.08.1.tar.xz";

1362− sha256 = "0l2qimrpfnpmhvspgv62y8a7hsbw4abz92n1xry040qmkfqzv2l7";

1363− name = "ktp-contact-runner-21.08.1.tar.xz";

1361+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-contact-runner-21.08.2.tar.xz";

1362+ sha256 = "15xvw84c4ygz1zz3qkjmxfjrkczwrdwdmls5a4bc4d4i78df8v4m";

1363+ name = "ktp-contact-runner-21.08.2.tar.xz";

13641364 };

13651365 };

13661366 ktp-desktop-applets = {

1367− version = "21.08.1";

1367+ version = "21.08.2";

13681368 src = fetchurl {

1369− url = "${mirror}/stable/release-service/21.08.1/src/ktp-desktop-applets-21.08.1.tar.xz";

1370− sha256 = "03si91agdjascs6ri0g5zrhicjzx24p6kh2ni1d96k5sc7alwxnl";

1371− name = "ktp-desktop-applets-21.08.1.tar.xz";

1369+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-desktop-applets-21.08.2.tar.xz";

1370+ sha256 = "09bli0hhibwhia5zsprf1mv2li344lcqjq6pkirzz8h2dr1nr2s5";

1371+ name = "ktp-desktop-applets-21.08.2.tar.xz";

13721372 };

13731373 };

13741374 ktp-filetransfer-handler = {

1375− version = "21.08.1";

1375+ version = "21.08.2";

13761376 src = fetchurl {

1377− url = "${mirror}/stable/release-service/21.08.1/src/ktp-filetransfer-handler-21.08.1.tar.xz";

1378− sha256 = "08dklgklc31fvcdi3917lh77gr58y75f1di0xhjf6jq8vxplqjd8";

1379− name = "ktp-filetransfer-handler-21.08.1.tar.xz";

1377+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-filetransfer-handler-21.08.2.tar.xz";

1378+ sha256 = "0g0w1ayj3m6lkmy71xqvfg829rk9y5z98h6rnim3ag9yx44namzw";

1379+ name = "ktp-filetransfer-handler-21.08.2.tar.xz";

13801380 };

13811381 };

13821382 ktp-kded-module = {

1383− version = "21.08.1";

1383+ version = "21.08.2";

13841384 src = fetchurl {

1385− url = "${mirror}/stable/release-service/21.08.1/src/ktp-kded-module-21.08.1.tar.xz";

1386− sha256 = "1135hh82ivvbpks9k39baisrq053570yq2x851j4vb2qrxg000yg";

1387− name = "ktp-kded-module-21.08.1.tar.xz";

1385+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-kded-module-21.08.2.tar.xz";

1386+ sha256 = "1rx79zqqk2gl2qi28q429ss63kyndfzs24mdrn4491hsbln0sv1x";

1387+ name = "ktp-kded-module-21.08.2.tar.xz";

13881388 };

13891389 };

13901390 ktp-send-file = {

1391− version = "21.08.1";

1391+ version = "21.08.2";

13921392 src = fetchurl {

1393− url = "${mirror}/stable/release-service/21.08.1/src/ktp-send-file-21.08.1.tar.xz";

1394− sha256 = "1fnn5m9spa0x8nw1rx94x85hy06qwkb1fl5l498rmhyzikhxmhqp";

1395− name = "ktp-send-file-21.08.1.tar.xz";

1393+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-send-file-21.08.2.tar.xz";

1394+ sha256 = "1791zhp5rpwizx3y48hgamk7pgbx2yk650nczxbnza828m1lxzab";

1395+ name = "ktp-send-file-21.08.2.tar.xz";

13961396 };

13971397 };

13981398 ktp-text-ui = {

1399− version = "21.08.1";

1399+ version = "21.08.2";

14001400 src = fetchurl {

1401− url = "${mirror}/stable/release-service/21.08.1/src/ktp-text-ui-21.08.1.tar.xz";

1402− sha256 = "0cfnf688jz5953x7jxjrdlfs96rxjcfzvasrc881y1aprav1dmjq";

1403− name = "ktp-text-ui-21.08.1.tar.xz";

1401+ url = "${mirror}/stable/release-service/21.08.2/src/ktp-text-ui-21.08.2.tar.xz";

1402+ sha256 = "1pinn61dkb2jcyzms3kf70sxjbkd3pkn6cxvxs8zsj1m1bdkydym";

1403+ name = "ktp-text-ui-21.08.2.tar.xz";

14041404 };

14051405 };

14061406 ktuberling = {

1407− version = "21.08.1";

1407+ version = "21.08.2";

14081408 src = fetchurl {

1409− url = "${mirror}/stable/release-service/21.08.1/src/ktuberling-21.08.1.tar.xz";

1410− sha256 = "1f3a74nfh4fhxibcfxgjdj6phy185iz6y9nfg3pag3jvqsn8nx49";

1411− name = "ktuberling-21.08.1.tar.xz";

1409+ url = "${mirror}/stable/release-service/21.08.2/src/ktuberling-21.08.2.tar.xz";

1410+ sha256 = "0h7vhvh03w11dr17zxdmb5j2vz8flwahvz70h9kw8a63sxpw0x6f";

1411+ name = "ktuberling-21.08.2.tar.xz";

14121412 };

14131413 };

14141414 kturtle = {

1415− version = "21.08.1";

1415+ version = "21.08.2";

14161416 src = fetchurl {

1417− url = "${mirror}/stable/release-service/21.08.1/src/kturtle-21.08.1.tar.xz";

1418− sha256 = "15ng6k6xfaj37dvycm29pj2pk73yfr66pp0wgj719c0kq7c9avdp";

1419− name = "kturtle-21.08.1.tar.xz";

1417+ url = "${mirror}/stable/release-service/21.08.2/src/kturtle-21.08.2.tar.xz";

1418+ sha256 = "1f3iw3fk4l8q2jnnadaqjbj6jzmw86ibf0p515x4rrqz4l8m6plg";

1419+ name = "kturtle-21.08.2.tar.xz";

14201420 };

14211421 };

14221422 kubrick = {

1423− version = "21.08.1";

1423+ version = "21.08.2";

14241424 src = fetchurl {

1425− url = "${mirror}/stable/release-service/21.08.1/src/kubrick-21.08.1.tar.xz";

1426− sha256 = "03i0b24mmq3jqf7812a9sjr8lr82mq9mrq75z2a9h62jinvxvigj";

1427− name = "kubrick-21.08.1.tar.xz";

1425+ url = "${mirror}/stable/release-service/21.08.2/src/kubrick-21.08.2.tar.xz";

1426+ sha256 = "0kvd8dsg9hdgid70jd5b1vngqpmi9rigkvxl2v4h2ps1ziqqxa78";

1427+ name = "kubrick-21.08.2.tar.xz";

14281428 };

14291429 };

14301430 kwalletmanager = {

1431− version = "21.08.1";

1431+ version = "21.08.2";

14321432 src = fetchurl {

1433− url = "${mirror}/stable/release-service/21.08.1/src/kwalletmanager-21.08.1.tar.xz";

1434− sha256 = "1a4aiajq04rlm566jwqwjq2b6sfamnabfrjfa80pld3qcmq0l1mz";

1435− name = "kwalletmanager-21.08.1.tar.xz";

1433+ url = "${mirror}/stable/release-service/21.08.2/src/kwalletmanager-21.08.2.tar.xz";

1434+ sha256 = "134690b4bhkjczwxg8776163aggwrqmb84xkvb7612wgs5jygyib";

1435+ name = "kwalletmanager-21.08.2.tar.xz";

14361436 };

14371437 };

14381438 kwave = {

1439− version = "21.08.1";

1439+ version = "21.08.2";

14401440 src = fetchurl {

1441− url = "${mirror}/stable/release-service/21.08.1/src/kwave-21.08.1.tar.xz";

1442− sha256 = "1dl7kn67hp9y39xlnq989kg743295a23kbpjpvbjashgdqy3hqwl";

1443− name = "kwave-21.08.1.tar.xz";

1441+ url = "${mirror}/stable/release-service/21.08.2/src/kwave-21.08.2.tar.xz";

1442+ sha256 = "0sivhgcypwpdi6g0mkdzf1k2hqkj1vj4b5cdcvn8chs2gk9pisgh";

1443+ name = "kwave-21.08.2.tar.xz";

14441444 };

14451445 };

14461446 kwordquiz = {

1447− version = "21.08.1";

1447+ version = "21.08.2";

14481448 src = fetchurl {

1449− url = "${mirror}/stable/release-service/21.08.1/src/kwordquiz-21.08.1.tar.xz";

1450− sha256 = "1mzdmgls07bb6k2x6qb1xzp04jpfifdrka2k6kzwy9bq071gs7q5";

1451− name = "kwordquiz-21.08.1.tar.xz";

1449+ url = "${mirror}/stable/release-service/21.08.2/src/kwordquiz-21.08.2.tar.xz";

1450+ sha256 = "1prj7iz71z8zy2ynjad7yqkgswg96q4hmc76kg1lvahn2waikr0y";

1451+ name = "kwordquiz-21.08.2.tar.xz";

14521452 };

14531453 };

14541454 libgravatar = {

1455− version = "21.08.1";

1455+ version = "21.08.2";

14561456 src = fetchurl {

1457− url = "${mirror}/stable/release-service/21.08.1/src/libgravatar-21.08.1.tar.xz";

1458− sha256 = "08xl8nb0bn6zf9sh7sn4v7aa86ffqb16hixci4ymixyxy5c4gwbv";

1459− name = "libgravatar-21.08.1.tar.xz";

1457+ url = "${mirror}/stable/release-service/21.08.2/src/libgravatar-21.08.2.tar.xz";

1458+ sha256 = "047fbdj02rnb7bn2vn9lava2mh4ypzlyd8iiri4mbpd686lmi0s1";

1459+ name = "libgravatar-21.08.2.tar.xz";

14601460 };

14611461 };

14621462 libkcddb = {

1463− version = "21.08.1";

1463+ version = "21.08.2";

14641464 src = fetchurl {

1465− url = "${mirror}/stable/release-service/21.08.1/src/libkcddb-21.08.1.tar.xz";

1466− sha256 = "08841rssxcg9vi490qih8jxnalnbjd2wqsgcq22gkm1ahfj5dizq";

1467− name = "libkcddb-21.08.1.tar.xz";

1465+ url = "${mirror}/stable/release-service/21.08.2/src/libkcddb-21.08.2.tar.xz";

1466+ sha256 = "03az77p3p0c0shzi2y2n5721gppzgrq469afvpjppria1n3ks5d2";

1467+ name = "libkcddb-21.08.2.tar.xz";

14681468 };

14691469 };

14701470 libkcompactdisc = {

1471− version = "21.08.1";

1471+ version = "21.08.2";

14721472 src = fetchurl {

1473− url = "${mirror}/stable/release-service/21.08.1/src/libkcompactdisc-21.08.1.tar.xz";

1474− sha256 = "1q838md6kqvjmc61sy943lqgv5isll2px1s0izyvvxkf747hcpin";

1475− name = "libkcompactdisc-21.08.1.tar.xz";

1473+ url = "${mirror}/stable/release-service/21.08.2/src/libkcompactdisc-21.08.2.tar.xz";

1474+ sha256 = "0sjr8gdbqsjlggxax0l2bxn42l9znplrjiln15izj2zwfkah7d69";

1475+ name = "libkcompactdisc-21.08.2.tar.xz";

14761476 };

14771477 };

14781478 libkdcraw = {

1479− version = "21.08.1";

1479+ version = "21.08.2";

14801480 src = fetchurl {

1481− url = "${mirror}/stable/release-service/21.08.1/src/libkdcraw-21.08.1.tar.xz";

1482− sha256 = "17ijpgljhrm851mdnd1znjpa7hidmv1d5d05q68r6lp1aclcgmwm";

1483− name = "libkdcraw-21.08.1.tar.xz";

1481+ url = "${mirror}/stable/release-service/21.08.2/src/libkdcraw-21.08.2.tar.xz";

1482+ sha256 = "0yhcrzl7piginz19vmyg63154j9rrqxfvfchn9k8g9jiddwnjfd8";

1483+ name = "libkdcraw-21.08.2.tar.xz";

14841484 };

14851485 };

14861486 libkdegames = {

1487− version = "21.08.1";

1487+ version = "21.08.2";

14881488 src = fetchurl {

1489− url = "${mirror}/stable/release-service/21.08.1/src/libkdegames-21.08.1.tar.xz";

1490− sha256 = "0vfx3ksy6z5h4hjx0dl3fr3phfz3q590h86ksbp5q20lyylmdpji";

1491− name = "libkdegames-21.08.1.tar.xz";

1489+ url = "${mirror}/stable/release-service/21.08.2/src/libkdegames-21.08.2.tar.xz";

1490+ sha256 = "0jbb4h515c9h08r7dqaslqgrpmb6f08ai46phwgipd67jzgh6wh7";

1491+ name = "libkdegames-21.08.2.tar.xz";

14921492 };

14931493 };

14941494 libkdepim = {

1495− version = "21.08.1";

1495+ version = "21.08.2";

14961496 src = fetchurl {

1497− url = "${mirror}/stable/release-service/21.08.1/src/libkdepim-21.08.1.tar.xz";

1498− sha256 = "10zb97zf1jidh9q6dkn8cjs9f4gqz2xn6yqylsbq0bjlycv991fh";

1499− name = "libkdepim-21.08.1.tar.xz";

1497+ url = "${mirror}/stable/release-service/21.08.2/src/libkdepim-21.08.2.tar.xz";

1498+ sha256 = "1j8nkfgzixpchz34p338mcm87f112ddy1linhaczg5fal1brangh";

1499+ name = "libkdepim-21.08.2.tar.xz";

15001500 };

15011501 };

15021502 libkeduvocdocument = {

1503− version = "21.08.1";

1503+ version = "21.08.2";

15041504 src = fetchurl {

1505− url = "${mirror}/stable/release-service/21.08.1/src/libkeduvocdocument-21.08.1.tar.xz";

1506− sha256 = "0wnyx7h284g6wssnfdfz4m0hcb0rc6fnlryav8vnjcyzz7p5ni6l";

1507− name = "libkeduvocdocument-21.08.1.tar.xz";

1505+ url = "${mirror}/stable/release-service/21.08.2/src/libkeduvocdocument-21.08.2.tar.xz";

1506+ sha256 = "051mzwbrlpvjnqphf01nzzc76zbz9hasd57sn6y6x8cviflf7kmy";

1507+ name = "libkeduvocdocument-21.08.2.tar.xz";

15081508 };

15091509 };

15101510 libkexiv2 = {

1511− version = "21.08.1";

1511+ version = "21.08.2";

15121512 src = fetchurl {

1513− url = "${mirror}/stable/release-service/21.08.1/src/libkexiv2-21.08.1.tar.xz";

1514− sha256 = "0wnpkzivb5f5z3d1dn5952cx07q8nw421xrs21r57cmbsss344xa";

1515− name = "libkexiv2-21.08.1.tar.xz";

1513+ url = "${mirror}/stable/release-service/21.08.2/src/libkexiv2-21.08.2.tar.xz";

1514+ sha256 = "0spa6pbr6rpnznvm2z0c410k5wssw4rw15rdc3f5ds9mbzbyxpva";

1515+ name = "libkexiv2-21.08.2.tar.xz";

15161516 };

15171517 };

15181518 libkgapi = {

1519− version = "21.08.1";

1519+ version = "21.08.2";

15201520 src = fetchurl {

1521− url = "${mirror}/stable/release-service/21.08.1/src/libkgapi-21.08.1.tar.xz";

1522− sha256 = "14wzl40j5baw20628dqcpkg8vi6jsq5f9gw0sc1my8qhw91mj3vy";

1523− name = "libkgapi-21.08.1.tar.xz";

1521+ url = "${mirror}/stable/release-service/21.08.2/src/libkgapi-21.08.2.tar.xz";

1522+ sha256 = "13dna8iv3qzkc1jagjgji928g88wrgds47lcfj3dqkn8swamisa0";

1523+ name = "libkgapi-21.08.2.tar.xz";

15241524 };

15251525 };

15261526 libkipi = {

1527− version = "21.08.1";

1527+ version = "21.08.2";

15281528 src = fetchurl {

1529− url = "${mirror}/stable/release-service/21.08.1/src/libkipi-21.08.1.tar.xz";

1530− sha256 = "13579gqxyj8dwmrmxylnw6mf56vr73vlbbv07rpi661kfrbjk2ms";

1531− name = "libkipi-21.08.1.tar.xz";

1529+ url = "${mirror}/stable/release-service/21.08.2/src/libkipi-21.08.2.tar.xz";

1530+ sha256 = "134iaagdn49y79aihi6k5pgx0cyk52wq38cdiinpcsxqc4xmzswh";

1531+ name = "libkipi-21.08.2.tar.xz";

15321532 };

15331533 };

15341534 libkleo = {

1535− version = "21.08.1";

1535+ version = "21.08.2";

15361536 src = fetchurl {

1537− url = "${mirror}/stable/release-service/21.08.1/src/libkleo-21.08.1.tar.xz";

1538− sha256 = "1n1nacr1q0nw2jq8px6b3cmda6ff9mygggfrl3xh6qz042bg77xz";

1539− name = "libkleo-21.08.1.tar.xz";

1537+ url = "${mirror}/stable/release-service/21.08.2/src/libkleo-21.08.2.tar.xz";

1538+ sha256 = "14p3x2jq9sa5gkhcd7q3g5ras2sl62shrjm9kx4426mbnj10n0q2";

1539+ name = "libkleo-21.08.2.tar.xz";

15401540 };

15411541 };

15421542 libkmahjongg = {

1543− version = "21.08.1";

1543+ version = "21.08.2";

15441544 src = fetchurl {

1545− url = "${mirror}/stable/release-service/21.08.1/src/libkmahjongg-21.08.1.tar.xz";

1546− sha256 = "0ry6wz0i9dccjn5w2qy2nin0rhbg30vlbcr4zrlx8bxsw0la2k94";

1547− name = "libkmahjongg-21.08.1.tar.xz";

1545+ url = "${mirror}/stable/release-service/21.08.2/src/libkmahjongg-21.08.2.tar.xz";

1546+ sha256 = "195c7bgn4jp2whqrg7l8g147kj92bvdcvcrh7n186kac9q0jqr3b";

1547+ name = "libkmahjongg-21.08.2.tar.xz";

15481548 };

15491549 };

15501550 libkomparediff2 = {

1551− version = "21.08.1";

1551+ version = "21.08.2";

15521552 src = fetchurl {

1553− url = "${mirror}/stable/release-service/21.08.1/src/libkomparediff2-21.08.1.tar.xz";

1554− sha256 = "0n6xxam33k8j6c9wqdf0lhfpk6nyf9brhvdkivdamp0idhi3rcpx";

1555− name = "libkomparediff2-21.08.1.tar.xz";

1553+ url = "${mirror}/stable/release-service/21.08.2/src/libkomparediff2-21.08.2.tar.xz";

1554+ sha256 = "08y9p3il0i5sayq42v9p1v9f6yynp7ljb5d4ls1hf5ww4xxvx10x";

1555+ name = "libkomparediff2-21.08.2.tar.xz";

15561556 };

15571557 };

15581558 libksane = {

1559− version = "21.08.1";

1559+ version = "21.08.2";

15601560 src = fetchurl {

1561− url = "${mirror}/stable/release-service/21.08.1/src/libksane-21.08.1.tar.xz";

1562− sha256 = "1x4wsdfczqnasr6ps8677m0ix1fqqd2316f6k2k3awn9qfgsqy3x";

1563− name = "libksane-21.08.1.tar.xz";

1561+ url = "${mirror}/stable/release-service/21.08.2/src/libksane-21.08.2.tar.xz";

1562+ sha256 = "094k5f0qwcm74jn5jlzs0mr74myp4s217ah2pl1kny1fm5hv5pyj";

1563+ name = "libksane-21.08.2.tar.xz";

15641564 };

15651565 };

15661566 libksieve = {

1567− version = "21.08.1";

1567+ version = "21.08.2";

15681568 src = fetchurl {

1569− url = "${mirror}/stable/release-service/21.08.1/src/libksieve-21.08.1.tar.xz";

1570− sha256 = "1569xcjz575f8007z91zs9xn5wjklzkiy6l0cl7yzpzn880wc03p";

1571− name = "libksieve-21.08.1.tar.xz";

1569+ url = "${mirror}/stable/release-service/21.08.2/src/libksieve-21.08.2.tar.xz";

1570+ sha256 = "1jxb0a18mf8yqxbi90jbgjh90x17qr6z7ga6zxdb8gk1hjsyb10y";

1571+ name = "libksieve-21.08.2.tar.xz";

15721572 };

15731573 };

15741574 libktorrent = {

1575− version = "21.08.1";

1575+ version = "21.08.2";

15761576 src = fetchurl {

1577− url = "${mirror}/stable/release-service/21.08.1/src/libktorrent-21.08.1.tar.xz";

1578− sha256 = "0y5881v0g49rr8dspzaq4l1c62rchgfq4mjx64sn0ng2jjpnhv1x";

1579− name = "libktorrent-21.08.1.tar.xz";

1577+ url = "${mirror}/stable/release-service/21.08.2/src/libktorrent-21.08.2.tar.xz";

1578+ sha256 = "16rx0na7gy03c0qbwy07q7si35z62p0pq7fcvf3ggr594akwz4kl";

1579+ name = "libktorrent-21.08.2.tar.xz";

15801580 };

15811581 };

15821582 lokalize = {

1583− version = "21.08.1";

1583+ version = "21.08.2";

15841584 src = fetchurl {

1585− url = "${mirror}/stable/release-service/21.08.1/src/lokalize-21.08.1.tar.xz";

1586− sha256 = "0ih7a1rkwn9jpgk3qld8anavr0g4wlf8figwikhvbc2dw79lxs7k";

1587− name = "lokalize-21.08.1.tar.xz";

1585+ url = "${mirror}/stable/release-service/21.08.2/src/lokalize-21.08.2.tar.xz";

1586+ sha256 = "01f48fsrv095vlgxfjfdlm70xwsw73x5zhqbm38szn6r404jcmjm";

1587+ name = "lokalize-21.08.2.tar.xz";

15881588 };

15891589 };

15901590 lskat = {

1591− version = "21.08.1";

1591+ version = "21.08.2";

15921592 src = fetchurl {

1593− url = "${mirror}/stable/release-service/21.08.1/src/lskat-21.08.1.tar.xz";

1594− sha256 = "1d89yqfsc703pnvxljcsn33wpsv64s4nr2wlmlbl609m9x8b9g9b";

1595− name = "lskat-21.08.1.tar.xz";

1593+ url = "${mirror}/stable/release-service/21.08.2/src/lskat-21.08.2.tar.xz";

1594+ sha256 = "03www1ix31ifmn6hvzymvhg157rdhahjfwvc9arns23zxpn1sq9p";

1595+ name = "lskat-21.08.2.tar.xz";

15961596 };

15971597 };

15981598 mailcommon = {

1599− version = "21.08.1";

1599+ version = "21.08.2";

16001600 src = fetchurl {

1601− url = "${mirror}/stable/release-service/21.08.1/src/mailcommon-21.08.1.tar.xz";

1602− sha256 = "1r0qyqasah4z8vx836fhvv1f4zm20az9qrw8122l3a986lazh1zw";

1603− name = "mailcommon-21.08.1.tar.xz";

1601+ url = "${mirror}/stable/release-service/21.08.2/src/mailcommon-21.08.2.tar.xz";

1602+ sha256 = "0d0czxrf3i796pyrlifv4psq3hl4z2abhsqj1ns30xng45pzyrvz";

1603+ name = "mailcommon-21.08.2.tar.xz";

16041604 };

16051605 };

16061606 mailimporter = {

1607− version = "21.08.1";

1607+ version = "21.08.2";

16081608 src = fetchurl {

1609− url = "${mirror}/stable/release-service/21.08.1/src/mailimporter-21.08.1.tar.xz";

1610− sha256 = "05kiizbdnsl15ry2zb5sg94lcdwq9w4lnznd6zcq8n09s0zpz8nf";

1611− name = "mailimporter-21.08.1.tar.xz";

1609+ url = "${mirror}/stable/release-service/21.08.2/src/mailimporter-21.08.2.tar.xz";

1610+ sha256 = "0vd0bghszwr1wh4x2ygd7flg0kypb8m92gvh0q800gdgnqj87lw7";

1611+ name = "mailimporter-21.08.2.tar.xz";

16121612 };

16131613 };

16141614 marble = {

1615− version = "21.08.1";

1615+ version = "21.08.2";

16161616 src = fetchurl {

1617− url = "${mirror}/stable/release-service/21.08.1/src/marble-21.08.1.tar.xz";

1618− sha256 = "01hf3wwz9zflkpgx1pbkxbnl1vs2yyafrwmldnil66nkxsxx7izw";

1619− name = "marble-21.08.1.tar.xz";

1617+ url = "${mirror}/stable/release-service/21.08.2/src/marble-21.08.2.tar.xz";

1618+ sha256 = "1l8dwj0kyq8r3cap2sjsr4blbz591l6cxhglkhxwds901igacmxa";

1619+ name = "marble-21.08.2.tar.xz";

16201620 };

16211621 };

16221622 markdownpart = {

1623− version = "21.08.1";

1623+ version = "21.08.2";

16241624 src = fetchurl {

1625− url = "${mirror}/stable/release-service/21.08.1/src/markdownpart-21.08.1.tar.xz";

1626− sha256 = "0xgs2kxnbrn70mrzza2d4f7xpx9ks3dbl3yj1y1kds7bnidsf3f9";

1627− name = "markdownpart-21.08.1.tar.xz";

1625+ url = "${mirror}/stable/release-service/21.08.2/src/markdownpart-21.08.2.tar.xz";

1626+ sha256 = "0vx2d31d9c9ipwkbnlrjhzkaj97a7vz6vigbbkvw4cyaqhq6zkqp";

1627+ name = "markdownpart-21.08.2.tar.xz";

16281628 };

16291629 };

16301630 mbox-importer = {

1631− version = "21.08.1";

1631+ version = "21.08.2";

16321632 src = fetchurl {

1633− url = "${mirror}/stable/release-service/21.08.1/src/mbox-importer-21.08.1.tar.xz";

1634− sha256 = "06mgz10ma8r0vi7ln9zxz2kipdp9rd0zw0sgm69h43rq9zyjnjkk";

1635− name = "mbox-importer-21.08.1.tar.xz";

1633+ url = "${mirror}/stable/release-service/21.08.2/src/mbox-importer-21.08.2.tar.xz";

1634+ sha256 = "1bf4awkrivx209rnwflxrqdxzvj8mzlgzis79hn9n654qy6ar2d5";

1635+ name = "mbox-importer-21.08.2.tar.xz";

16361636 };

16371637 };

16381638 messagelib = {

1639− version = "21.08.1";

1639+ version = "21.08.2";

16401640 src = fetchurl {

1641− url = "${mirror}/stable/release-service/21.08.1/src/messagelib-21.08.1.tar.xz";

1642− sha256 = "1r3lqacixy5vy36jgy6glz08gp8k4559h1bdqyh7svmmflhs927i";

1643− name = "messagelib-21.08.1.tar.xz";

1641+ url = "${mirror}/stable/release-service/21.08.2/src/messagelib-21.08.2.tar.xz";

1642+ sha256 = "0gsxik4ib72xhw948h257m17w4k49sa3ymbg87n0q8nd6gykxyhr";

1643+ name = "messagelib-21.08.2.tar.xz";

16441644 };

16451645 };

16461646 minuet = {

1647− version = "21.08.1";

1647+ version = "21.08.2";

16481648 src = fetchurl {

1649− url = "${mirror}/stable/release-service/21.08.1/src/minuet-21.08.1.tar.xz";

1650− sha256 = "0law0ram3xdf5ayc7j8as1xwj83k37mf7w6qkkp3hy3kj2r2dahx";

1651− name = "minuet-21.08.1.tar.xz";

1649+ url = "${mirror}/stable/release-service/21.08.2/src/minuet-21.08.2.tar.xz";

1650+ sha256 = "13i37xw2aarmqi25m1r68z9zjwqf9nx8bxlflb0wxghzf3pgrp4v";

1651+ name = "minuet-21.08.2.tar.xz";

16521652 };

16531653 };

16541654 okular = {

1655− version = "21.08.1";

1655+ version = "21.08.2";

16561656 src = fetchurl {

1657− url = "${mirror}/stable/release-service/21.08.1/src/okular-21.08.1.tar.xz";

1658− sha256 = "1vk1mn40i80b5vkxq47i1qf2i734n5nfa1wgx3748jwc1fws631p";

1659− name = "okular-21.08.1.tar.xz";

1657+ url = "${mirror}/stable/release-service/21.08.2/src/okular-21.08.2.tar.xz";

1658+ sha256 = "0y3n340fbhsgmmrq4vz2p9682xzs7hsvvna8ffh4r15wgl1qdb9q";

1659+ name = "okular-21.08.2.tar.xz";

16601660 };

16611661 };

16621662 palapeli = {

1663− version = "21.08.1";

1663+ version = "21.08.2";

16641664 src = fetchurl {

1665− url = "${mirror}/stable/release-service/21.08.1/src/palapeli-21.08.1.tar.xz";

1666− sha256 = "09mswv446s6vqlllhz727qpd7mdszdkgivfn9sazgmydmmmzrw53";

1667− name = "palapeli-21.08.1.tar.xz";

1665+ url = "${mirror}/stable/release-service/21.08.2/src/palapeli-21.08.2.tar.xz";

1666+ sha256 = "0pl6hi0c5fa6zs3gdicm1s7rmzzdjjvrm8s8ds6f4ghq6dmlknqj";

1667+ name = "palapeli-21.08.2.tar.xz";

16681668 };

16691669 };

16701670 parley = {

1671− version = "21.08.1";

1671+ version = "21.08.2";

16721672 src = fetchurl {

1673− url = "${mirror}/stable/release-service/21.08.1/src/parley-21.08.1.tar.xz";

1674− sha256 = "02v9gfjdryf48m5iinsc9qg2qfmj1s96xga5b3ndd63g66b6gp9b";

1675− name = "parley-21.08.1.tar.xz";

1673+ url = "${mirror}/stable/release-service/21.08.2/src/parley-21.08.2.tar.xz";

1674+ sha256 = "0lykvjaxfj6blgjkmipvlw9531npz46d6jwq6w5wxvk6f1b2cgbh";

1675+ name = "parley-21.08.2.tar.xz";

16761676 };

16771677 };

16781678 partitionmanager = {

1679− version = "21.08.1";

1679+ version = "21.08.2";

16801680 src = fetchurl {

1681− url = "${mirror}/stable/release-service/21.08.1/src/partitionmanager-21.08.1.tar.xz";

1682− sha256 = "16vc0g08rs6dz87zv4b1ygs198c6mbjwcp2j4994z6cf16bxfgz8";

1683− name = "partitionmanager-21.08.1.tar.xz";

1681+ url = "${mirror}/stable/release-service/21.08.2/src/partitionmanager-21.08.2.tar.xz";

1682+ sha256 = "1fa90mnby2kf5a85wjz7xvb999gh5c2yn0j3g562zndqznqhcpvx";

1683+ name = "partitionmanager-21.08.2.tar.xz";

16841684 };

16851685 };

16861686 picmi = {

1687− version = "21.08.1";

1687+ version = "21.08.2";

16881688 src = fetchurl {

1689− url = "${mirror}/stable/release-service/21.08.1/src/picmi-21.08.1.tar.xz";

1690− sha256 = "1yshwfl8baw0cw8hnvzkb3y72r0bycyr19rwwns9sjc3fk9gnk6a";

1691− name = "picmi-21.08.1.tar.xz";

1689+ url = "${mirror}/stable/release-service/21.08.2/src/picmi-21.08.2.tar.xz";

1690+ sha256 = "0qvz4fl4jb256rwmaw0bszr3x2b5jd8priilc3jr33v393f3pd6q";

1691+ name = "picmi-21.08.2.tar.xz";

16921692 };

16931693 };

16941694 pim-data-exporter = {

1695− version = "21.08.1";

1695+ version = "21.08.2";

16961696 src = fetchurl {

1697− url = "${mirror}/stable/release-service/21.08.1/src/pim-data-exporter-21.08.1.tar.xz";

1698− sha256 = "1vx7h7900wq8icx7q4khkx9g5gm6j5c8dl38q08pwda4vl0pmxmd";

1699− name = "pim-data-exporter-21.08.1.tar.xz";

1697+ url = "${mirror}/stable/release-service/21.08.2/src/pim-data-exporter-21.08.2.tar.xz";

1698+ sha256 = "0li96fkwkdg4ziyv4n56vn49wav4kilf7lqb4s9xwj8h44kjpa5f";

1699+ name = "pim-data-exporter-21.08.2.tar.xz";

17001700 };

17011701 };

17021702 pim-sieve-editor = {

1703− version = "21.08.1";

1703+ version = "21.08.2";

17041704 src = fetchurl {

1705− url = "${mirror}/stable/release-service/21.08.1/src/pim-sieve-editor-21.08.1.tar.xz";

1706− sha256 = "0ph62khl2k2gpfjf05p9sklihib0hbxgl3n1bv59l58awj9brs0r";

1707− name = "pim-sieve-editor-21.08.1.tar.xz";

1705+ url = "${mirror}/stable/release-service/21.08.2/src/pim-sieve-editor-21.08.2.tar.xz";

1706+ sha256 = "173c595djmz3wyzl9dl3br8m3k0940ncdyjf8rjfgrh79y86bh7m";

1707+ name = "pim-sieve-editor-21.08.2.tar.xz";

17081708 };

17091709 };

17101710 pimcommon = {

1711− version = "21.08.1";

1711+ version = "21.08.2";

17121712 src = fetchurl {

1713− url = "${mirror}/stable/release-service/21.08.1/src/pimcommon-21.08.1.tar.xz";

1714− sha256 = "1379lhvin2vkikd3fzanhwfjszb4cc9f3h9bxf3md3h4gx1i6hb6";

1715− name = "pimcommon-21.08.1.tar.xz";

1713+ url = "${mirror}/stable/release-service/21.08.2/src/pimcommon-21.08.2.tar.xz";

1714+ sha256 = "074pbxprzx8hd6fikjvx8hn9g9135swzhj1f5zvfvhyvlpyj90wg";

1715+ name = "pimcommon-21.08.2.tar.xz";

17161716 };

17171717 };

17181718 poxml = {

1719− version = "21.08.1";

1719+ version = "21.08.2";

17201720 src = fetchurl {

1721− url = "${mirror}/stable/release-service/21.08.1/src/poxml-21.08.1.tar.xz";

1722− sha256 = "10wwrbmhwbjk71m4ya1shb7mviil33fciykrzyqvvdnvx668aawm";

1723− name = "poxml-21.08.1.tar.xz";

1721+ url = "${mirror}/stable/release-service/21.08.2/src/poxml-21.08.2.tar.xz";

1722+ sha256 = "1h7y4y1n3xcpgrkabik21ilck5dmq6p3qxs3xm9vzq1jxpb9izyf";

1723+ name = "poxml-21.08.2.tar.xz";

17241724 };

17251725 };

17261726 print-manager = {

1727− version = "21.08.1";

1727+ version = "21.08.2";

17281728 src = fetchurl {

1729− url = "${mirror}/stable/release-service/21.08.1/src/print-manager-21.08.1.tar.xz";

1730− sha256 = "1hzykjnymr0knh67h6s5214bjp5lk1klm6znh8q2asf49c6x2zgw";

1731− name = "print-manager-21.08.1.tar.xz";

1729+ url = "${mirror}/stable/release-service/21.08.2/src/print-manager-21.08.2.tar.xz";

1730+ sha256 = "0g2y2i7iysi6i397gd9fpqpk9cha7z4b2wz6shcqp0jyvvwl1pd3";

1731+ name = "print-manager-21.08.2.tar.xz";

17321732 };

17331733 };

17341734 rocs = {

1735− version = "21.08.1";

1735+ version = "21.08.2";

17361736 src = fetchurl {

1737− url = "${mirror}/stable/release-service/21.08.1/src/rocs-21.08.1.tar.xz";

1738− sha256 = "1b527n0csk43sxafynqijiwf0bzj89viznpxnk2ayb9lik4q3djm";

1739− name = "rocs-21.08.1.tar.xz";

1737+ url = "${mirror}/stable/release-service/21.08.2/src/rocs-21.08.2.tar.xz";

1738+ sha256 = "0cvgi42w1a7zd6bzazly9w2azbyp9gzvkyx5wlff5z99nk6v3mp0";

1739+ name = "rocs-21.08.2.tar.xz";

17401740 };

17411741 };

17421742 signon-kwallet-extension = {

1743− version = "21.08.1";

1743+ version = "21.08.2";

17441744 src = fetchurl {

1745− url = "${mirror}/stable/release-service/21.08.1/src/signon-kwallet-extension-21.08.1.tar.xz";

1746− sha256 = "1x1q1vmqm9nq7sjhxc495x612jh39scxba0nbr8a4rval144268m";

1747− name = "signon-kwallet-extension-21.08.1.tar.xz";

1745+ url = "${mirror}/stable/release-service/21.08.2/src/signon-kwallet-extension-21.08.2.tar.xz";

1746+ sha256 = "19jp6h9xqhlyvddgyg9jz74by0pcxqm920c5h8vln5vkkcgsdwws";

1747+ name = "signon-kwallet-extension-21.08.2.tar.xz";

17481748 };

17491749 };

17501750 skanlite = {

1751− version = "21.08.1";

1751+ version = "21.08.2";

17521752 src = fetchurl {

1753− url = "${mirror}/stable/release-service/21.08.1/src/skanlite-21.08.1.tar.xz";

1754− sha256 = "17lnazx1h4lk78037gvzscnm3p2yl6dhc4970bdq982ahwp63gg8";

1755− name = "skanlite-21.08.1.tar.xz";

1753+ url = "${mirror}/stable/release-service/21.08.2/src/skanlite-21.08.2.tar.xz";

1754+ sha256 = "1zwrb7j7x234vbb57p8gzbqz2mfr1n2i84yjf16jrsv1fm53z9md";

1755+ name = "skanlite-21.08.2.tar.xz";

17561756 };

17571757 };

17581758 spectacle = {

1759− version = "21.08.1";

1759+ version = "21.08.2";

17601760 src = fetchurl {

1761− url = "${mirror}/stable/release-service/21.08.1/src/spectacle-21.08.1.tar.xz";

1762− sha256 = "0bs93gylw90wj3b9kw71xhqy60smggh38s5g4jcras1n6iqmb06x";

1763− name = "spectacle-21.08.1.tar.xz";

1761+ url = "${mirror}/stable/release-service/21.08.2/src/spectacle-21.08.2.tar.xz";

1762+ sha256 = "0m59cnfqkm379i6ayj1g5flszqs26dmnwl79324d1j6bxk24mjrh";

1763+ name = "spectacle-21.08.2.tar.xz";

17641764 };

17651765 };

17661766 step = {

1767− version = "21.08.1";

1767+ version = "21.08.2";

17681768 src = fetchurl {

1769− url = "${mirror}/stable/release-service/21.08.1/src/step-21.08.1.tar.xz";

1770− sha256 = "0rg69j8r479vzyrajbdjgh5l2506w8f2dnlh1di545gzjk2ww448";

1771− name = "step-21.08.1.tar.xz";

1769+ url = "${mirror}/stable/release-service/21.08.2/src/step-21.08.2.tar.xz";

1770+ sha256 = "15l11s39hw847kd37fhq6kp3ajbsxidkfpp2ryb9dfh595lncg2r";

1771+ name = "step-21.08.2.tar.xz";

17721772 };

17731773 };

17741774 svgpart = {

1775− version = "21.08.1";

1775+ version = "21.08.2";

17761776 src = fetchurl {

1777− url = "${mirror}/stable/release-service/21.08.1/src/svgpart-21.08.1.tar.xz";

1778− sha256 = "1silp6k0l9xb363h8whiv4dry6gf1mj4w53mksl1i2slhqn9q96v";

1779− name = "svgpart-21.08.1.tar.xz";

1777+ url = "${mirror}/stable/release-service/21.08.2/src/svgpart-21.08.2.tar.xz";

1778+ sha256 = "14xgwdvpcvgw0jj4gy3175ah38x9f8lhknqbw5bczvm9cy8j7qfw";

1779+ name = "svgpart-21.08.2.tar.xz";

17801780 };

17811781 };

17821782 sweeper = {

1783− version = "21.08.1";

1783+ version = "21.08.2";

17841784 src = fetchurl {

1785− url = "${mirror}/stable/release-service/21.08.1/src/sweeper-21.08.1.tar.xz";

1786− sha256 = "0p25bkczxmx93igicyiasvjd4v9rc3sg7gm7b9ddgzz8rrnr0d9p";

1787− name = "sweeper-21.08.1.tar.xz";

1785+ url = "${mirror}/stable/release-service/21.08.2/src/sweeper-21.08.2.tar.xz";

1786+ sha256 = "1yvcfdhapml1vzqns67v6j2c39g752f8czxs7bnczi69fq1ksh0b";

1787+ name = "sweeper-21.08.2.tar.xz";

17881788 };

17891789 };

17901790 umbrello = {

1791− version = "21.08.1";

1791+ version = "21.08.2";

17921792 src = fetchurl {

1793− url = "${mirror}/stable/release-service/21.08.1/src/umbrello-21.08.1.tar.xz";

1794− sha256 = "0x4f3hiydyprhzd56i8lijwfhzca041bmbbxp7x1dckv3shdangc";

1795− name = "umbrello-21.08.1.tar.xz";

1793+ url = "${mirror}/stable/release-service/21.08.2/src/umbrello-21.08.2.tar.xz";

1794+ sha256 = "1xiz006ppgss6rxg7lndgnrbcdbm0iq1hjly3rjn943ff11wq5yr";

1795+ name = "umbrello-21.08.2.tar.xz";

17961796 };

17971797 };

17981798 yakuake = {

1799− version = "21.08.1";

1799+ version = "21.08.2";

18001800 src = fetchurl {

1801− url = "${mirror}/stable/release-service/21.08.1/src/yakuake-21.08.1.tar.xz";

1802− sha256 = "1x41jrkvlff8x5qcd12lcrv6zqzw7jqw02ikpmqv1v4gw7lz94w9";

1803− name = "yakuake-21.08.1.tar.xz";

1801+ url = "${mirror}/stable/release-service/21.08.2/src/yakuake-21.08.2.tar.xz";

1802+ sha256 = "1d8dh10jkpm4pm8fh1bmkdwvv59gk0fg6dr3gahlspnh4hhzy4hg";

1803+ name = "yakuake-21.08.2.tar.xz";

18041804 };

18051805 };

18061806 zeroconf-ioslave = {

1807− version = "21.08.1";

1807+ version = "21.08.2";

18081808 src = fetchurl {

1809− url = "${mirror}/stable/release-service/21.08.1/src/zeroconf-ioslave-21.08.1.tar.xz";

1810− sha256 = "113sp3lqzyxx7icww4sznc23kxarmxz0158kzl6nazxj4m6cnm4r";

1811− name = "zeroconf-ioslave-21.08.1.tar.xz";

1809+ url = "${mirror}/stable/release-service/21.08.2/src/zeroconf-ioslave-21.08.2.tar.xz";

1810+ sha256 = "0xgm4y29iklal5kd5z76jdw6wgw0mg9xn0f0d07zyshv5hjgllv6";

1811+ name = "zeroconf-ioslave-21.08.2.tar.xz";

18121812 };

18131813 };

18141814}

pkgs/applications/misc/goldendict/default.nix−1

@@ -56,7 +56,6 @@ mkDerivation rec {

5656 postInstall = lib.optionalString stdenv.isDarwin ''

5757 mkdir -p $out/Applications

5858 mv GoldenDict.app $out/Applications

59− wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict

6059 '';

6160

6261 meta = with lib; {

pkgs/applications/misc/gpxlab/default.nix−1

@@ -28,7 +28,6 @@ mkDerivation rec {

2828 postInstall = lib.optionalString stdenv.isDarwin ''

2929 mkdir -p $out/Applications

3030 mv GPXLab/GPXLab.app $out/Applications

31− wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab

3231 '';

3332

3433 meta = with lib; {

pkgs/applications/misc/gpxsee/default.nix−1

@@ -26,7 +26,6 @@ mkDerivation rec {

2626 postInstall = with stdenv; lib.optionalString isDarwin ''

2727 mkdir -p $out/Applications

2828 mv GPXSee.app $out/Applications

29− wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee

3029 '';

3130

3231 meta = with lib; {

pkgs/applications/misc/keepassx/community.nix−5

@@ -115,11 +115,6 @@ stdenv.mkDerivation rec {

115115 ++ optional (stdenv.isDarwin && withKeePassTouchID)

116116 darwin.apple_sdk.frameworks.LocalAuthentication;

117117

118− preFixup = optionalString stdenv.isDarwin ''

119− # Make it work without Qt in PATH.

120− wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC

121− '';

122−

123118 passthru.tests = nixosTests.keepassxc;

124119

125120 meta = {

pkgs/applications/misc/lsd2dsl/default.nix−3

@@ -30,9 +30,6 @@ mkDerivation rec {

3030

3131 installPhase = ''

3232 install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin

33− '' + lib.optionalString stdenv.isDarwin ''

34− wrapQtApp $out/bin/lsd2dsl

35− wrapQtApp $out/bin/lsd2dsl-qtgui

3633 '';

3734

3835 meta = with lib; {

pkgs/applications/misc/merkaartor/default.nix−1

@@ -50,7 +50,6 @@ mkDerivation rec {

5050 mkdir -p $out/Applications

5151 mv binaries/bin/merkaartor.app $out/Applications

5252 mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents

53− wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor

5453 '';

5554

5655 meta = with lib; {

pkgs/applications/misc/multibootusb/default.nix+10−10

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

11{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,

22 coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,

3− python36Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }:

3+ python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }:

55# Note: Multibootusb is tricky to maintain. It relies on the

66# $PYTHONPATH variable containing some of their code, so that

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

1313#

1414# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59

1515

16−python36Packages.buildPythonApplication rec {

16+python3Packages.buildPythonApplication rec {

1717 pname = "multibootusb";

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

1919 version = "9.2.0";

@@ -42,7 +42,7 @@ python36Packages.buildPythonApplication rec {

4242

4343 buildInputs = [

4444 libxcb

45− python36Packages.python

45+ python3Packages.python

4646 qt5.full

4747 ];

4848

@@ -58,12 +58,12 @@ python36Packages.buildPythonApplication rec {

5858 # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"

5959 doCheck = false;

6060

61− pythonPath = [

62− python36Packages.dbus-python

63− python36Packages.pyqt5

64− python36Packages.pytest-shutil

65− python36Packages.pyudev

66− python36Packages.six

61+ pythonPath = with python3Packages; [

62+ dbus-python

63+ pyqt5

64+ pytest-shutil

65+ pyudev

66+ six

6767 ];

6868

6969 # multibootusb ships zips with various versions of syslinux, we need to patchelf them

@@ -95,7 +95,7 @@ python36Packages.buildPythonApplication rec {

9595 "''${qtWrapperArgs[@]}"

9696

9797 # Then, add the installed scripts/ directory to the python path

98− --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"

98+ --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"

9999

100100 # Add some runtime dependencies

101101 --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}"

pkgs/applications/misc/sleepyhead/default.nix−4

@@ -33,10 +33,6 @@ in mkDerivation {

3333 cp sleepyhead/SleepyHead $out/bin

3434 '';

3535

36− postFixup = lib.optionalString stdenv.isDarwin ''

37− wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead"

38− '';

39−

4036 meta = with lib; {

4137 homepage = "https://sleepyhead.jedimark.net/";

4238 description = "Review and explore data produced by CPAP and related machines";

pkgs/applications/misc/xpdf/default.nix−5

@@ -51,11 +51,6 @@ stdenv.mkDerivation rec {

5151 install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg

5252 '';

5353

54− # wrapQtAppsHook broken on macOS (https://github.com/NixOS/nixpkgs/issues/102044)

55− postFixup = lib.optionalString stdenv.isDarwin ''

56− wrapQtApp $out/bin/xpdf

57− '';

58−

5954 meta = with lib; {

6055 homepage = "https://www.xpdfreader.com";

6156 description = "Viewer for Portable Document Format (PDF) files";

pkgs/applications/networking/browsers/firefox/common.nix+1−3

@@ -117,9 +117,7 @@ let

117117 then overrideCC stdenv llvmPackages.clangUseLLVM

118118 else stdenv;

119119

120− # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY

121− # https://github.com/NixOS/nixpkgs/issues/126065

122− nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss.override { useP11kit = false; };

120+ nss_pkg = if lib.versionOlder version "83" then nss_3_53 else nss;

123121

124122 # --enable-release adds -ffunction-sections & LTO that require a big amount of

125123 # RAM and the 32-bit memory space cannot handle that linking

pkgs/applications/networking/cluster/k3s/default.nix−2

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

1313, pkg-config

1414, ethtool

1515, util-linux

16−, ipset

1716, fetchFromGitHub

1817, fetchurl

1918, fetchzip

@@ -257,7 +256,6 @@ stdenv.mkDerivation rec {

257256 bridge-utils

258257 ethtool

259258 util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388

260− ipset

261259 conntrack-tools

262260 ];

263261

pkgs/applications/networking/firehol/default.nix+4−3

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

11{ stdenv, lib, fetchFromGitHub, pkgs

2−, autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils

2+, autoconf, automake, curl, iprange, iproute2, iptables, iputils

33, kmod, nettools, procps, tcpdump, traceroute, util-linux, whois

55# If true, just install FireQOS without FireHOL

@@ -35,13 +35,14 @@ stdenv.mkDerivation rec {

3535

3636 nativeBuildInputs = [ autoconf automake ];

3737 buildInputs = [

38− curl iprange iproute2 ipset iptables iputils kmod

38+ curl iprange iproute2 iptables iputils kmod

3939 nettools procps tcpdump traceroute util-linux whois

4040 ];

4141

4242 preConfigure = "./autogen.sh";

4343 configureFlags = [ "--localstatedir=/var"

44− "--disable-doc" "--disable-man" ] ++

44+ "--disable-doc" "--disable-man"

45+ "--disable-update-ipsets" ] ++

4546 lib.optional onlyQOS [ "--disable-firehol" ];

4647

4748 meta = with lib; {

pkgs/applications/networking/instant-messengers/chatterino2/default.nix−3

@@ -16,9 +16,6 @@ mkDerivation rec {

1616 mkdir -p "$out/Applications"

1717 mv bin/chatterino.app "$out/Applications/"

1818 '';

19− postFixup = lib.optionalString stdenv.isDarwin ''

20− wrapQtApp "$out/Applications/chatterino.app/Contents/MacOS/chatterino"

21− '';

2219 meta = with lib; {

2320 description = "A chat client for Twitch chat";

2421 longDescription = ''

pkgs/applications/networking/instant-messengers/tensor/default.nix−1

@@ -34,7 +34,6 @@ mkDerivation rec {

3434

3535 mkdir -p $out/Applications

3636 cp -r tensor.app $out/Applications/tensor.app

37− wrapQtApp $out/Applications/tensor.app/Contents/MacOS/tensor

3837

3938 runHook postInstall

4039 '' else ''

pkgs/applications/networking/irc/communi/default.nix−2

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

3838 install_name_tool \

3939 -add_rpath @executable_path/../Frameworks \

4040 $out/Applications/Communi.app/Contents/MacOS/Communi

41−

42− wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi

4341 '' else ''

4442 substituteInPlace "$out/share/applications/communi.desktop" \

4543 --replace "/usr/bin" "$out/bin"

pkgs/applications/networking/sniffers/wireshark/default.nix−2

@@ -66,8 +66,6 @@ in stdenv.mkDerivation {

6666 install_name_tool -change "$dylib" "$out/lib/$dylib" "$f"

6767 done

6868 done

69−

70− wrapQtApp $out/Applications/Wireshark.app/Contents/MacOS/Wireshark

7169 '' else optionalString withQt ''

7270 install -Dm644 -t $out/share/applications ../wireshark.desktop

7371

pkgs/applications/office/beamerpresenter/default.nix−4

@@ -37,10 +37,6 @@ stdenv.mkDerivation rec {

3737 done

3838 '';

3939

40− postInstall = lib.optionalString stdenv.isDarwin ''

41− wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter

42− '';

43−

4440 meta = with lib; {

4541 description = "Modular multi screen pdf presentation software respecting your window manager";

4642 homepage = "https://github.com/stiglers-eponym/BeamerPresenter";

pkgs/applications/science/astronomy/stellarium/default.nix−4

@@ -28,10 +28,6 @@ mkDerivation rec {

2828 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Stellarium.app/Contents")'

2929 '';

3030

31− postFixup = lib.optionalString stdenv.isDarwin ''

32− wrapQtApp "$out"/Stellarium.app/Contents/MacOS/stellarium

33− '';

34−

3531 meta = with lib; {

3632 description = "Free open-source planetarium";

3733 homepage = "http://stellarium.org/";

pkgs/applications/version-management/git-and-tools/git/default.nix+4−2

@@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport;

2525assert svnSupport -> perlSupport;

2626

2727let

28− version = "2.33.0";

28+ version = "2.33.1";

2929 svn = subversionClient.override { perlBindings = perlSupport; };

3030

3131 gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];

@@ -37,7 +37,7 @@ stdenv.mkDerivation {

3737

3838 src = fetchurl {

3939 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

40− sha256 = "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z";

40+ sha256 = "sha256-4FSm5sKwiL0b/19h7ZulqpHJo81QlTmktBxd3wIgHy8=";

4141 };

4242

4343 outputs = [ "out" ] ++ lib.optional withManual "doc";

@@ -338,6 +338,8 @@ stdenv.mkDerivation {

338338 disable_test t6300-for-each-ref

339339 #===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found

340340 disable_test t9902-completion

341+ # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin)

342+ disable_test t5003-archive-zip

341343 '' + lib.optionalString stdenv.hostPlatform.isMusl ''

342344 # Test fails (as of 2.17.0, musl 1.1.19)

343345 disable_test t3900-i18n-commit

pkgs/applications/video/jellyfin-media-player/default.nix−3

@@ -94,9 +94,6 @@ mkDerivation rec {

9494 mv $out/Resources/* "$out/Applications/Jellyfin Media Player.app/Contents/Resources/"

9595 rmdir $out/Resources

9696

97− # fix 'Could not find the Qt platform plugin "cocoa" in ""' error

98− wrapQtApp "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player"

99−

10097 ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer

10198 '';

10299

pkgs/build-support/bintools-wrapper/default.nix+10

@@ -324,6 +324,16 @@ stdenv.mkDerivation {

324324 echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags

325325 ''

326326

327+ ##

328+ ## GNU specific extra strip flags

329+ ##

330+

331+ # TODO(@sternenseemann): make a generic strip wrapper?

332+ + optionalString (bintools.isGNU or false) ''

333+ wrap ${targetPrefix}strip ${./gnu-binutils-strip-wrapper.sh} \

334+ "${bintools_bin}/bin/${targetPrefix}strip"

335+ ''

336+

327337 ###

328338 ### Remove LC_UUID

329339 ###

pkgs/build-support/bintools-wrapper/gnu-binutils-strip-wrapper.shnew file+4

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

1+#! @shell@

2+# shellcheck shell=bash

4+exec @prog@ --enable-deterministic-archives "$@"

pkgs/build-support/rust/hooks/cargo-check-hook.sh+3−3

@@ -16,11 +16,11 @@ cargoCheckHook() {

1616 threads=1

1717 fi

1818

19− if [ "${cargoBuildType}" != "debug" ]; then

20− cargoBuildProfileFlag="--${cargoBuildType}"

19+ if [ "${cargoCheckType}" != "debug" ]; then

20+ cargoCheckProfileFlag="--${cargoCheckType}"

2121 fi

2222

23− argstr="${cargoBuildProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";

23+ argstr="${cargoCheckProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";

2424

2525 (

2626 set -x

pkgs/build-support/setup-hooks/strip.sh+1−1

@@ -51,7 +51,7 @@ stripDirs() {

5151

5252 if [ -n "${dirs}" ]; then

5353 header "stripping (with command $cmd and flags $stripFlags) in$dirs"

54− find $dirs -type f -exec $cmd $commonStripFlags $stripFlags '{}' \; 2>/dev/null

54+ find $dirs -type f -exec $cmd $stripFlags '{}' \; 2>/dev/null

5555 stopNest

5656 fi

5757}

pkgs/data/misc/cacert/default.nix+171−95

@@ -1,131 +1,207 @@

11{ lib

22, stdenv

3+, writeText

34, fetchurl

4−, nss

5−, python3

6−, blacklist ? [ ]

5+, buildcatrust

6+, blacklist ? []

7+, extraCertificateFiles ? []

8+, extraCertificateStrings ? []

8− # Used for tests only

10+# Used by update.sh

11+, nssOverride ? null

12+

13+# Used for tests only

914, runCommand

1015, cacert

1116, openssl

1217}:

1318

1419let

15− certdata2pem = fetchurl {

16− name = "certdata2pem.py";

17− urls = [

18− "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py"

19− "https://git.launchpad.net/ubuntu/+source/ca-certificates/plain/mozilla/certdata2pem.py?id=47e49e1e0a8a1ca74deda27f88fe181191562957"

20− ];

21− sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";

20+ blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist);

21+ extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings);

22+

23+ srcVersion = "3.71";

24+ version = if nssOverride != null then nssOverride.version else srcVersion;

25+ meta = with lib; {

26+ homepage = "https://curl.haxx.se/docs/caextract.html";

27+ description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";

28+ platforms = platforms.all;

29+ maintainers = with maintainers; [ andir fpletz lukegb ];

30+ license = licenses.mpl20;

2231 };

23−in

32+ certdata = stdenv.mkDerivation {

33+ pname = "nss-cacert-certdata";

34+ inherit version;

2435

25−stdenv.mkDerivation rec {

26− pname = "nss-cacert";

27− version = "3.66";

36+ src = if nssOverride != null then nssOverride.src else fetchurl {

37+ url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz";

38+ sha256 = "0ly2l3dv6z5hlxs72h5x6796ni3x1bq60saavaf42ddgv4ax7b4r";

39+ };

2840

29− src = fetchurl {

30− url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz";

31− sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9";

32− };

41+ dontBuild = true;

42+

43+ installPhase = ''

44+ runHook preInstall

3345

34− outputs = [ "out" "unbundled" ];

46+ mkdir $out

47+ cp nss/lib/ckfw/builtins/certdata.txt $out

3548

36− nativeBuildInputs = [ python3 ];

49+ runHook postInstall

50+ '';

51+

52+ inherit meta;

53+ };

54+in

55+stdenv.mkDerivation rec {

56+ pname = "nss-cacert";

57+ inherit version;

3758

38− configurePhase = ''

39− ln -s nss/lib/ckfw/builtins/certdata.txt

59+ src = certdata;

4060

41− cat << EOF > blacklist.txt

42− ${lib.concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)}

43− EOF

61+ outputs = [ "out" "unbundled" "p11kit" ];

4462

45− # copy from the store, otherwise python will scan it for imports

46− cat "${certdata2pem}" > certdata2pem.py

47− '';

63+ nativeBuildInputs = [ buildcatrust ];

4864

4965 buildPhase = ''

50− python certdata2pem.py | grep -vE '^(!|UNTRUSTED)'

51−

52− for cert in *.crt; do

53− echo $cert | cut -d. -f1 | sed -e 's,_, ,g' >> ca-bundle.crt

54− cat $cert >> ca-bundle.crt

55− echo >> ca-bundle.crt

56− done

66+ mkdir unbundled

67+ buildcatrust \

68+ --certdata_input certdata.txt \

69+ --ca_bundle_input "${extraCertificatesBundle}" ${lib.escapeShellArgs (map (arg: "${arg}") extraCertificateFiles)} \

70+ --blocklist "${blocklist}" \

71+ --ca_bundle_output ca-bundle.crt \

72+ --ca_unpacked_output unbundled \

73+ --p11kit_output ca-bundle.trust.p11-kit

5774 '';

5875

5976 installPhase = ''

60− mkdir -pv $out/etc/ssl/certs

61− cp -v ca-bundle.crt $out/etc/ssl/certs

77+ install -D -t "$out/etc/ssl/certs" ca-bundle.crt

78+

79+ # install p11-kit specific output to p11kit output

80+ install -D -t "$p11kit/etc/ssl/trust-source" ca-bundle.trust.p11-kit

81+

6282 # install individual certs in unbundled output

63− mkdir -pv $unbundled/etc/ssl/certs

64− cp -v *.crt $unbundled/etc/ssl/certs

65− rm $unbundled/etc/ssl/certs/ca-bundle.crt # not wanted in unbundled

83+ install -D -t "$unbundled/etc/ssl/certs" unbundled/*.crt

6684 '';

6785

6886 setupHook = ./setup-hook.sh;

6987

7088 passthru = {

7189 updateScript = ./update.sh;

72− tests = {

73− # Test that building this derivation with a blacklist works, and that UTF-8 is supported.

74− blacklist-utf8 =

75− let

76− blacklistCAToFingerprint = {

77− # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint.

78− "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD";

79− "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98";

80− };

81− mapBlacklist = f: lib.concatStringsSep "\n" (lib.mapAttrsToList f blacklistCAToFingerprint);

82− in

83− runCommand "verify-the-cacert-filter-output"

84− {

85− cacert = cacert.unbundled;

86− cacertWithExcludes = (cacert.override {

87− blacklist = builtins.attrNames blacklistCAToFingerprint;

88− }).unbundled;

89−

90− nativeBuildInputs = [ openssl ];

91− } ''

92− isPresent() {

93− # isPresent <unbundled-dir> <ca name> <ca sha256 fingerprint>

94− for f in $1/etc/ssl/certs/*.crt; do

95− fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)"

96− if [[ "x$fingerprint" == "x$3" ]]; then

97− return 0

90+ tests = let

91+ isTrusted = ''

92+ isTrusted() {

93+ # isTrusted <unbundled-dir> <ca name> <ca sha256 fingerprint>

94+ for f in $1/etc/ssl/certs/*.crt; do

95+ if ! [[ -s "$f" ]]; then continue; fi

96+ fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)"

97+ if [[ "x$fingerprint" == "x$3" ]]; then

98+ # If the certificate is treated as rejected for TLS Web Server, then we consider it untrusted.

99+ if openssl x509 -in "$f" -noout -text | grep -q '^Rejected Uses:'; then

100+ if openssl x509 -in "$f" -noout -text | grep -A1 '^Rejected Uses:' | grep -q 'TLS Web Server'; then

101+ return 1

102+ fi

98103 fi

99− done

100− return 1

101− }

102−

103− # Ensure that each certificate is in the main "cacert".

104− ${mapBlacklist (caName: caFingerprint: ''

105− isPresent "$cacert" "${caName}" "${caFingerprint}" || ({

106− echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2

107− exit 1

108− })

109− '')}

110−

111− # Ensure that each certificate is NOT in the "cacertWithExcludes".

112− ${mapBlacklist (caName: caFingerprint: ''

113− isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({

114− echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2

115− exit 1

116− })

117− '')}

118−

119− touch $out

104+ return 0

105+ fi

106+ done

107+ return 1

108+ }

109+ '';

110+ in {

111+ # Test that building this derivation with a blacklist works, and that UTF-8 is supported.

112+ blacklist-utf8 = let

113+ blacklistCAToFingerprint = {

114+ # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint.

115+ "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD";

116+ "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98";

117+ };

118+ mapBlacklist = f: lib.concatStringsSep "\n" (lib.mapAttrsToList f blacklistCAToFingerprint);

119+ in runCommand "verify-the-cacert-filter-output" {

120+ cacert = cacert.unbundled;

121+ cacertWithExcludes = (cacert.override {

122+ blacklist = builtins.attrNames blacklistCAToFingerprint;

123+ }).unbundled;

124+

125+ nativeBuildInputs = [ openssl ];

126+ } ''

127+ ${isTrusted}

128+

129+ # Ensure that each certificate is in the main "cacert".

130+ ${mapBlacklist (caName: caFingerprint: ''

131+ isTrusted "$cacert" "${caName}" "${caFingerprint}" || ({

132+ echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2

133+ exit 1

134+ })

135+ '')}

136+

137+ # Ensure that each certificate is NOT in the "cacertWithExcludes".

138+ ${mapBlacklist (caName: caFingerprint: ''

139+ isTrusted "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({

140+ echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2

141+ exit 1

142+ })

143+ '')}

144+

145+ touch "$out"

146+ '';

147+

148+ # Test that we can add additional certificates to the store, and have them be trusted.

149+ extra-certificates = let

150+ extraCertificateStr = ''

151+ -----BEGIN CERTIFICATE-----

152+ MIIB5DCCAWqgAwIBAgIUItvsAYEIdYDkOIo5sdDYMcUaNuIwCgYIKoZIzj0EAwIw

153+ KTEnMCUGA1UEAwweTml4T1MgY2FjZXJ0IGV4dHJhIGNlcnRpZmljYXRlMB4XDTIx

154+ MDYxMjE5MDQzMFoXDTIyMDYxMjE5MDQzMFowKTEnMCUGA1UEAwweTml4T1MgY2Fj

155+ ZXJ0IGV4dHJhIGNlcnRpZmljYXRlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEuP8y

156+ lAm6ZyQt9v/P6gTlV/a9R+D61WjucW04kaegOhg8csiluimYodiSv0Pbgymu+Zxm

157+ A3Bz9QGmytaYTiJ16083rJkwwIhqoYl7kWsLzreSTaLz87KH+rdeol59+H0Oo1Mw

158+ UTAdBgNVHQ4EFgQUCxuHfvqI4YVU5M+A0+aKvd1LrdswHwYDVR0jBBgwFoAUCxuH

159+ fvqI4YVU5M+A0+aKvd1LrdswDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNo

160+ ADBlAjEArgxgjdNmRlSEuai0dzlktmBEDZKy2Iiul+ttSoce9ohfEVYESwO602HW

161+ keVvI56vAjBCro3dc3m2TuktiKO6lQV56PUEyxko4H/sR5pnHlduCGRDlFzQKXf/

162+ pMMmtj7cVb8=

163+ -----END CERTIFICATE-----

120164 '';

165+ extraCertificateFile = ./test-cert-file.crt;

166+ extraCertificatesToFingerprint = {

167+ # String above

168+ "NixOS cacert extra certificate string" = "A3:20:D0:84:96:97:25:FF:98:B8:A9:6D:A3:7C:89:95:6E:7A:77:21:92:F3:33:E9:31:AF:5E:03:CE:A9:E5:EE";

169+

170+ # File

171+ "NixOS cacert extra certificate file" = "88:B8:BE:A7:57:AC:F1:FE:D6:98:8B:50:E0:BD:0A:AE:88:C7:DF:70:26:E1:67:5E:F5:F6:91:27:FF:02:D4:A5";

172+ };

173+ mapExtra = f: lib.concatStringsSep "\n" (lib.mapAttrsToList f extraCertificatesToFingerprint);

174+ in runCommand "verify-the-cacert-extra-output" {

175+ cacert = cacert.unbundled;

176+ cacertWithExtras = (cacert.override {

177+ extraCertificateStrings = [ extraCertificateStr ];

178+ extraCertificateFiles = [ extraCertificateFile ];

179+ }).unbundled;

180+

181+ nativeBuildInputs = [ openssl ];

182+ } ''

183+ ${isTrusted}

184+

185+ # Ensure that the extra certificate is not in the main "cacert".

186+ ${mapExtra (extraName: extraFingerprint: ''

187+ isTrusted "$cacert" "${extraName}" "${extraFingerprint}" && ({

188+ echo "'extra' CA fingerprint ${extraFingerprint} (${extraName}) is present in the main CA bundle." >&2

189+ exit 1

190+ })

191+ '')}

192+

193+ # Ensure that the extra certificates ARE in the "cacertWithExtras".

194+ ${mapExtra (extraName: extraFingerprint: ''

195+ isTrusted "$cacertWithExtras" "${extraName}" "${extraFingerprint}" || ({

196+ echo "CA fingerprint ${extraFingerprint} (${extraName}) is not present in the cacertWithExtras bundle." >&2

197+ exit 1

198+ })

199+ '')}

200+

201+ touch "$out"

202+ '';

121203 };

122204 };

123205

124− meta = with lib; {

125− homepage = "https://curl.haxx.se/docs/caextract.html";

126− description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";

127− platforms = platforms.all;

128− maintainers = with maintainers; [ andir fpletz lukegb ];

129− license = licenses.mpl20;

130− };

206+ inherit meta;

131207}

pkgs/data/misc/cacert/test-cert-file.crtnew file+13

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

1+-----BEGIN CERTIFICATE-----

2+MIIB7TCCAXSgAwIBAgIUFJB0STXn22fIEDjpncEt++IdFeMwCgYIKoZIzj0EAwIw

3+LjEsMCoGA1UEAwwjTml4T1MgY2FjZXJ0IGV4dHJhIGNlcnRpZmljYXRlIGZpbGUw

4+HhcNMjEwNjEyMTkxODA4WhcNMjIwNjEyMTkxODA4WjAuMSwwKgYDVQQDDCNOaXhP

5+UyBjYWNlcnQgZXh0cmEgY2VydGlmaWNhdGUgZmlsZTB2MBAGByqGSM49AgEGBSuB

6+BAAiA2IABMifTLM5K5xd+guGdKE1+NR7wnEJbxw5INzuMrkg/7jgEIQil4+L2YOF

7+kU1gxcM80Ot8tQAG5OcSvX1DF6CxunpoCT+hnHqyfqoWFvl89i1BUKjyWCQ5WXEe

8+nSkuJUmYC6NTMFEwHQYDVR0OBBYEFBE2kNis1ri4fweyNVRmvje83gFQMB8GA1Ud

9+IwQYMBaAFBE2kNis1ri4fweyNVRmvje83gFQMA8GA1UdEwEB/wQFMAMBAf8wCgYI

10+KoZIzj0EAwIDZwAwZAIwUZf1qaSb4cezulV+4B4FoJHY2B/nRVIi/rFD8634YEDT

11+vcg6dmCi/AqLEzJn7uFMAjBVTu4EVC/mtQCGESFChMeb04fsuhXgttWSwWliVPEG

12+jkG7u0UNNGaU8dvrjpqRRmA=

13+-----END CERTIFICATE-----

pkgs/data/misc/cacert/update.sh+2−2

@@ -28,7 +28,7 @@ BASEDIR="$(dirname "$0")/../../../.."

2828

2929

3030CURRENT_PATH=$(nix-build --no-out-link -A cacert.out)

31−PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; let nss_pkg = pkgs.nss_latest or pkgs.nss; in (cacert.overrideAttrs (_: { inherit (nss_pkg) src version; })).out")

31+PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; let nss_pkg = pkgs.nss_latest or pkgs.nss; in (cacert.override { nssOverride = nss_pkg; }).out")

3232

3333# Check the hash of the etc subfolder

3434# We can't check the entire output as that contains the nix-support folder

@@ -38,5 +38,5 @@ PATCHED_HASH=$(nix-hash "$PATCHED_PATH/etc")

3838

3939if [[ "$CURRENT_HASH" != "$PATCHED_HASH" ]]; then

4040 NSS_VERSION=$(nix-instantiate --json --eval -E "with import $BASEDIR {}; nss.version" | jq -r .)

41− update-source-version cacert "$NSS_VERSION"

41+ update-source-version --version-key=srcVersion cacert.src "$NSS_VERSION"

4242fi

pkgs/data/misc/tzdata/default.nix+4−4

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

33stdenv.mkDerivation rec {

44 pname = "tzdata";

5− version = "2021a";

5+ version = "2021c";

77 srcs =

88 [ (fetchurl {

99 url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";

10− sha256 = "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr";

10+ sha256 = "0himprzx3ahxkmg4rvp8n5lqry76qzc65j6sfq151hqirg4d3wdl";

1111 })

1212 (fetchurl {

1313 url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";

14− sha256 = "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb";

14+ sha256 = "01fsa661vzdij46z286pa8q07cppqz29sr2pf0qqldqpldbb6km3";

1515 })

1616 ];

1717

@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {

7373 publicDomain # tzdata

7474 ];

7575 platforms = platforms.all;

76− maintainers = with maintainers; [ fpletz ];

76+ maintainers = with maintainers; [ ajs124 fpletz ];

7777 };

7878}

pkgs/development/compilers/llvm/10/llvm/default.nix+8

@@ -65,6 +65,14 @@ in stdenv.mkDerivation (rec {

6565 sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi";

6666 stripLen = 1;

6767 })

68+

69+ # Fix missing includes for GCC 11

70+ (fetchpatch {

71+ name = "headers-gcc-11.patch";

72+ url = "https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1.patch";

73+ sha256 = "0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk";

74+ stripLen = 1;

75+ })

6876 ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;

6977

7078 postPatch = optionalString stdenv.isDarwin ''

pkgs/development/compilers/llvm/8/llvm/default.nix+8

@@ -63,6 +63,14 @@ in stdenv.mkDerivation ({

6363 sha256 = "0rwx6jpqq4xnf4mvfm8v2d4r34y1yi05am0mx5k2d5bha9j64lqg";

6464 })

6565 ./gnu-install-dirs.patch

66+

67+ # Fix missing includes for GCC 11

68+ (fetchpatch {

69+ name = "headers-gcc-11.patch";

70+ url = "https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1.patch";

71+ sha256 = "0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk";

72+ stripLen = 1;

73+ })

6674 ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;

6775

6876 postPatch = optionalString stdenv.isDarwin ''

pkgs/development/compilers/llvm/9/llvm/default.nix+9

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

11{ lib, stdenv, llvm_meta

22, pkgsBuildBuild

33, fetch

4+, fetchpatch

45, cmake

56, python3

67, libffi

@@ -60,6 +61,14 @@ in stdenv.mkDerivation (rec {

6061 # Force a test to evaluate the saved benchmark for a CPU for which LLVM has

6162 # an execution model. See NixOS/nixpkgs#119673.

6263 ../../exegesis-force-bdver2.patch

64+

65+ # Fix missing includes for GCC 11

66+ (fetchpatch {

67+ name = "headers-gcc-11.patch";

68+ url = "https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1.patch";

69+ sha256 = "0nh123kld0dgz2h941lng331dkj3wbm5lfxm375k1f569gv83hlk";

70+ stripLen = 1;

71+ })

6372 ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch;

6473

6574 postPatch = optionalString stdenv.isDarwin ''

pkgs/development/interpreters/guile/1.8.nix+52−30

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

1−{ lib, stdenv, pkgsBuildBuild, buildPackages

2−, fetchurl, makeWrapper, gawk, pkg-config

3−, libtool, readline, gmp

1+{ lib

2+, stdenv

3+, fetchurl

4+, buildPackages

5+, gawk

6+, gmp

7+, libtool

8+, makeWrapper

9+, pkg-config

10+, pkgsBuildBuild

11+, readline

412}:

513

614stdenv.mkDerivation rec {

7− name = "guile-1.8.8";

15+ pname = "guile";

16+ version = "1.8.8";

817

918 src = fetchurl {

10− url = "mirror://gnu/guile/${name}.tar.gz";

19+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";

1120 sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";

1221 };

1322

@@ -15,18 +24,28 @@ stdenv.mkDerivation rec {

1524 setOutputFlags = false; # $dev gets into the library otherwise

1625

1726 # GCC 4.6 raises a number of set-but-unused warnings.

18− configureFlags = [ "--disable-error-on-warning" ]

19− # Guile needs patching to preset results for the configure tests about

20− # pthreads, which work only in native builds.

21− ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

22− "--with-threads=no";

23−

24− depsBuildBuild = [ buildPackages.stdenv.cc ]

25− ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

26− pkgsBuildBuild.guile_1_8;

27− nativeBuildInputs = [ makeWrapper gawk pkg-config ];

28− buildInputs = [ readline libtool ];

27+ configureFlags = [

28+ "--disable-error-on-warning"

29+ ]

30+ # Guile needs patching to preset results for the configure tests about

31+ # pthreads, which work only in native builds.

32+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

33+ "--with-threads=no";

2934

35+ depsBuildBuild = [

36+ buildPackages.stdenv.cc

37+ ]

38+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

39+ pkgsBuildBuild.guile_1_8;

40+ nativeBuildInputs = [

41+ gawk

42+ makeWrapper

43+ pkg-config

44+ ];

45+ buildInputs = [

46+ libtool

47+ readline

48+ ];

3049 propagatedBuildInputs = [

3150 gmp

3251

@@ -38,7 +57,9 @@ stdenv.mkDerivation rec {

3857 ];

3958

4059 patches = [

60+ # Fix doc snarfing with GCC 4.5.

4161 ./cpp-4.5.patch

62+ # Self explanatory

4263 ./CVE-2016-8605.patch

4364 ];

4465

@@ -46,13 +67,12 @@ stdenv.mkDerivation rec {

4667 sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c

4768 '';

4869

49−

5070 postInstall = ''

5171 wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"

5272 ''

53− # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

54− # why `--with-libunistring-prefix' and similar options coming from

55− # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

73+ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

74+ # why `--with-libunistring-prefix' and similar options coming from

75+ # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

5676 + ''

5777 sed -i "$out/lib/pkgconfig/guile"-*.pc \

5878 -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"

@@ -65,19 +85,21 @@ stdenv.mkDerivation rec {

6585 doCheck = false;

6686 doInstallCheck = doCheck;

6787

68− setupHook = ./setup-hook.sh;

88+ setupHook = ./setup-hook-1.8.sh;

6989

70− meta = {

90+ meta = with lib; {

91+ homepage = "https://www.gnu.org/software/guile/";

7192 description = "Embeddable Scheme implementation";

72− homepage = "https://www.gnu.org/software/guile/";

73− license = lib.licenses.lgpl2Plus;

74− maintainers = [ lib.maintainers.ludo ];

75− platforms = lib.platforms.unix;

76−

7793 longDescription = ''

78− GNU Guile is an interpreter for the Scheme programming language,

79− packaged as a library that can be embedded into programs to make

80− them extensible. It supports many SRFIs.

94+ GNU Guile is an implementation of the Scheme programming language, with

95+ support for many SRFIs, packaged for use in a wide variety of

96+ environments. In addition to implementing the R5RS Scheme standard and a

97+ large subset of R6RS, Guile includes a module system, full access to POSIX

98+ system calls, networking support, multiple threads, dynamic linking, a

99+ foreign function call interface, and powerful string processing.

81100 '';

101+ license = licenses.lgpl3Plus;

102+ maintainers = with maintainers; [ ludo ];

103+ platforms = platforms.all;

82104 };

83105}

pkgs/development/interpreters/guile/2.0.nix+105−71

@@ -1,88 +1,123 @@

1−{ lib, stdenv, pkgsBuildBuild, buildPackages

2−, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config

3−, libffi, libtool, readline, gmp, boehmgc, libunistring

1+{ lib

2+, stdenv

3+, fetchurl

4+, fetchpatch

5+, boehmgc

6+, buildPackages

47, coverageAnalysis ? null

8+, gawk

9+, gmp

10+, libffi

11+, libtool

12+, libunistring

13+, makeWrapper

14+, pkg-config

15+, pkgsBuildBuild

16+, readline

517}:

618

7−# Do either a coverage analysis build or a standard build.

8−(if coverageAnalysis != null

9− then coverageAnalysis

10− else stdenv.mkDerivation)

11−

12−(rec {

13− name = "guile-2.0.13";

19+let

20+ # Do either a coverage analysis build or a standard build.

21+ builder = if coverageAnalysis != null

22+ then coverageAnalysis

23+ else stdenv.mkDerivation;

24+in

25+builder rec {

26+ pname = "guile";

27+ version = "2.0.13";

1428

1529 src = fetchurl {

16− url = "mirror://gnu/guile/${name}.tar.xz";

30+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";

1731 sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";

1832 };

1933

2034 outputs = [ "out" "dev" "info" ];

2135 setOutputFlags = false; # $dev gets into the library otherwise

2236

23− depsBuildBuild = [ buildPackages.stdenv.cc ]

24− ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

25− pkgsBuildBuild.guile_2_0;

26− nativeBuildInputs = [ makeWrapper gawk pkg-config ];

27− buildInputs = [ readline libtool libunistring libffi ];

37+ depsBuildBuild = [

38+ buildPackages.stdenv.cc

39+ ]

40+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

41+ pkgsBuildBuild.guile_2_0;

2842

43+ nativeBuildInputs = [

44+ makeWrapper

45+ gawk

46+ pkg-config

47+ ];

48+ buildInputs = [

49+ readline

50+ libtool

51+ libunistring

52+ libffi

53+ ];

2954 propagatedBuildInputs = [

30− gmp boehmgc

31−

32− # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'

33− # flags for them without corresponding '-L' flags. Adding them here will add

34− # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,

35− # see below.

36− libtool libunistring

55+ boehmgc

56+ gmp

57+

58+ # These ones aren't normally needed here, but `libguile*.la' has '-l'

59+ # flags for them without corresponding '-L' flags. Adding them here will

60+ # add the needed `-L' flags. As for why the `.la' file lacks the `-L'

61+ # flags, see below.

62+ libtool

63+ libunistring

3764 ];

3865

3966 enableParallelBuilding = true;

4067

41− patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch

68+ patches = [

69+ # Small fixes to Clang compiler

70+ ./clang.patch

71+ # Self-explanatory

72+ ./disable-gc-sensitive-tests.patch

73+ # Read the header of the patch to more info

74+ ./eai_system.patch

75+ # RISC-V endianness

76+ ./riscv.patch

77+ # Fixes stability issues with 00-repl-server.test

4278 (fetchpatch {

43− # Fixes stability issues with 00-repl-server.test

4479 url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";

4580 sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";

81+ })] ++

82+ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)

83+ ++ lib.optionals stdenv.isDarwin [

84+ ./filter-mkostemp-darwin.patch

85+ (fetchpatch {

86+ url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";

87+ sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";

4688 })

47− ./riscv.patch

48− ] ++

49− (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)

50− ++ lib.optionals stdenv.isDarwin [

51− (fetchpatch {

52− url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";

53− sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";

54− })

55− ./filter-mkostemp-darwin.patch

56− ];

89+ ];

5790

5891 # Explicitly link against libgcc_s, to work around the infamous

5992 # "libgcc_s.so.1 must be installed for pthread_cancel to work".

6093

6194 # don't have "libgcc_s.so.1" on darwin

62− LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";

63−

64− configureFlags = [ "--with-libreadline-prefix" ]

65− ++ lib.optionals stdenv.isSunOS [

66− # Make sure the right <gmp.h> is found, and not the incompatible

67− # /usr/include/mp.h from OpenSolaris. See

68− # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>

69− # for details.

70− "--with-libgmp-prefix=${gmp.dev}"

71−

72− # Same for these (?).

73− "--with-libreadline-prefix=${readline.dev}"

74− "--with-libunistring-prefix=${libunistring}"

75−

76− # See below.

77− "--without-threads"

78− ];

95+ LDFLAGS = lib.optionalString

96+ (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";

97+

98+ configureFlags = [

99+ "--with-libreadline-prefix"

100+ ] ++ lib.optionals stdenv.isSunOS [

101+ # Make sure the right <gmp.h> is found, and not the incompatible

102+ # /usr/include/mp.h from OpenSolaris. See

103+ # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>

104+ # for details.

105+ "--with-libgmp-prefix=${lib.getDev gmp}"

106+

107+ # Same for these (?).

108+ "--with-libreadline-prefix=${lib.getDev readline}"

109+ "--with-libunistring-prefix=${libunistring}"

110+

111+ # See below.

112+ "--without-threads"

113+ ];

79114

80115 postInstall = ''

81116 wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"

82117 ''

83− # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

84− # why `--with-libunistring-prefix' and similar options coming from

85− # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

118+ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

119+ # why `--with-libunistring-prefix' and similar options coming from

120+ # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

86121 + ''

87122 sed -i "$out/lib/pkgconfig/guile"-*.pc \

88123 -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;

@@ -90,7 +125,7 @@

90125 s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;

91126 s|includedir=$out|includedir=$dev|g

92127 "

93− '';

128+ '';

94129

95130 # make check doesn't work on darwin

96131 # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.

@@ -99,24 +134,23 @@

99134

100135 setupHook = ./setup-hook-2.0.sh;

101136

102− meta = {

137+ meta = with lib; {

138+ homepage = "https://www.gnu.org/software/guile/";

103139 description = "Embeddable Scheme implementation";

104− homepage = "https://www.gnu.org/software/guile/";

105− license = lib.licenses.lgpl3Plus;

106− maintainers = with lib.maintainers; [ ludo lovek323 ];

107− platforms = lib.platforms.all;

108−

109140 longDescription = ''

110− GNU Guile is an implementation of the Scheme programming language, with

111− support for many SRFIs, packaged for use in a wide variety of

112− environments. In addition to implementing the R5RS Scheme standard

113− and a large subset of R6RS, Guile includes a module system, full access

114− to POSIX system calls, networking support, multiple threads, dynamic

115− linking, a foreign function call interface, and powerful string

116− processing.

117− '';

141+ GNU Guile is an implementation of the Scheme programming language, with

142+ support for many SRFIs, packaged for use in a wide variety of

143+ environments. In addition to implementing the R5RS Scheme standard and

144+ a large subset of R6RS, Guile includes a module system, full access to

145+ POSIX system calls, networking support, multiple threads, dynamic

146+ linking, a foreign function call interface, and powerful string

147+ processing.

148+ '';

149+ license = licenses.lgpl3Plus;

150+ maintainers = with maintainers; [ ludo lovek323 vrthra ];

151+ platforms = platforms.all;

118152 };

119−})

153+}

120154

121155//

122156

pkgs/development/interpreters/guile/default.nix → pkgs/development/interpreters/guile/2.2.nixrenamed+74−49

@@ -1,41 +1,65 @@

1−{ lib, stdenv, pkgsBuildBuild, buildPackages

2−, fetchurl, makeWrapper, gawk, pkg-config

3−, libffi, libtool, readline, gmp, boehmgc, libunistring

4−, coverageAnalysis ? null

1+{ lib

2+, stdenv

3+, fetchurl

54, fetchpatch

5+, boehmgc

6+, buildPackages

7+, coverageAnalysis ? null

8+, gawk

9+, gmp

10+, libffi

11+, libtool

12+, libunistring

13+, makeWrapper

14+, pkg-config

15+, pkgsBuildBuild

16+, readline

617}:

718

8−# Do either a coverage analysis build or a standard build.

9−(if coverageAnalysis != null

10− then coverageAnalysis

11− else stdenv.mkDerivation)

12−

13−(rec {

14− name = "guile-${version}";

19+let

20+ # Do either a coverage analysis build or a standard build.

21+ builder = if coverageAnalysis != null

22+ then coverageAnalysis

23+ else stdenv.mkDerivation;

24+in

25+builder rec {

26+ pname = "guile";

1527 version = "2.2.7";

1628

1729 src = fetchurl {

18− url = "mirror://gnu/guile/${name}.tar.xz";

30+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";

1931 sha256 = "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd";

2032 };

2133

2234 outputs = [ "out" "dev" "info" ];

2335 setOutputFlags = false; # $dev gets into the library otherwise

2436

25− depsBuildBuild = [ buildPackages.stdenv.cc ]

26− ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

27− pkgsBuildBuild.guile;

28− nativeBuildInputs = [ makeWrapper gawk pkg-config ];

29− buildInputs = [ readline libtool libunistring libffi ];

30−

37+ depsBuildBuild = [

38+ buildPackages.stdenv.cc

39+ ]

40+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

41+ pkgsBuildBuild.guile;

42+ nativeBuildInputs = [

43+ gawk

44+ makeWrapper

45+ pkg-config

46+ ];

47+ buildInputs = [

48+ libffi

49+ libtool

50+ libunistring

51+ readline

52+ ];

3153 propagatedBuildInputs = [

32− gmp boehmgc

54+ boehmgc

55+ gmp

3356

3457 # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'

3558 # flags for them without corresponding '-L' flags. Adding them here will add

3659 # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,

3760 # see below.

38− libtool libunistring

61+ libtool

62+ libunistring

3963 ];

4064

4165 # According to Bernhard M. Wiedemann <bwiedemann suse de> on

@@ -47,9 +71,11 @@

4771 enableParallelBuilding = false;

4872

4973 patches = [

74+ # Read the header of the patch to more info

5075 ./eai_system.patch

5176 ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch

52− ++ lib.optional stdenv.isDarwin (fetchpatch {

77+ ++ lib.optional stdenv.isDarwin

78+ (fetchpatch {

5379 url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";

5480 sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";

5581 });

@@ -61,27 +87,28 @@

6187 LDFLAGS = lib.optionalString

6288 (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";

6389

64− configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]

65− ++ lib.optionals stdenv.isSunOS [

66− # Make sure the right <gmp.h> is found, and not the incompatible

67− # /usr/include/mp.h from OpenSolaris. See

68− # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>

69− # for details.

70− "--with-libgmp-prefix=${gmp.dev}"

90+ configureFlags = [

91+ "--with-libreadline-prefix=${lib.getDev readline}"

92+ ] ++ lib.optionals stdenv.isSunOS [

93+ # Make sure the right <gmp.h> is found, and not the incompatible

94+ # /usr/include/mp.h from OpenSolaris. See

95+ # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>

96+ # for details.

97+ "--with-libgmp-prefix=${lib.getDev gmp}"

7198

72− # Same for these (?).

73− "--with-libunistring-prefix=${libunistring}"

99+ # Same for these (?).

100+ "--with-libunistring-prefix=${libunistring}"

74101

75− # See below.

76− "--without-threads"

77− ];

102+ # See below.

103+ "--without-threads"

104+ ];

78105

79106 postInstall = ''

80107 wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"

81108 ''

82− # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

83− # why `--with-libunistring-prefix' and similar options coming from

84− # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

109+ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

110+ # why `--with-libunistring-prefix' and similar options coming from

111+ # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

85112 + ''

86113 sed -i "$out/lib/pkgconfig/guile"-*.pc \

87114 -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;

@@ -89,7 +116,7 @@

89116 s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;

90117 s|includedir=$out|includedir=$dev|g

91118 "

92− '';

119+ '';

93120

94121 # make check doesn't work on darwin

95122 # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.

@@ -98,21 +125,19 @@

98125

99126 setupHook = ./setup-hook-2.2.sh;

100127

101− meta = {

128+ meta = with lib; {

129+ homepage = "https://www.gnu.org/software/guile/";

102130 description = "Embeddable Scheme implementation";

103− homepage = "https://www.gnu.org/software/guile/";

104− license = lib.licenses.lgpl3Plus;

105− maintainers = with lib.maintainers; [ ludo lovek323 vrthra ];

106− platforms = lib.platforms.all;

107−

108131 longDescription = ''

109132 GNU Guile is an implementation of the Scheme programming language, with

110133 support for many SRFIs, packaged for use in a wide variety of

111− environments. In addition to implementing the R5RS Scheme standard

112− and a large subset of R6RS, Guile includes a module system, full access

113− to POSIX system calls, networking support, multiple threads, dynamic

114− linking, a foreign function call interface, and powerful string

115− processing.

134+ environments. In addition to implementing the R5RS Scheme standard and a

135+ large subset of R6RS, Guile includes a module system, full access to POSIX

136+ system calls, networking support, multiple threads, dynamic linking, a

137+ foreign function call interface, and powerful string processing.

116138 '';

139+ license = licenses.lgpl3Plus;

140+ maintainers = with maintainers; [ ludo lovek323 vrthra ];

141+ platforms = platforms.all;

117142 };

118−})

143+}

pkgs/development/interpreters/guile/3.0.nixnew file+141

@@ -0,0 +1,141 @@

1+{ lib

2+, stdenv

3+, fetchurl

4+, fetchpatch

5+, boehmgc

6+, buildPackages

7+, coverageAnalysis ? null

8+, gawk

9+, gmp

10+, libffi

11+, libtool

12+, libunistring

13+, makeWrapper

14+, pkg-config

15+, pkgsBuildBuild

16+, readline

17+}:

18+

19+let

20+ # Do either a coverage analysis build or a standard build.

21+ builder = if coverageAnalysis != null

22+ then coverageAnalysis

23+ else stdenv.mkDerivation;

24+in

25+builder rec {

26+ pname = "guile";

27+ version = "3.0.7";

28+

29+ src = fetchurl {

30+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";

31+ sha256 = "sha256-9X2GxwYgJxv863qb4MgXRKAz8IrcfOuoMsmRerPmkbc=";

32+ };

33+

34+ outputs = [ "out" "dev" "info" ];

35+ setOutputFlags = false; # $dev gets into the library otherwise

36+

37+ depsBuildBuild = [

38+ buildPackages.stdenv.cc

39+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

40+ pkgsBuildBuild.guile;

41+ nativeBuildInputs = [

42+ gawk

43+ makeWrapper

44+ pkg-config

45+ ];

46+ buildInputs = [

47+ libffi

48+ libtool

49+ libunistring

50+ readline

51+ ];

52+ propagatedBuildInputs = [

53+ boehmgc

54+ gmp

55+

56+ # These ones aren't normally needed here, but `libguile*.la' has '-l'

57+ # flags for them without corresponding '-L' flags. Adding them here will

58+ # add the needed `-L' flags. As for why the `.la' file lacks the `-L'

59+ # flags, see below.

60+ libtool

61+ libunistring

62+ ];

63+

64+ # According to Bernhard M. Wiedemann <bwiedemann suse de> on

65+ # #reproducible-builds on irc.oftc.net, (2020-01-29): they had to build

66+ # Guile without parallel builds to make it reproducible.

67+ #

68+ # re: https://issues.guix.gnu.org/issue/20272

69+ # re: https://build.opensuse.org/request/show/732638

70+ enableParallelBuilding = false;

71+

72+ patches = [

73+ ./eai_system.patch

74+ ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch

75+ ++ lib.optional stdenv.isDarwin

76+ (fetchpatch {

77+ url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";

78+ sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";

79+ });

80+

81+ # Explicitly link against libgcc_s, to work around the infamous

82+ # "libgcc_s.so.1 must be installed for pthread_cancel to work".

83+

84+ # don't have "libgcc_s.so.1" on darwin

85+ LDFLAGS = lib.optionalString

86+ (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";

87+

88+ configureFlags = [

89+ "--with-libreadline-prefix=${lib.getDev readline}"

90+ ] ++ lib.optionals stdenv.isSunOS [

91+ # Make sure the right <gmp.h> is found, and not the incompatible

92+ # /usr/include/mp.h from OpenSolaris. See

93+ # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>

94+ # for details.

95+ "--with-libgmp-prefix=${lib.getDev gmp}"

96+

97+ # Same for these (?).

98+ "--with-libunistring-prefix=${libunistring}"

99+

100+ # See below.

101+ "--without-threads"

102+ ];

103+

104+ postInstall = ''

105+ wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"

106+ ''

107+ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for

108+ # why `--with-libunistring-prefix' and similar options coming from

109+ # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.

110+ + ''

111+ sed -i "$out/lib/pkgconfig/guile"-*.pc \

112+ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;

113+ s|^Cflags:$.*$$|Cflags: -I${libunistring}/include \1|g ;

114+ s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;

115+ s|includedir=$out|includedir=$dev|g

116+ "

117+ '';

118+

119+ # make check doesn't work on darwin

120+ # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.

121+ doCheck = false;

122+ doInstallCheck = doCheck;

123+

124+ setupHook = ./setup-hook-3.0.sh;

125+

126+ meta = with lib; {

127+ homepage = "https://www.gnu.org/software/guile/";

128+ description = "Embeddable Scheme implementation";

129+ longDescription = ''

130+ GNU Guile is an implementation of the Scheme programming language, with

131+ support for many SRFIs, packaged for use in a wide variety of

132+ environments. In addition to implementing the R5RS Scheme standard and a

133+ large subset of R6RS, Guile includes a module system, full access to POSIX

134+ system calls, networking support, multiple threads, dynamic linking, a

135+ foreign function call interface, and powerful string processing.

136+ '';

137+ license = licenses.lgpl3Plus;

138+ maintainers = with maintainers; [ ludo lovek323 vrthra ];

139+ platforms = platforms.all;

140+ };

141+}

pkgs/development/interpreters/guile/setup-hook.sh → pkgs/development/interpreters/guile/setup-hook-1.8.shrenamed+1−2

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

11addGuileLibPath () {

2− if test -d "$1/share/guile/site"

3− then

2+ if test -d "$1/share/guile/site"; then

43 export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

54 fi

65}

pkgs/development/interpreters/guile/setup-hook-2.0.sh+4−8

@@ -1,21 +1,17 @@

11addGuileLibPath () {

2− if test -d "$1/share/guile/site/2.0"

3− then

2+ if test -d "$1/share/guile/site/2.0"; then

43 export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"

54 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"

6− elif test -d "$1/share/guile/site"

7− then

5+ elif test -d "$1/share/guile/site"; then

86 export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

97 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"

108 fi

119

12− if test -d "$1/lib/guile/2.0/ccache"

13− then

10+ if test -d "$1/lib/guile/2.0/ccache"; then

1411 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/ccache"

1512 fi

1613

17− if test -d "$1/lib/guile/2.0/site-ccache"

18− then

14+ if test -d "$1/lib/guile/2.0/site-ccache"; then

1915 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/site-ccache"

2016 fi

2117}

pkgs/development/interpreters/guile/setup-hook-2.2.sh+4−8

@@ -1,21 +1,17 @@

11addGuileLibPath () {

2− if test -d "$1/share/guile/site/2.2"

3− then

2+ if test -d "$1/share/guile/site/2.2"; then

43 export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"

54 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"

6− elif test -d "$1/share/guile/site"

7− then

5+ elif test -d "$1/share/guile/site"; then

86 export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

97 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"

108 fi

119

12− if test -d "$1/lib/guile/2.2/ccache"

13− then

10+ if test -d "$1/lib/guile/2.2/ccache"; then

1411 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/ccache"

1512 fi

1613

17− if test -d "$1/lib/guile/2.2/site-ccache"

18− then

14+ if test -d "$1/lib/guile/2.2/site-ccache"; then

1915 export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/site-ccache"

2016 fi

2117}

pkgs/development/interpreters/guile/setup-hook-3.0.shnew file+19

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

1+addGuileLibPath () {

2+ if test -d "$1/share/guile/site/3.0"; then

3+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0"

4+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0"

5+ elif test -d "$1/share/guile/site"; then

6+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

7+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"

8+ fi

10+ if test -d "$1/lib/guile/3.0/ccache"; then

11+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/ccache"

12+ fi

13+

14+ if test -d "$1/lib/guile/3.0/site-ccache"; then

15+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/site-ccache"

16+ fi

17+}

18+

19+addEnvHooks "$hostOffset" addGuileLibPath

pkgs/development/interpreters/python/cpython/default.nix+4−1

@@ -284,7 +284,10 @@ in with passthru; stdenv.mkDerivation {

284284 CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);

285285 LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);

286286 LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";

287− NIX_LDFLAGS = optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "-lgcc_s" + optionalString stdenv.hostPlatform.isMusl "-lgcc_eh";

287+ NIX_LDFLAGS = lib.optionalString stdenv.cc.isGNU ({

288+ "glibc" = "-lgcc_s";

289+ "musl" = "-lgcc_eh";

290+ }."${stdenv.hostPlatform.libc}" or "");

288291 # Determinism: We fix the hashes of str, bytes and datetime objects.

289292 PYTHONHASHSEED=0;

290293

pkgs/development/interpreters/python/default.nix+7−20

@@ -37,7 +37,7 @@ with pkgs;

3737 keep = self: {

3838 # TODO maybe only define these here so nothing is needed to be kept in sync.

3939 inherit (self)

40− isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder

40+ isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy3k isPyPy pythonAtLeast pythonOlder

4141 python bootstrapped-pip buildPythonPackage buildPythonApplication

4242 fetchPypi

4343 hasPythonModule requiredPythonModules makePythonPath disabledIf

@@ -123,10 +123,10 @@ with pkgs;

123123 sourceVersion = {

124124 major = "3";

125125 minor = "8";

126− patch = "11";

126+ patch = "12";

127127 suffix = "";

128128 };

129− sha256 = "1chg8b0m1yrz50lizid20zha0dmj40z0iih3jqcrg7pyxca126pv";

129+ sha256 = "1si8hw2xpagh4iji89zdx69p3dv5mjqwwbx2x2sl6lrp41jaglxi";

130130 };

131131 python39 = {

132132 sourceVersion = {

@@ -154,28 +154,15 @@ in {

154154 inherit passthruFun;

155155 };

156156

157− python36 = callPackage ./cpython {

158− self = python36;

159− sourceVersion = {

160− major = "3";

161− minor = "6";

162− patch = "14";

163− suffix = "";

164− };

165− sha256 = "1bnm0bx7xf1jpfm0bmzlq19vwm0bvcbl7klx4rvgq05xryhafqr6";

166− inherit (darwin) configd;

167− inherit passthruFun;

168− };

169−

170157 python37 = callPackage ./cpython {

171158 self = python37;

172159 sourceVersion = {

173160 major = "3";

174161 minor = "7";

175− patch = "11";

162+ patch = "12";

176163 suffix = "";

177164 };

178− sha256 = "0d57b5a47wapzpkkq5rbvvi4caylc35j5910b64rxxn4nmm1kd6x";

165+ sha256 = "041jqjl5wf7gsw84zd3jgvg91skq20l2fy5zbhz237w38zxzfyzp";

179166 inherit (darwin) configd;

180167 inherit passthruFun;

181168 };

@@ -198,9 +185,9 @@ in {

198185 major = "3";

199186 minor = "10";

200187 patch = "0";

201− suffix = "rc1";

188+ suffix = "";

202189 };

203− sha256 = "0f76q6rsvbvrzcnsp0k7sp555krrgvjpcd09l1rybl4249ln2w3r";

190+ sha256 = "00mhn6kj4qkvkkv6hh2klnnjr0yk0c9hspp7njc7n6m1lvkzi6as";

204191 inherit (darwin) configd;

205192 inherit passthruFun;

206193 };

pkgs/development/interpreters/spidermonkey/78.nix+2−2

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

1515, rustc

1616, rust-cbindgen

1717, yasm

18−, llvmPackages_11

18+, llvmPackages_12

1919, nspr

2020}:

2121

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

4343 nativeBuildInputs = [

4444 autoconf213

4545 cargo

46− llvmPackages_11.llvm # for llvm-objdump

46+ llvmPackages_12.llvm # for llvm-objdump

4747 perl

4848 pkg-config

4949 python3

pkgs/development/interpreters/tcl/mk-tcl-derivation.nix+1−1

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

3232 defaultTclPkgConfigureFlags = [

3333 "--with-tcl=${tcl}/lib"

3434 "--with-tclinclude=${tcl}/include"

35− "--exec-prefix=\${out}"

35+ "--exec-prefix=${placeholder "out"}"

3636 ];

3737

3838 self = (stdenv.mkDerivation ((builtins.removeAttrs attrs [

pkgs/development/libraries/boehm-gc/7.6.6.nixdeleted−74

@@ -1,74 +0,0 @@

1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libatomic_ops

2−, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179

3−}:

4−

5−stdenv.mkDerivation rec {

6− pname = "boehm-gc";

7− version = "7.6.6";

8−

9− src = fetchurl {

10− urls = [

11− "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"

12− "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"

13− ];

14− sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";

15− };

16−

17− buildInputs = [ libatomic_ops ];

18− nativeBuildInputs = [ pkg-config ];

19−

20− outputs = [ "out" "dev" "doc" ];

21− separateDebugInfo = stdenv.isLinux;

22−

23− preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''

24− export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"

25− '';

26−

27− patches = [ (fetchpatch {

28− url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";

29− sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";

30− }) ] ++

31− # https://github.com/ivmai/bdwgc/pull/208

32− lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;

33−

34− configureFlags =

35− [ "--enable-cplusplus" ]

36− ++ lib.optional enableLargeConfig "--enable-large-config"

37− ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";

38−

39− doCheck = true; # not cross;

40−

41− # Don't run the native `strip' when cross-compiling.

42− dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;

43−

44− enableParallelBuilding = true;

45−

46− meta = {

47− description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";

48−

49− longDescription = ''

50− The Boehm-Demers-Weiser conservative garbage collector can be used as a

51− garbage collecting replacement for C malloc or C++ new. It allows you

52− to allocate memory basically as you normally would, without explicitly

53− deallocating memory that is no longer useful. The collector

54− automatically recycles memory when it determines that it can no longer

55− be otherwise accessed.

56−

57− The collector is also used by a number of programming language

58− implementations that either use C as intermediate code, want to

59− facilitate easier interoperation with C libraries, or just prefer the

60− simple collector interface.

61−

62− Alternatively, the garbage collector may be used as a leak detector for

63− C or C++ programs, though that is not its primary goal.

64− '';

65−

66− homepage = "https://hboehm.info/gc/";

67−

68− # non-copyleft, X11-style license

69− license = "https://hboehm.info/gc/license.txt";

70−

71− maintainers = [ ];

72− platforms = lib.platforms.all;

73− };

74−}

pkgs/development/libraries/boehm-gc/default.nix+5−7

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

11{ lib, stdenv, fetchurl

22, autoreconfHook

3−, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179

3+, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros#L195

44}:

66stdenv.mkDerivation rec {

77 pname = "boehm-gc";

8− version = "8.0.4";

8+ version = "8.0.6";

1010 src = fetchurl {

1111 urls = [

1212 "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"

1313 "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"

1414 ];

15− sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";

15+ sha256 = "3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11";

1616 };

1717

1818 outputs = [ "out" "dev" "doc" ];

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

2222 export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"

2323 '';

2424

25− patches = # https://github.com/ivmai/bdwgc/pull/208

26− lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch

27− # boehm-gc whitelists GCC threading models

28− ++ lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;

25+ # boehm-gc whitelists GCC threading models

26+ patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;

2927

3028 configureFlags =

3129 [ "--enable-cplusplus" "--with-libatomic-ops=none" ]

pkgs/development/libraries/boehm-gc/riscv.patchdeleted−53

@@ -1,53 +0,0 @@

1−diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h

2−index a8e55dd2..439cc88d 100644

3−--- a/include/private/gcconfig.h

4−+++ b/include/private/gcconfig.h

5−@@ -650,6 +650,15 @@

6− # endif

7− # define mach_type_known

8− # endif

9−+# if defined(__riscv) && defined(LINUX)

10−+# if __riscv_xlen == 32

11−+# define RISCV32

12−+# define mach_type_known

13−+# elif __riscv_xlen == 64

14−+# define RISCV64

15−+# define mach_type_known

16−+# endif

17−+# endif

18−

19− # if defined(SN_TARGET_PSP2)

20− # define mach_type_known

21−@@ -2970,6 +2979,32 @@

22− # endif

23− # endif

24−

25−+# ifdef RISCV32

26−+# define CPP_WORDSZ 32

27−+# define MACH_TYPE "RISC-V 32"

28−+# define ALIGNMENT 4

29−+# ifdef LINUX

30−+# define OS_TYPE "LINUX"

31−+ extern int __data_start[];

32−+# define DATASTART ((ptr_t)__data_start)

33−+# define LINUX_STACKBOTTOM

34−+# define DYNAMIC_LOADING

35−+# endif

36−+# endif

37−+

38−+# ifdef RISCV64

39−+# define CPP_WORDSZ 64

40−+# define MACH_TYPE "RISC-V 64"

41−+# define ALIGNMENT 8

42−+# ifdef LINUX

43−+# define OS_TYPE "LINUX"

44−+ extern int __data_start[];

45−+# define DATASTART ((ptr_t)__data_start)

46−+# define LINUX_STACKBOTTOM

47−+# define DYNAMIC_LOADING

48−+# endif

49−+# endif

50−+

51− #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES)

52− /* Use glibc's stack-end marker. */

53− # define USE_LIBC_PRIVATES

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

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

66stdenv.mkDerivation rec {

77 pname = "libgit2";

8− version = "1.1.1";

8+ version = "1.3.0";

99 # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib

1010

1111 src = fetchFromGitHub {

1212 owner = "libgit2";

1313 repo = "libgit2";

1414 rev = "v${version}";

15− sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc=";

15+ sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920=";

1616 };

1717

1818 cmakeFlags = [

pkgs/development/libraries/glibc/2.33-master.patch.gz

Binary file not shown.

pkgs/development/libraries/glibc/common.nix+2−2

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

4242

4343let

4444 version = "2.33";

45− patchSuffix = "-50";

45+ patchSuffix = "-55";

4646 sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";

4747in

4848

@@ -61,7 +61,7 @@ stdenv.mkDerivation ({

6161 [

6262 /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.

6363 $ git fetch --all -p && git checkout origin/release/2.33/master && git describe

64− glibc-2.33-50-gc6cadbf83a

64+ glibc-2.33-55-g4b95183785

6565 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz

6666

6767 To compare the archive contents zdiff can be used.

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

@@ -21,11 +21,11 @@ in

2121

2222stdenv.mkDerivation rec {

2323 pname = "gtk+";

24− version = "2.24.32";

24+ version = "2.24.33";

2525

2626 src = fetchurl {

2727 url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz";

28− sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e";

28+ sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto=";

2929 };

3030

3131 outputs = [ "out" "dev" "devdoc" ];

pkgs/development/libraries/kde-frameworks/fetch.sh+1−1

@@ -1 +1 @@

1−WGET_ARGS=( https://download.kde.org/stable/frameworks/5.86/ -A '*.tar.xz' )

1+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.87/ -A '*.tar.xz' )

pkgs/development/libraries/kde-frameworks/karchive.nix+2−2

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

11{

22 mkDerivation,

33 extra-cmake-modules,

4− bzip2, xz, qtbase, zlib,

4+ bzip2, xz, qtbase, zlib, zstd

55}:

77mkDerivation {

88 name = "karchive";

99 nativeBuildInputs = [ extra-cmake-modules ];

10− buildInputs = [ bzip2 xz zlib ];

10+ buildInputs = [ bzip2 xz zlib zstd ];

1111 propagatedBuildInputs = [ qtbase ];

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

1313}

pkgs/development/libraries/kde-frameworks/kcontacts.nix+4−1

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

11{

22 mkDerivation, lib,

3− extra-cmake-modules,

3+ extra-cmake-modules, isocodes,

44 kcoreaddons, kconfig, kcodecs, ki18n, qtbase,

55}:

@@ -9,6 +9,9 @@ mkDerivation {

99 meta = {

1010 license = [ lib.licenses.lgpl21 ];

1111 };

12+ propagatedBuildInputs = [

13+ isocodes

14+ ];

1215 nativeBuildInputs = [ extra-cmake-modules ];

1316 buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];

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

pkgs/development/libraries/kde-frameworks/kded.nix+2−2

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

11{

22 mkDerivation, propagate, wrapGAppsHook,

33 extra-cmake-modules, kdoctools,

4− gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit,

4+ gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons,

55 kservice, qtbase,

66}:

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

99 name = "kded";

1010 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

1111 buildInputs = [

12− gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit

12+ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons

1313 kservice qtbase

1414 ];

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

pkgs/development/libraries/kde-frameworks/kio/default.nix+10−6

@@ -1,23 +1,27 @@

11{

2− mkDerivation, fetchpatch,

3− util-linux, extra-cmake-modules, kdoctools, qttools,

2+ stdenv, lib, mkDerivation, fetchpatch,

3+ extra-cmake-modules, kdoctools, qttools,

4+ acl, attr, libkrb5, util-linux,

45 karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,

56 kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,

67 kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,

7− qtbase, qtscript, qtx11extras, solid, kcrash

8+ qtbase, qtscript, qtx11extras, solid, kcrash, kded

89}:

910

1011mkDerivation {

1112 name = "kio";

1213 nativeBuildInputs = [ extra-cmake-modules kdoctools ];

1314 buildInputs = [

14− util-linux karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications

15+ karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications

1516 ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras

16− kcrash

17+ kcrash libkrb5

18+ ] ++ lib.lists.optionals stdenv.isLinux [

19+ acl attr # both are needed for ACL support

20+ util-linux # provides libmount

1721 ];

1822 propagatedBuildInputs = [

1923 kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice

20− kxmlgui qtbase qttools solid

24+ kxmlgui qtbase qttools solid kded

2125 ];

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

2327 patches = [

pkgs/development/libraries/kde-frameworks/knewstuff/default.nix+2−2

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

33 extra-cmake-modules,

44 attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,

55 kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,

6− qtdeclarative, kirigami2,

6+ qtdeclarative, kirigami2, syndication,

77}:

99mkDerivation {

@@ -12,7 +12,7 @@ mkDerivation {

1212 buildInputs = [

1313 karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews

1414 kpackage

15− ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2

15+ ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 syndication

1616 ];

1717 propagatedBuildInputs = [ attica kservice kxmlgui ];

1818 patches = [

pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch+1−1

@@ -12,7 +12,7 @@ diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp

1212index f03d882..d5aee56 100644

1313--- a/src/kpackage/packageloader.cpp

1414+++ b/src/kpackage/packageloader.cpp

15−@@ -210,7 +210,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,

15+@@ -196,7 +196,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,

1616 }

1717

1818 for (auto const &plugindir : std::as_const(paths)) {

pkgs/development/libraries/kde-frameworks/purpose.nix+6−6

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

11{

2− mkDerivation, extra-cmake-modules, qtbase

3−, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2

4−, fetchpatch

2+ mkDerivation, extra-cmake-modules, intltool, qtbase

3+, accounts-qt, qtdeclarative, kaccounts-integration, kconfig, kcoreaddons, ki18n, kio, kirigami2

4+, fetchpatch, signond

55}:

77mkDerivation {

88 name = "purpose";

9− nativeBuildInputs = [ extra-cmake-modules ];

9+ nativeBuildInputs = [ extra-cmake-modules intltool ];

1010 buildInputs = [

11− qtbase qtdeclarative kconfig kcoreaddons

12− ki18n kio kirigami2

11+ qtbase accounts-qt qtdeclarative kaccounts-integration kconfig kcoreaddons

12+ ki18n kio kirigami2 signond

1313 ];

1414}

pkgs/development/libraries/kde-frameworks/srcs.nix+332−332

@@ -4,667 +4,667 @@

55{

66 attica = {

7− version = "5.86.0";

7+ version = "5.87.0";

88 src = fetchurl {

9− url = "${mirror}/stable/frameworks/5.86/attica-5.86.0.tar.xz";

10− sha256 = "0zs61q7wigsqj2wy6hnl7d100f7n0va8cf6b7nk832sq8cvzwbwr";

11− name = "attica-5.86.0.tar.xz";

9+ url = "${mirror}/stable/frameworks/5.87/attica-5.87.0.tar.xz";

10+ sha256 = "0wjfrlmwg03js544xjlpznxxqv14cj40fpzbfnlj24kjgd1ai8dq";

11+ name = "attica-5.87.0.tar.xz";

1212 };

1313 };

1414 baloo = {

15− version = "5.86.0";

15+ version = "5.87.0";

1616 src = fetchurl {

17− url = "${mirror}/stable/frameworks/5.86/baloo-5.86.0.tar.xz";

18− sha256 = "0z59zzvjzm4s751dklbv15ngrcrp05fzrqxvn32pawxiksfn1kj7";

19− name = "baloo-5.86.0.tar.xz";

17+ url = "${mirror}/stable/frameworks/5.87/baloo-5.87.0.tar.xz";

18+ sha256 = "0h55hn6klsq19l44qzc95l1r7hx2zr9hr4ysxd8kvcxc02imaswb";

19+ name = "baloo-5.87.0.tar.xz";

2020 };

2121 };

2222 bluez-qt = {

23− version = "5.86.0";

23+ version = "5.87.0";

2424 src = fetchurl {

25− url = "${mirror}/stable/frameworks/5.86/bluez-qt-5.86.0.tar.xz";

26− sha256 = "1zk1432mi3di25v3j2g1psxnxr3gqwa1bs5jx0cgn54hnbwdw3nl";

27− name = "bluez-qt-5.86.0.tar.xz";

25+ url = "${mirror}/stable/frameworks/5.87/bluez-qt-5.87.0.tar.xz";

26+ sha256 = "1shk3riddgdb0i6f0603hbhww13z1b566rdaplxsbgk8cyhl5acz";

27+ name = "bluez-qt-5.87.0.tar.xz";

2828 };

2929 };

3030 breeze-icons = {

31− version = "5.86.0";

31+ version = "5.87.0";

3232 src = fetchurl {

33− url = "${mirror}/stable/frameworks/5.86/breeze-icons-5.86.0.tar.xz";

34− sha256 = "1dpf99szf0m92r1mxgb0sdzsb5x00braq2f0di51zdmkkp8b7xmw";

35− name = "breeze-icons-5.86.0.tar.xz";

33+ url = "${mirror}/stable/frameworks/5.87/breeze-icons-5.87.0.tar.xz";

34+ sha256 = "19f7n4r6b0b1l8hc79xbj8gc18xf488bk4i0wdbw22x9vwl4h58h";

35+ name = "breeze-icons-5.87.0.tar.xz";

3636 };

3737 };

3838 extra-cmake-modules = {

39− version = "5.86.0";

39+ version = "5.87.0";

4040 src = fetchurl {

41− url = "${mirror}/stable/frameworks/5.86/extra-cmake-modules-5.86.0.tar.xz";

42− sha256 = "1dbazs15gyyc921vf0lqgjpnqikrqcc39qysw8sgx7krqp6mrk5a";

43− name = "extra-cmake-modules-5.86.0.tar.xz";

41+ url = "${mirror}/stable/frameworks/5.87/extra-cmake-modules-5.87.0.tar.xz";

42+ sha256 = "1axwz0p3ggjpcxpqqlyng3fa2pxmjxgybncgkp8i81i7iq6sf72l";

43+ name = "extra-cmake-modules-5.87.0.tar.xz";

4444 };

4545 };

4646 frameworkintegration = {

47− version = "5.86.0";

47+ version = "5.87.0";

4848 src = fetchurl {

49− url = "${mirror}/stable/frameworks/5.86/frameworkintegration-5.86.0.tar.xz";

50− sha256 = "0s966pmmykq9dkjhid6wh99v9h3dl5qjdxzyn155higz7p67finl";

51− name = "frameworkintegration-5.86.0.tar.xz";

49+ url = "${mirror}/stable/frameworks/5.87/frameworkintegration-5.87.0.tar.xz";

50+ sha256 = "1bbgxqgy28abrk2cgzj7k2m18xmkl9kw58dal03pzlmh77br00lb";

51+ name = "frameworkintegration-5.87.0.tar.xz";

5252 };

5353 };

5454 kactivities = {

55− version = "5.86.0";

55+ version = "5.87.0";

5656 src = fetchurl {

57− url = "${mirror}/stable/frameworks/5.86/kactivities-5.86.0.tar.xz";

58− sha256 = "1rmp5kxq2dwxg4a7m06ylibqzv7b95slmmllxpm53z7jn1ab7l35";

59− name = "kactivities-5.86.0.tar.xz";

57+ url = "${mirror}/stable/frameworks/5.87/kactivities-5.87.0.tar.xz";

58+ sha256 = "1ynngg9x70dwcnn4ncf7h63hj5p187d4mk1aqriax0iz21mfjmp9";

59+ name = "kactivities-5.87.0.tar.xz";

6060 };

6161 };

6262 kactivities-stats = {

63− version = "5.86.0";

63+ version = "5.87.0";

6464 src = fetchurl {

65− url = "${mirror}/stable/frameworks/5.86/kactivities-stats-5.86.0.tar.xz";

66− sha256 = "16wlj7yvjnmv875srcvkqgi9ww80pbj7dc9b6z53rbyr5lczlirh";

67− name = "kactivities-stats-5.86.0.tar.xz";

65+ url = "${mirror}/stable/frameworks/5.87/kactivities-stats-5.87.0.tar.xz";

66+ sha256 = "1n7jzbfwgwclnrnssxm180fis74qp3v9nximhc0l8fmb8ac1f106";

67+ name = "kactivities-stats-5.87.0.tar.xz";

6868 };

6969 };

7070 kapidox = {

71− version = "5.86.0";

71+ version = "5.87.0";

7272 src = fetchurl {

73− url = "${mirror}/stable/frameworks/5.86/kapidox-5.86.0.tar.xz";

74− sha256 = "123j3vy1rqigwd6kpjvk7gsrfra7ghv4qcplxqxrld27a95p8l0s";

75− name = "kapidox-5.86.0.tar.xz";

73+ url = "${mirror}/stable/frameworks/5.87/kapidox-5.87.0.tar.xz";

74+ sha256 = "0iyla9i4ln6w9wkm4dand53ir6gzsm4180diwi9p2q5mfrk0rvja";

75+ name = "kapidox-5.87.0.tar.xz";

7676 };

7777 };

7878 karchive = {

79− version = "5.86.0";

79+ version = "5.87.0";

8080 src = fetchurl {

81− url = "${mirror}/stable/frameworks/5.86/karchive-5.86.0.tar.xz";

82− sha256 = "17bfc6sazckw6bhdz902b2lqnq0p13b60rybqclvifkif6hb1gqk";

83− name = "karchive-5.86.0.tar.xz";

81+ url = "${mirror}/stable/frameworks/5.87/karchive-5.87.0.tar.xz";

82+ sha256 = "0d8wqrynwmqazlf5v7qas9akrvcwr4lrqg3dcbnq61mmc252wgqh";

83+ name = "karchive-5.87.0.tar.xz";

8484 };

8585 };

8686 kauth = {

87− version = "5.86.0";

87+ version = "5.87.0";

8888 src = fetchurl {

89− url = "${mirror}/stable/frameworks/5.86/kauth-5.86.0.tar.xz";

90− sha256 = "171f1sz1jn84b9z5c56fa12bcld2a5n5vmhmla0fxcm6ry5nygd6";

91− name = "kauth-5.86.0.tar.xz";

89+ url = "${mirror}/stable/frameworks/5.87/kauth-5.87.0.tar.xz";

90+ sha256 = "1gbq487v2nn0zyis6xdvsn0mz7yy131vafq76jdi7b6nyh5c1lgi";

91+ name = "kauth-5.87.0.tar.xz";

9292 };

9393 };

9494 kbookmarks = {

95− version = "5.86.0";

95+ version = "5.87.0";

9696 src = fetchurl {

97− url = "${mirror}/stable/frameworks/5.86/kbookmarks-5.86.0.tar.xz";

98− sha256 = "1a0694cjnh9ipx34v009s4dxkz41z0483kfnx2cjj8p81rsil2jh";

99− name = "kbookmarks-5.86.0.tar.xz";

97+ url = "${mirror}/stable/frameworks/5.87/kbookmarks-5.87.0.tar.xz";

98+ sha256 = "0klws0psdq9vx09p38ckki7aqbdkcns1smk8ckj79krpsjv8q9nx";

99+ name = "kbookmarks-5.87.0.tar.xz";

100100 };

101101 };

102102 kcalendarcore = {

103− version = "5.86.0";

103+ version = "5.87.0";

104104 src = fetchurl {

105− url = "${mirror}/stable/frameworks/5.86/kcalendarcore-5.86.0.tar.xz";

106− sha256 = "1d5j1ka158qy235rvn4q6463arg3fm4qdnwzigap2d0fcmxfsfcn";

107− name = "kcalendarcore-5.86.0.tar.xz";

105+ url = "${mirror}/stable/frameworks/5.87/kcalendarcore-5.87.0.tar.xz";

106+ sha256 = "0ig2w0dxrf9ih9hqk5rvqqmyhg658m1hs4807zl66llplkr58q0n";

107+ name = "kcalendarcore-5.87.0.tar.xz";

108108 };

109109 };

110110 kcmutils = {

111− version = "5.86.0";

111+ version = "5.87.0";

112112 src = fetchurl {

113− url = "${mirror}/stable/frameworks/5.86/kcmutils-5.86.0.tar.xz";

114− sha256 = "0k6awhrws7v99lndy9kfh9fsrbsbb8hga6yza93m58q10kk9g1x8";

115− name = "kcmutils-5.86.0.tar.xz";

113+ url = "${mirror}/stable/frameworks/5.87/kcmutils-5.87.0.tar.xz";

114+ sha256 = "09pcif2gmkbhwqb8cxfs89nw81wdpdsd4a2n7xdm1xz6lpwwmk1h";

115+ name = "kcmutils-5.87.0.tar.xz";

116116 };

117117 };

118118 kcodecs = {

119− version = "5.86.0";

119+ version = "5.87.0";

120120 src = fetchurl {

121− url = "${mirror}/stable/frameworks/5.86/kcodecs-5.86.0.tar.xz";

122− sha256 = "0crbnik03d98vywr31np6flzhhwv66qgrdmc7faklavkk5bwp5i0";

123− name = "kcodecs-5.86.0.tar.xz";

121+ url = "${mirror}/stable/frameworks/5.87/kcodecs-5.87.0.tar.xz";

122+ sha256 = "1fb8agbkwxnxb0hlzz0ya460z3ihn9qz2zvjdxvk21rjhmp1alh7";

123+ name = "kcodecs-5.87.0.tar.xz";

124124 };

125125 };

126126 kcompletion = {

127− version = "5.86.0";

127+ version = "5.87.0";

128128 src = fetchurl {

129− url = "${mirror}/stable/frameworks/5.86/kcompletion-5.86.0.tar.xz";

130− sha256 = "19l6paczba2l548jd5czcjd88fdr69vlc50izs353q1r89aqkiny";

131− name = "kcompletion-5.86.0.tar.xz";

129+ url = "${mirror}/stable/frameworks/5.87/kcompletion-5.87.0.tar.xz";

130+ sha256 = "15c9sgdgw6cf5y2jjgjlsxn0p0pxvrmhzcyq05d9fqhy185ng03p";

131+ name = "kcompletion-5.87.0.tar.xz";

132132 };

133133 };

134134 kconfig = {

135− version = "5.86.0";

135+ version = "5.87.0";

136136 src = fetchurl {

137− url = "${mirror}/stable/frameworks/5.86/kconfig-5.86.0.tar.xz";

138− sha256 = "05q4wqhxspja8a4j0gik62bp2lmyxv0cpbd188q16q97zgbb6xy1";

139− name = "kconfig-5.86.0.tar.xz";

137+ url = "${mirror}/stable/frameworks/5.87/kconfig-5.87.0.tar.xz";

138+ sha256 = "1l8px5qpf5qfma24filim1swblgbdvnf25pc38qc6s79inkganrl";

139+ name = "kconfig-5.87.0.tar.xz";

140140 };

141141 };

142142 kconfigwidgets = {

143− version = "5.86.0";

143+ version = "5.87.0";

144144 src = fetchurl {

145− url = "${mirror}/stable/frameworks/5.86/kconfigwidgets-5.86.0.tar.xz";

146− sha256 = "0k846cf2h76815ww514i69cdmhyi56dly5xcsigkd1l7dgm0fk76";

147− name = "kconfigwidgets-5.86.0.tar.xz";

145+ url = "${mirror}/stable/frameworks/5.87/kconfigwidgets-5.87.0.tar.xz";

146+ sha256 = "18m3nqlp87am2w8my4y933ck9k3cs5q62nkhbp8ngaavw8cfbd84";

147+ name = "kconfigwidgets-5.87.0.tar.xz";

148148 };

149149 };

150150 kcontacts = {

151− version = "5.86.0";

151+ version = "5.87.0";

152152 src = fetchurl {

153− url = "${mirror}/stable/frameworks/5.86/kcontacts-5.86.0.tar.xz";

154− sha256 = "18xkzl4m7dl1z4vpwmbcqjjhn7jsa3d8v4wjdz0iqwpzsq2vrdc1";

155− name = "kcontacts-5.86.0.tar.xz";

153+ url = "${mirror}/stable/frameworks/5.87/kcontacts-5.87.0.tar.xz";

154+ sha256 = "02zyirvds572rxbdc47ncs71a66z5hql0vpj8lx1zpr0nnvpvlcv";

155+ name = "kcontacts-5.87.0.tar.xz";

156156 };

157157 };

158158 kcoreaddons = {

159− version = "5.86.0";

159+ version = "5.87.0";

160160 src = fetchurl {

161− url = "${mirror}/stable/frameworks/5.86/kcoreaddons-5.86.0.tar.xz";

162− sha256 = "1ncwf8kqrypmipp43a011rnhlw3qsb98x8nm98rm6v6gl2z3wgy6";

163− name = "kcoreaddons-5.86.0.tar.xz";

161+ url = "${mirror}/stable/frameworks/5.87/kcoreaddons-5.87.0.tar.xz";

162+ sha256 = "19pdpz7jjknccaqc2i6zfmclmrk60clzanvx72ryvh7yb0xyk7yj";

163+ name = "kcoreaddons-5.87.0.tar.xz";

164164 };

165165 };

166166 kcrash = {

167− version = "5.86.0";

167+ version = "5.87.0";

168168 src = fetchurl {

169− url = "${mirror}/stable/frameworks/5.86/kcrash-5.86.0.tar.xz";

170− sha256 = "1cyiqca4cwz7r4082mpi3gviicyr28qgk7zswm4a38qhv7vi3rdr";

171− name = "kcrash-5.86.0.tar.xz";

169+ url = "${mirror}/stable/frameworks/5.87/kcrash-5.87.0.tar.xz";

170+ sha256 = "1l48dn5vqn4lns57v61p1a8r3pklx4xclsa3890pjf6iviqxf22r";

171+ name = "kcrash-5.87.0.tar.xz";

172172 };

173173 };

174174 kdav = {

175− version = "5.86.0";

175+ version = "5.87.0";

176176 src = fetchurl {

177− url = "${mirror}/stable/frameworks/5.86/kdav-5.86.0.tar.xz";

178− sha256 = "1wpybm79nw17dqyql312nizvm3rf54ya1drhgvadry1c2lgmdrf3";

179− name = "kdav-5.86.0.tar.xz";

177+ url = "${mirror}/stable/frameworks/5.87/kdav-5.87.0.tar.xz";

178+ sha256 = "0sb1g0wdpql5gw52nxhzkk1wa9md2k25lwyf902g3pf7ahdgdk5z";

179+ name = "kdav-5.87.0.tar.xz";

180180 };

181181 };

182182 kdbusaddons = {

183− version = "5.86.0";

183+ version = "5.87.0";

184184 src = fetchurl {

185− url = "${mirror}/stable/frameworks/5.86/kdbusaddons-5.86.0.tar.xz";

186− sha256 = "0l50ivsrlkl8npfkpj6qbi3fwwvwwsm0b5ihlp5xpr2pakvas95z";

187− name = "kdbusaddons-5.86.0.tar.xz";

185+ url = "${mirror}/stable/frameworks/5.87/kdbusaddons-5.87.0.tar.xz";

186+ sha256 = "14xmrvak95aqc98a6k6ldg1w4g7syx2xng3vgvwj9wzpzr3shp6p";

187+ name = "kdbusaddons-5.87.0.tar.xz";

188188 };

189189 };

190190 kdeclarative = {

191− version = "5.86.0";

191+ version = "5.87.0";

192192 src = fetchurl {

193− url = "${mirror}/stable/frameworks/5.86/kdeclarative-5.86.0.tar.xz";

194− sha256 = "1d7d6limyd9mnnnz7ib3rrywcp5j4s0mfck1invlx3p79pisrj9d";

195− name = "kdeclarative-5.86.0.tar.xz";

193+ url = "${mirror}/stable/frameworks/5.87/kdeclarative-5.87.0.tar.xz";

194+ sha256 = "0zx4alsqk3vqfgyi6x7v2mcar92j3swmg0ms0b9mjl95bvpgi4k7";

195+ name = "kdeclarative-5.87.0.tar.xz";

196196 };

197197 };

198198 kded = {

199− version = "5.86.0";

199+ version = "5.87.0";

200200 src = fetchurl {

201− url = "${mirror}/stable/frameworks/5.86/kded-5.86.0.tar.xz";

202− sha256 = "0sm3310l1rh1kb061flhbh4np954r2yinhsjrhmj7c8j2r656xyw";

203− name = "kded-5.86.0.tar.xz";

201+ url = "${mirror}/stable/frameworks/5.87/kded-5.87.0.tar.xz";

202+ sha256 = "18dw1dd2lmwsh04yan1q72c5lzcgzm9kig1rqag3rg81h7pclsr5";

203+ name = "kded-5.87.0.tar.xz";

204204 };

205205 };

206206 kdelibs4support = {

207− version = "5.86.0";

207+ version = "5.87.0";

208208 src = fetchurl {

209− url = "${mirror}/stable/frameworks/5.86/portingAids/kdelibs4support-5.86.0.tar.xz";

210− sha256 = "1ss2viwnksvx24kwpg9x6fk0wfwd0cx84723nb83z5n42lfh07ch";

211− name = "kdelibs4support-5.86.0.tar.xz";

209+ url = "${mirror}/stable/frameworks/5.87/portingAids/kdelibs4support-5.87.0.tar.xz";

210+ sha256 = "17kw76fd97rhdyna3dc7hsajvd8bv9l71qx0xaqn65pvzbndf2jf";

211+ name = "kdelibs4support-5.87.0.tar.xz";

212212 };

213213 };

214214 kdesignerplugin = {

215− version = "5.86.0";

215+ version = "5.87.0";

216216 src = fetchurl {

217− url = "${mirror}/stable/frameworks/5.86/portingAids/kdesignerplugin-5.86.0.tar.xz";

218− sha256 = "143fi6rifkcjd37ha1nb1gfh27l15qa69pldf87xwqizb8f5mhxl";

219− name = "kdesignerplugin-5.86.0.tar.xz";

217+ url = "${mirror}/stable/frameworks/5.87/portingAids/kdesignerplugin-5.87.0.tar.xz";

218+ sha256 = "12rckqvg6w5cycvmxbrkvxi7ysfk6bqk3yi1ik4ryqh4x5dz2am9";

219+ name = "kdesignerplugin-5.87.0.tar.xz";

220220 };

221221 };

222222 kdesu = {

223− version = "5.86.0";

223+ version = "5.87.0";

224224 src = fetchurl {

225− url = "${mirror}/stable/frameworks/5.86/kdesu-5.86.0.tar.xz";

226− sha256 = "08dmig0zlds1ckm2p2a0d0f11bkq06w1yp15a8fyipb8w7mgdxl8";

227− name = "kdesu-5.86.0.tar.xz";

225+ url = "${mirror}/stable/frameworks/5.87/kdesu-5.87.0.tar.xz";

226+ sha256 = "05bb3hcb00j1f047q6ngbb8arrp4s03da880sky0slvvicm4ynkr";

227+ name = "kdesu-5.87.0.tar.xz";

228228 };

229229 };

230230 kdewebkit = {

231− version = "5.86.0";

231+ version = "5.87.0";

232232 src = fetchurl {

233− url = "${mirror}/stable/frameworks/5.86/portingAids/kdewebkit-5.86.0.tar.xz";

234− sha256 = "0vvsvlcq9mjgwklyrm60l25aqb7vx46xjjp6nv883gpy9ppzwvv1";

235− name = "kdewebkit-5.86.0.tar.xz";

233+ url = "${mirror}/stable/frameworks/5.87/portingAids/kdewebkit-5.87.0.tar.xz";

234+ sha256 = "1a578sa6nfp2vycrrhc37idwg47nrrfhv6dp8rfb2gj4vf67bzcv";

235+ name = "kdewebkit-5.87.0.tar.xz";

236236 };

237237 };

238238 kdnssd = {

239− version = "5.86.0";

239+ version = "5.87.0";

240240 src = fetchurl {

241− url = "${mirror}/stable/frameworks/5.86/kdnssd-5.86.0.tar.xz";

242− sha256 = "1853jz3xm3hkij5wdxbdfbfwsfg31ynhf2pjrl5b6m29nxh4xr3j";

243− name = "kdnssd-5.86.0.tar.xz";

241+ url = "${mirror}/stable/frameworks/5.87/kdnssd-5.87.0.tar.xz";

242+ sha256 = "1rs8i75qm1vazy8cnvcv3sha6faf27bav491z8brcs8fiab96dnw";

243+ name = "kdnssd-5.87.0.tar.xz";

244244 };

245245 };

246246 kdoctools = {

247− version = "5.86.0";

247+ version = "5.87.0";

248248 src = fetchurl {

249− url = "${mirror}/stable/frameworks/5.86/kdoctools-5.86.0.tar.xz";

250− sha256 = "13miqjm9lv7jr0chrrynhks1k7f107f7z44f3mdzjx88jgiskllx";

251− name = "kdoctools-5.86.0.tar.xz";

249+ url = "${mirror}/stable/frameworks/5.87/kdoctools-5.87.0.tar.xz";

250+ sha256 = "0md5wiv5mv4q63g9ads8d0xg8qxlh91dqgyg66n8abcg56qq83ps";

251+ name = "kdoctools-5.87.0.tar.xz";

252252 };

253253 };

254254 kemoticons = {

255− version = "5.86.0";

255+ version = "5.87.0";

256256 src = fetchurl {

257− url = "${mirror}/stable/frameworks/5.86/kemoticons-5.86.0.tar.xz";

258− sha256 = "0lnglx5vaswcfsfj37arzhzinsr46f87s4z48gbs067x97pjj9xd";

259− name = "kemoticons-5.86.0.tar.xz";

257+ url = "${mirror}/stable/frameworks/5.87/kemoticons-5.87.0.tar.xz";

258+ sha256 = "0iah6ws0x9xnm900rii2k82gf155cbwlnxbz2rxbybp1dmbjbz5y";

259+ name = "kemoticons-5.87.0.tar.xz";

260260 };

261261 };

262262 kfilemetadata = {

263− version = "5.86.0";

263+ version = "5.87.0";

264264 src = fetchurl {

265− url = "${mirror}/stable/frameworks/5.86/kfilemetadata-5.86.0.tar.xz";

266− sha256 = "1ksia9ni7427n2xa22gx8b6g7skisaj1fa1pxapcy5q0dw6djwka";

267− name = "kfilemetadata-5.86.0.tar.xz";

265+ url = "${mirror}/stable/frameworks/5.87/kfilemetadata-5.87.0.tar.xz";

266+ sha256 = "1nh4gzprc588q8zfz94j76x3vvf77cnsc30xrs07316726mksw2i";

267+ name = "kfilemetadata-5.87.0.tar.xz";

268268 };

269269 };

270270 kglobalaccel = {

271− version = "5.86.0";

271+ version = "5.87.0";

272272 src = fetchurl {

273− url = "${mirror}/stable/frameworks/5.86/kglobalaccel-5.86.0.tar.xz";

274− sha256 = "0wn1c6xfh0q152b6bavr3k2jkbbdb7vrsv24ci133ms32617rhcj";

275− name = "kglobalaccel-5.86.0.tar.xz";

273+ url = "${mirror}/stable/frameworks/5.87/kglobalaccel-5.87.0.tar.xz";

274+ sha256 = "1wk6mxq6ylkvalcwbrkmc0whvkbllkfwnsf4hxz86cnixqb7ybjh";

275+ name = "kglobalaccel-5.87.0.tar.xz";

276276 };

277277 };

278278 kguiaddons = {

279− version = "5.86.0";

279+ version = "5.87.0";

280280 src = fetchurl {

281− url = "${mirror}/stable/frameworks/5.86/kguiaddons-5.86.0.tar.xz";

282− sha256 = "0zrylidwgsrzn23dhba7p9v4qsxa0axp1yjvniwcm0ww7nxk961z";

283− name = "kguiaddons-5.86.0.tar.xz";

281+ url = "${mirror}/stable/frameworks/5.87/kguiaddons-5.87.0.tar.xz";

282+ sha256 = "1k88x22f8db90x28fryg6cp239sfs0zrjk18l72v09bg3zc7y1lh";

283+ name = "kguiaddons-5.87.0.tar.xz";

284284 };

285285 };

286286 kholidays = {

287− version = "5.86.0";

287+ version = "5.87.0";

288288 src = fetchurl {

289− url = "${mirror}/stable/frameworks/5.86/kholidays-5.86.0.tar.xz";

290− sha256 = "1nqbplazr6nk2369d3jlcd2kkhjk0rjicy26y29q2cy0g7q56gb7";

291− name = "kholidays-5.86.0.tar.xz";

289+ url = "${mirror}/stable/frameworks/5.87/kholidays-5.87.0.tar.xz";

290+ sha256 = "1ca51vkmwwrl1fvs2fw16nvpmag2licywwmwjiaapkk8hv6v1gzm";

291+ name = "kholidays-5.87.0.tar.xz";

292292 };

293293 };

294294 khtml = {

295− version = "5.86.0";

295+ version = "5.87.0";

296296 src = fetchurl {

297− url = "${mirror}/stable/frameworks/5.86/portingAids/khtml-5.86.0.tar.xz";

298− sha256 = "18q6hc4a41jqrmc2npidbp4h79q34wqjx78jv8w5n3s6kizhqvhl";

299− name = "khtml-5.86.0.tar.xz";

297+ url = "${mirror}/stable/frameworks/5.87/portingAids/khtml-5.87.0.tar.xz";

298+ sha256 = "1jxpznzw4r8ikx0g5n1fg0qrkllph5cwih4lcvwjn6cqx2ypgn6f";

299+ name = "khtml-5.87.0.tar.xz";

300300 };

301301 };

302302 ki18n = {

303− version = "5.86.0";

303+ version = "5.87.0";

304304 src = fetchurl {

305− url = "${mirror}/stable/frameworks/5.86/ki18n-5.86.0.tar.xz";

306− sha256 = "1ldw8775kacs43kkl2yxx7gqqx6hf49pg2dg0fqaayaynx9ymndq";

307− name = "ki18n-5.86.0.tar.xz";

305+ url = "${mirror}/stable/frameworks/5.87/ki18n-5.87.0.tar.xz";

306+ sha256 = "0395khchbhp7x4fgb2fwxlpx0mhdvbkgd0v7kwgmm0n4bkn7jphi";

307+ name = "ki18n-5.87.0.tar.xz";

308308 };

309309 };

310310 kiconthemes = {

311− version = "5.86.0";

311+ version = "5.87.0";

312312 src = fetchurl {

313− url = "${mirror}/stable/frameworks/5.86/kiconthemes-5.86.0.tar.xz";

314− sha256 = "1sa0sn56dc539x3j9rbl7v0iicsqkrwhqsp3wmsiv5h79d2xw4q6";

315− name = "kiconthemes-5.86.0.tar.xz";

313+ url = "${mirror}/stable/frameworks/5.87/kiconthemes-5.87.0.tar.xz";

314+ sha256 = "04chb3y3d6hxwy9f1xdifvl2mbcd8xbh7fv6x5m5vnb1cviwc6j7";

315+ name = "kiconthemes-5.87.0.tar.xz";

316316 };

317317 };

318318 kidletime = {

319− version = "5.86.0";

319+ version = "5.87.0";

320320 src = fetchurl {

321− url = "${mirror}/stable/frameworks/5.86/kidletime-5.86.0.tar.xz";

322− sha256 = "10xk1ch9f3zcz2q5mc9bjzzc6crr3mvm1z6ap3vqd7b3ywv38psv";

323− name = "kidletime-5.86.0.tar.xz";

321+ url = "${mirror}/stable/frameworks/5.87/kidletime-5.87.0.tar.xz";

322+ sha256 = "1m0p602i9c4dmkll3g8flmzq23ywv20rxnvzc1c8bf5kqn6321qp";

323+ name = "kidletime-5.87.0.tar.xz";

324324 };

325325 };

326326 kimageformats = {

327− version = "5.86.0";

327+ version = "5.87.0";

328328 src = fetchurl {

329− url = "${mirror}/stable/frameworks/5.86/kimageformats-5.86.0.tar.xz";

330− sha256 = "11d9p6h21mmwsi55173p8dcvvr2013y16af57y6ac499l9p2vfd5";

331− name = "kimageformats-5.86.0.tar.xz";

329+ url = "${mirror}/stable/frameworks/5.87/kimageformats-5.87.0.tar.xz";

330+ sha256 = "0c4qq5j6hzz90kh7mmirafglr9l5wck3r67ij436gpmq69ignvmg";

331+ name = "kimageformats-5.87.0.tar.xz";

332332 };

333333 };

334334 kinit = {

335− version = "5.86.0";

335+ version = "5.87.0";

336336 src = fetchurl {

337− url = "${mirror}/stable/frameworks/5.86/kinit-5.86.0.tar.xz";

338− sha256 = "0s6mw8xx1777h7zgw7mwvw1cv3jhlpqrkvhmf5s4pjmp40dkj2i7";

339− name = "kinit-5.86.0.tar.xz";

337+ url = "${mirror}/stable/frameworks/5.87/kinit-5.87.0.tar.xz";

338+ sha256 = "0435syvhisagbq82qcbims5adq88ivv793gvb3kx03hxhyyx81xs";

339+ name = "kinit-5.87.0.tar.xz";

340340 };

341341 };

342342 kio = {

343− version = "5.86.0";

343+ version = "5.87.0";

344344 src = fetchurl {

345− url = "${mirror}/stable/frameworks/5.86/kio-5.86.0.tar.xz";

346− sha256 = "01kyrwrrv1y4a4hw4ryfmnncxqcbkc09lz2hxv7w020wavrzm6fn";

347− name = "kio-5.86.0.tar.xz";

345+ url = "${mirror}/stable/frameworks/5.87/kio-5.87.0.tar.xz";

346+ sha256 = "0sxwrqvfkqm679v99lx50vd2p4bx10pdzrjhxg0njfwww2fxa7mr";

347+ name = "kio-5.87.0.tar.xz";

348348 };

349349 };

350350 kirigami2 = {

351− version = "5.86.0";

351+ version = "5.87.0";

352352 src = fetchurl {

353− url = "${mirror}/stable/frameworks/5.86/kirigami2-5.86.0.tar.xz";

354− sha256 = "1rkxihxj5gh6rqr2h8v21afj1lgaab0v16w5lgzb102xbjl47v6f";

355− name = "kirigami2-5.86.0.tar.xz";

353+ url = "${mirror}/stable/frameworks/5.87/kirigami2-5.87.0.tar.xz";

354+ sha256 = "1wvj0nnb1dd1k12arlmlx99gjhk7v2jpw5sgyjka6kkps31nr1zi";

355+ name = "kirigami2-5.87.0.tar.xz";

356356 };

357357 };

358358 kitemmodels = {

359− version = "5.86.0";

359+ version = "5.87.0";

360360 src = fetchurl {

361− url = "${mirror}/stable/frameworks/5.86/kitemmodels-5.86.0.tar.xz";

362− sha256 = "05pjhvspgbsnalzbpn456xj8gl9wj2mzh0h8p40lcqvc9sl53nag";

363− name = "kitemmodels-5.86.0.tar.xz";

361+ url = "${mirror}/stable/frameworks/5.87/kitemmodels-5.87.0.tar.xz";

362+ sha256 = "1qx78pfbnwsq8nn6fa8qjjc0zn4nwh4dqs0ifb9iaam33cl3kw92";

363+ name = "kitemmodels-5.87.0.tar.xz";

364364 };

365365 };

366366 kitemviews = {

367− version = "5.86.0";

367+ version = "5.87.0";

368368 src = fetchurl {

369− url = "${mirror}/stable/frameworks/5.86/kitemviews-5.86.0.tar.xz";

370− sha256 = "1mzm1wvapwni59x0missyp6mbl9n95kdp4a6c9jzdswydnvn3hpn";

371− name = "kitemviews-5.86.0.tar.xz";

369+ url = "${mirror}/stable/frameworks/5.87/kitemviews-5.87.0.tar.xz";

370+ sha256 = "1nrg92nyc39fl1n7k38pa4k8dahwl76wadv0v0ixyh1zx0x4clbg";

371+ name = "kitemviews-5.87.0.tar.xz";

372372 };

373373 };

374374 kjobwidgets = {

375− version = "5.86.0";

375+ version = "5.87.0";

376376 src = fetchurl {

377− url = "${mirror}/stable/frameworks/5.86/kjobwidgets-5.86.0.tar.xz";

378− sha256 = "0jm71dy2f4pand2fr0vgbbc1xlpwi1y9mlbjj8q238pax62sh63b";

379− name = "kjobwidgets-5.86.0.tar.xz";

377+ url = "${mirror}/stable/frameworks/5.87/kjobwidgets-5.87.0.tar.xz";

378+ sha256 = "0s0g4dygc6c9p5w7vdk7bninizsdhj5xan351x15b4k0ddgq8sz5";

379+ name = "kjobwidgets-5.87.0.tar.xz";

380380 };

381381 };

382382 kjs = {

383− version = "5.86.0";

383+ version = "5.87.0";

384384 src = fetchurl {

385− url = "${mirror}/stable/frameworks/5.86/portingAids/kjs-5.86.0.tar.xz";

386− sha256 = "0gk5za2xyavxm56gxpx1x6jlkgaxhn7mcgdqb60z85372g2kvqg2";

387− name = "kjs-5.86.0.tar.xz";

385+ url = "${mirror}/stable/frameworks/5.87/portingAids/kjs-5.87.0.tar.xz";

386+ sha256 = "1ihwhjgk3k2nmyfg2brdjriymm2qi5dgmh47phmb9b2gvzqx6yg8";

387+ name = "kjs-5.87.0.tar.xz";

388388 };

389389 };

390390 kjsembed = {

391− version = "5.86.0";

391+ version = "5.87.0";

392392 src = fetchurl {

393− url = "${mirror}/stable/frameworks/5.86/portingAids/kjsembed-5.86.0.tar.xz";

394− sha256 = "1qash24j0y35j179kbmsp1wg30c97cy1z05vidqg9b7id57c2d5p";

395− name = "kjsembed-5.86.0.tar.xz";

393+ url = "${mirror}/stable/frameworks/5.87/portingAids/kjsembed-5.87.0.tar.xz";

394+ sha256 = "0j8b637k8vx2qhl3zf6744ywykv6hnfcs2xgsq0i8w5ji0a2jigv";

395+ name = "kjsembed-5.87.0.tar.xz";

396396 };

397397 };

398398 kmediaplayer = {

399− version = "5.86.0";

399+ version = "5.87.0";

400400 src = fetchurl {

401− url = "${mirror}/stable/frameworks/5.86/portingAids/kmediaplayer-5.86.0.tar.xz";

402− sha256 = "182bg9cbn1m9flp8fqf5v37mjd1kwap16bvg13k9jagr1g9zmar4";

403− name = "kmediaplayer-5.86.0.tar.xz";

401+ url = "${mirror}/stable/frameworks/5.87/portingAids/kmediaplayer-5.87.0.tar.xz";

402+ sha256 = "0mrmb7q4wmj8v9ipb9vh4c8scl1mr0frz3yvpc96dyimvb87pp08";

403+ name = "kmediaplayer-5.87.0.tar.xz";

404404 };

405405 };

406406 knewstuff = {

407− version = "5.86.0";

407+ version = "5.87.0";

408408 src = fetchurl {

409− url = "${mirror}/stable/frameworks/5.86/knewstuff-5.86.0.tar.xz";

410− sha256 = "1c3mbd1f2hwp4wj1maj7n0d5vmwn77drld3ig0g20l4hvn5biy16";

411− name = "knewstuff-5.86.0.tar.xz";

409+ url = "${mirror}/stable/frameworks/5.87/knewstuff-5.87.0.tar.xz";

410+ sha256 = "0xnilr3r3l36g3j7a2nf2kqmill22ibrr6qfniqcywmcqpnq7x4q";

411+ name = "knewstuff-5.87.0.tar.xz";

412412 };

413413 };

414414 knotifications = {

415− version = "5.86.0";

415+ version = "5.87.0";

416416 src = fetchurl {

417− url = "${mirror}/stable/frameworks/5.86/knotifications-5.86.0.tar.xz";

418− sha256 = "0d2hbmj1wlmsc30zb4j9crn22yqhh8nm0lgnfsjjlh3dzq3qf5za";

419− name = "knotifications-5.86.0.tar.xz";

417+ url = "${mirror}/stable/frameworks/5.87/knotifications-5.87.0.tar.xz";

418+ sha256 = "03zraci1lnzz3d5i97i2m2h4z8xp4fmm28aizk3xipqkgy3q61c3";

419+ name = "knotifications-5.87.0.tar.xz";

420420 };

421421 };

422422 knotifyconfig = {

423− version = "5.86.0";

423+ version = "5.87.0";

424424 src = fetchurl {

425− url = "${mirror}/stable/frameworks/5.86/knotifyconfig-5.86.0.tar.xz";

426− sha256 = "1slbsh1i7pld7vjsvsgvjyrb5ppzi9y4vfc9zw06kwnkb6m111fs";

427− name = "knotifyconfig-5.86.0.tar.xz";

425+ url = "${mirror}/stable/frameworks/5.87/knotifyconfig-5.87.0.tar.xz";

426+ sha256 = "0jd5yzjg625ixm3fbmpafvg6wc69cvppqr0z0y0wzkbzbd930ggh";

427+ name = "knotifyconfig-5.87.0.tar.xz";

428428 };

429429 };

430430 kpackage = {

431− version = "5.86.0";

431+ version = "5.87.0";

432432 src = fetchurl {

433− url = "${mirror}/stable/frameworks/5.86/kpackage-5.86.0.tar.xz";

434− sha256 = "1kx22l42zvl0dv9alwpvz3lryzl7lw8zqp0xlwxg15vkxl2a6g1b";

435− name = "kpackage-5.86.0.tar.xz";

433+ url = "${mirror}/stable/frameworks/5.87/kpackage-5.87.0.tar.xz";

434+ sha256 = "1dmhj1byxmk407mcz62ydrzzjab6c4da22blkm4f5das79blkdsy";

435+ name = "kpackage-5.87.0.tar.xz";

436436 };

437437 };

438438 kparts = {

439− version = "5.86.0";

439+ version = "5.87.0";

440440 src = fetchurl {

441− url = "${mirror}/stable/frameworks/5.86/kparts-5.86.0.tar.xz";

442− sha256 = "0801far1wzac39cwdlh9nmspx1lvni6ky90ylcw5va69f2ll3ga0";

443− name = "kparts-5.86.0.tar.xz";

441+ url = "${mirror}/stable/frameworks/5.87/kparts-5.87.0.tar.xz";

442+ sha256 = "0jmjyvrskhvnp0w1d9l9k5azwf1ppda97qp2801179x77bgdfbgi";

443+ name = "kparts-5.87.0.tar.xz";

444444 };

445445 };

446446 kpeople = {

447− version = "5.86.0";

447+ version = "5.87.0";

448448 src = fetchurl {

449− url = "${mirror}/stable/frameworks/5.86/kpeople-5.86.0.tar.xz";

450− sha256 = "1ybrs1imlkb2q9nwlkc46fhj736273br0pnyhrfaad3cjrb1rqfh";

451− name = "kpeople-5.86.0.tar.xz";

449+ url = "${mirror}/stable/frameworks/5.87/kpeople-5.87.0.tar.xz";

450+ sha256 = "002qnfxyrzv9jr1z86ih7v7bprbpfx311s646rbmjc6c9wqa5a1a";

451+ name = "kpeople-5.87.0.tar.xz";

452452 };

453453 };

454454 kplotting = {

455− version = "5.86.0";

455+ version = "5.87.0";

456456 src = fetchurl {

457− url = "${mirror}/stable/frameworks/5.86/kplotting-5.86.0.tar.xz";

458− sha256 = "16r0a4rnpzzmn3cyxc33gig7bn5h4p64q7a517s6ai97hm6y5r7w";

459− name = "kplotting-5.86.0.tar.xz";

457+ url = "${mirror}/stable/frameworks/5.87/kplotting-5.87.0.tar.xz";

458+ sha256 = "1np6rqrxldnhz82ak291kr87zqccmp9a3v4gvxl0xsm2qnpzxlxz";

459+ name = "kplotting-5.87.0.tar.xz";

460460 };

461461 };

462462 kpty = {

463− version = "5.86.0";

463+ version = "5.87.0";

464464 src = fetchurl {

465− url = "${mirror}/stable/frameworks/5.86/kpty-5.86.0.tar.xz";

466− sha256 = "1rgc2n32k39axl2jlmwa8iqr9v4h7n3kwk9971xc1d08cfswqjkm";

467− name = "kpty-5.86.0.tar.xz";

465+ url = "${mirror}/stable/frameworks/5.87/kpty-5.87.0.tar.xz";

466+ sha256 = "1qd2lj53m0gbpmfilwrcz5v2m735daqlxj2qv1j5m28b3bjwz2li";

467+ name = "kpty-5.87.0.tar.xz";

468468 };

469469 };

470470 kquickcharts = {

471− version = "5.86.0";

471+ version = "5.87.0";

472472 src = fetchurl {

473− url = "${mirror}/stable/frameworks/5.86/kquickcharts-5.86.0.tar.xz";

474− sha256 = "1c0dycnk98p00dgpydnkas9x3yq3lcj5nzckiwk674n1myb78hq7";

475− name = "kquickcharts-5.86.0.tar.xz";

473+ url = "${mirror}/stable/frameworks/5.87/kquickcharts-5.87.0.tar.xz";

474+ sha256 = "1dx4ilwih9pfimfn5l3fgjf0z1k75p6sb7y03akgnl4i9w2aycv8";

475+ name = "kquickcharts-5.87.0.tar.xz";

476476 };

477477 };

478478 kross = {

479− version = "5.86.0";

479+ version = "5.87.0";

480480 src = fetchurl {

481− url = "${mirror}/stable/frameworks/5.86/portingAids/kross-5.86.0.tar.xz";

482− sha256 = "1x7xc35ix83hks25hnwd2l8h1aw4zx8x32if8jbvwfw957i02gdf";

483− name = "kross-5.86.0.tar.xz";

481+ url = "${mirror}/stable/frameworks/5.87/portingAids/kross-5.87.0.tar.xz";

482+ sha256 = "1nnyl67b43064y5gvj7ccvzz5481vbaycjhxxzgf4iaj0qm2vpfh";

483+ name = "kross-5.87.0.tar.xz";

484484 };

485485 };

486486 krunner = {

487− version = "5.86.0";

487+ version = "5.87.0";

488488 src = fetchurl {

489− url = "${mirror}/stable/frameworks/5.86/krunner-5.86.0.tar.xz";

490− sha256 = "17d31szm2pnmc6cp0ijcm3k4a148fhg4m6ccw34rk4pd5pbbfqai";

491− name = "krunner-5.86.0.tar.xz";

489+ url = "${mirror}/stable/frameworks/5.87/krunner-5.87.0.tar.xz";

490+ sha256 = "0ygqfaif9xp30ahrld85xzsgmfmy51560hl8ym8shggwar20kb1s";

491+ name = "krunner-5.87.0.tar.xz";

492492 };

493493 };

494494 kservice = {

495− version = "5.86.0";

495+ version = "5.87.0";

496496 src = fetchurl {

497− url = "${mirror}/stable/frameworks/5.86/kservice-5.86.0.tar.xz";

498− sha256 = "0fnrzfpzdprbk6rn9xdzmaj7pvg6lm72id23cl29zgp0v09a5qa6";

499− name = "kservice-5.86.0.tar.xz";

497+ url = "${mirror}/stable/frameworks/5.87/kservice-5.87.0.tar.xz";

498+ sha256 = "0a3fcqhwbzqwy9wy1787p8hr1s1jfmz3y1dk2spiifwk9l668mxn";

499+ name = "kservice-5.87.0.tar.xz";

500500 };

501501 };

502502 ktexteditor = {

503− version = "5.86.0";

503+ version = "5.87.0";

504504 src = fetchurl {

505− url = "${mirror}/stable/frameworks/5.86/ktexteditor-5.86.0.tar.xz";

506− sha256 = "1f7f89sv0wbjlwi1wy96viagxv2yzfn9hsh24yr45qzjvghgx0v2";

507− name = "ktexteditor-5.86.0.tar.xz";

505+ url = "${mirror}/stable/frameworks/5.87/ktexteditor-5.87.0.tar.xz";

506+ sha256 = "13dnwf2zvp3k6xb0ry5a11gaf2j7x2swhq8d689w4gf3awpma7rg";

507+ name = "ktexteditor-5.87.0.tar.xz";

508508 };

509509 };

510510 ktextwidgets = {

511− version = "5.86.0";

511+ version = "5.87.0";

512512 src = fetchurl {

513− url = "${mirror}/stable/frameworks/5.86/ktextwidgets-5.86.0.tar.xz";

514− sha256 = "1hdwq4kphy7vdy6fg32z8slg8jkz4npd85dsjh6qkrvwpzbbl7yn";

515− name = "ktextwidgets-5.86.0.tar.xz";

513+ url = "${mirror}/stable/frameworks/5.87/ktextwidgets-5.87.0.tar.xz";

514+ sha256 = "04gmqw8wjf6r8lpsjcsg0925a6b6hnckzy5i9ykvian1kq2d79fr";

515+ name = "ktextwidgets-5.87.0.tar.xz";

516516 };

517517 };

518518 kunitconversion = {

519− version = "5.86.0";

519+ version = "5.87.0";

520520 src = fetchurl {

521− url = "${mirror}/stable/frameworks/5.86/kunitconversion-5.86.0.tar.xz";

522− sha256 = "1svw7ymv2nc89zw4sz0gmsfdji7adwdz8psqy2hkh0qjcwzs157w";

523− name = "kunitconversion-5.86.0.tar.xz";

521+ url = "${mirror}/stable/frameworks/5.87/kunitconversion-5.87.0.tar.xz";

522+ sha256 = "1b5yvs0inr0kj7i4j5yavlxz6n8h3d2wbgw39r2harzxd4xjzz4h";

523+ name = "kunitconversion-5.87.0.tar.xz";

524524 };

525525 };

526526 kwallet = {

527− version = "5.86.0";

527+ version = "5.87.0";

528528 src = fetchurl {

529− url = "${mirror}/stable/frameworks/5.86/kwallet-5.86.0.tar.xz";

530− sha256 = "075djy98bfgxkx5s20h49flxmc20zi8h7bam6f4hgh5vcr0lbwlb";

531− name = "kwallet-5.86.0.tar.xz";

529+ url = "${mirror}/stable/frameworks/5.87/kwallet-5.87.0.tar.xz";

530+ sha256 = "1a2qiwhf6hwh6qs9x84hz1ryaaqqm8bpg9v29kjy6cq9krn3mwar";

531+ name = "kwallet-5.87.0.tar.xz";

532532 };

533533 };

534534 kwayland = {

535− version = "5.86.0";

535+ version = "5.87.0";

536536 src = fetchurl {

537− url = "${mirror}/stable/frameworks/5.86/kwayland-5.86.0.tar.xz";

538− sha256 = "18rx4lxlria9xzfrmp83qzs5dgqks5gv218sn0lx28is3gg42fw6";

539− name = "kwayland-5.86.0.tar.xz";

537+ url = "${mirror}/stable/frameworks/5.87/kwayland-5.87.0.tar.xz";

538+ sha256 = "03lrlprvc3bj43f0l0dirg93l7amzlcx4ajaqh9h54g030qanfmc";

539+ name = "kwayland-5.87.0.tar.xz";

540540 };

541541 };

542542 kwidgetsaddons = {

543− version = "5.86.0";

543+ version = "5.87.0";

544544 src = fetchurl {

545− url = "${mirror}/stable/frameworks/5.86/kwidgetsaddons-5.86.0.tar.xz";

546− sha256 = "1ywmyyqbi4lws3bwmak8lmgdfxir7zapq3xvqk2nrbka4i2bggiz";

547− name = "kwidgetsaddons-5.86.0.tar.xz";

545+ url = "${mirror}/stable/frameworks/5.87/kwidgetsaddons-5.87.0.tar.xz";

546+ sha256 = "00gv9lxiah6yg8lxjd0md0zyvhi7zc9s6fg14jfh0cb1i0zrn49b";

547+ name = "kwidgetsaddons-5.87.0.tar.xz";

548548 };

549549 };

550550 kwindowsystem = {

551− version = "5.86.0";

551+ version = "5.87.0";

552552 src = fetchurl {

553− url = "${mirror}/stable/frameworks/5.86/kwindowsystem-5.86.0.tar.xz";

554− sha256 = "15b5jd128az4agxkychkxwxm1bkpjyg8f5c11jnp3yd6r4q8gf46";

555− name = "kwindowsystem-5.86.0.tar.xz";

553+ url = "${mirror}/stable/frameworks/5.87/kwindowsystem-5.87.0.tar.xz";

554+ sha256 = "0rxmpawp5g46xp5irk1gcdq6n2y9r9vlx1dm5gpqhcfh7gr64ja2";

555+ name = "kwindowsystem-5.87.0.tar.xz";

556556 };

557557 };

558558 kxmlgui = {

559− version = "5.86.0";

559+ version = "5.87.0";

560560 src = fetchurl {

561− url = "${mirror}/stable/frameworks/5.86/kxmlgui-5.86.0.tar.xz";

562− sha256 = "0y8kkqxsppv9h2wvgr76g23kzx0qb669cqbq13whhy0s5rmyxp0h";

563− name = "kxmlgui-5.86.0.tar.xz";

561+ url = "${mirror}/stable/frameworks/5.87/kxmlgui-5.87.0.tar.xz";

562+ sha256 = "1wnss0rjspgih3m2a3faflamf7n681k8sf8pzrcsrvvrzq95n65i";

563+ name = "kxmlgui-5.87.0.tar.xz";

564564 };

565565 };

566566 kxmlrpcclient = {

567− version = "5.86.0";

567+ version = "5.87.0";

568568 src = fetchurl {

569− url = "${mirror}/stable/frameworks/5.86/portingAids/kxmlrpcclient-5.86.0.tar.xz";

570− sha256 = "13av5ycwfl6580s0hpkxgak4dwm5i5xwvsxr44cxr8mj72syllnq";

571− name = "kxmlrpcclient-5.86.0.tar.xz";

569+ url = "${mirror}/stable/frameworks/5.87/portingAids/kxmlrpcclient-5.87.0.tar.xz";

570+ sha256 = "03l5zs4l52f3w01hsk00r8hmnccyy3iw2vhiclvpp6dksmb8yad7";

571+ name = "kxmlrpcclient-5.87.0.tar.xz";

572572 };

573573 };

574574 modemmanager-qt = {

575− version = "5.86.0";

575+ version = "5.87.0";

576576 src = fetchurl {

577− url = "${mirror}/stable/frameworks/5.86/modemmanager-qt-5.86.0.tar.xz";

578− sha256 = "0pdbx3w9rfvj6z8caw7bd4pspxrd852i0f9vvi17hhw0abvc0km3";

579− name = "modemmanager-qt-5.86.0.tar.xz";

577+ url = "${mirror}/stable/frameworks/5.87/modemmanager-qt-5.87.0.tar.xz";

578+ sha256 = "1ag98r2hhd93gki3dvlz48sgqc2805b0p0w4m0az0czvxnclg0rk";

579+ name = "modemmanager-qt-5.87.0.tar.xz";

580580 };

581581 };

582582 networkmanager-qt = {

583− version = "5.86.0";

583+ version = "5.87.0";

584584 src = fetchurl {

585− url = "${mirror}/stable/frameworks/5.86/networkmanager-qt-5.86.0.tar.xz";

586− sha256 = "1h1zfgdnc3331zxlb1g6l9x4n9rpmjjfz5rh4pqw6xplvgrapp2v";

587− name = "networkmanager-qt-5.86.0.tar.xz";

585+ url = "${mirror}/stable/frameworks/5.87/networkmanager-qt-5.87.0.tar.xz";

586+ sha256 = "0a4sxcm88mfry1sjc4r0qx5aqmbb61ghmd912wqk19nx18qgkm5y";

587+ name = "networkmanager-qt-5.87.0.tar.xz";

588588 };

589589 };

590590 oxygen-icons5 = {

591− version = "5.86.0";

591+ version = "5.87.0";

592592 src = fetchurl {

593− url = "${mirror}/stable/frameworks/5.86/oxygen-icons5-5.86.0.tar.xz";

594− sha256 = "1lgnw6w1mc50fpyasd8yx60vi6cgqj7f3h1jmkcz89nybypd1b52";

595− name = "oxygen-icons5-5.86.0.tar.xz";

593+ url = "${mirror}/stable/frameworks/5.87/oxygen-icons5-5.87.0.tar.xz";

594+ sha256 = "0mpxv2m6nkl1cp3p0xgpm916k2ykvkyk0x0ka4azs8iyy0anc36m";

595+ name = "oxygen-icons5-5.87.0.tar.xz";

596596 };

597597 };

598598 plasma-framework = {

599− version = "5.86.0";

599+ version = "5.87.0";

600600 src = fetchurl {

601− url = "${mirror}/stable/frameworks/5.86/plasma-framework-5.86.0.tar.xz";

602− sha256 = "17dfxqqw02430zfzncx1gdw4b4ab5mzwb3svq5xsjw0k4vh1airh";

603− name = "plasma-framework-5.86.0.tar.xz";

601+ url = "${mirror}/stable/frameworks/5.87/plasma-framework-5.87.0.tar.xz";

602+ sha256 = "1y7w4b7jb8rnkfan97yln5w9w68skrmif4wqqba4f9mj6y2dcajb";

603+ name = "plasma-framework-5.87.0.tar.xz";

604604 };

605605 };

606606 prison = {

607− version = "5.86.0";

607+ version = "5.87.0";

608608 src = fetchurl {

609− url = "${mirror}/stable/frameworks/5.86/prison-5.86.0.tar.xz";

610− sha256 = "1p2ix3aw8d3zp1fwywza82dqf73fyqc3pghcp9gfiywbfz2gcli2";

611− name = "prison-5.86.0.tar.xz";

609+ url = "${mirror}/stable/frameworks/5.87/prison-5.87.0.tar.xz";

610+ sha256 = "0vb8ny4za37v4nmcy9qw8zz5zcr46clci9lg22s84f26l4vlcs87";

611+ name = "prison-5.87.0.tar.xz";

612612 };

613613 };

614614 purpose = {

615− version = "5.86.0";

615+ version = "5.87.0";

616616 src = fetchurl {

617− url = "${mirror}/stable/frameworks/5.86/purpose-5.86.0.tar.xz";

618− sha256 = "18xvihyn6897vwk1x2y4xcmafdc2gqmxs58sjm17gm87xzxyc8k7";

619− name = "purpose-5.86.0.tar.xz";

617+ url = "${mirror}/stable/frameworks/5.87/purpose-5.87.0.tar.xz";

618+ sha256 = "0ddpm2hm3x1p25hkjzff4vs906n5bkkk4j3myh0gvyqn8accdhsd";

619+ name = "purpose-5.87.0.tar.xz";

620620 };

621621 };

622622 qqc2-desktop-style = {

623− version = "5.86.0";

623+ version = "5.87.0";

624624 src = fetchurl {

625− url = "${mirror}/stable/frameworks/5.86/qqc2-desktop-style-5.86.0.tar.xz";

626− sha256 = "1yd8j0lhbvqarxrknpvwnmsbggv8g7sg9fsgpzrimf4873pcslnv";

627− name = "qqc2-desktop-style-5.86.0.tar.xz";

625+ url = "${mirror}/stable/frameworks/5.87/qqc2-desktop-style-5.87.0.tar.xz";

626+ sha256 = "02i4rg5gf7i63lm4f0afm9n3lgzvklpbg43d0zcsdwzph386baq7";

627+ name = "qqc2-desktop-style-5.87.0.tar.xz";

628628 };

629629 };

630630 solid = {

631− version = "5.86.0";

631+ version = "5.87.0";

632632 src = fetchurl {

633− url = "${mirror}/stable/frameworks/5.86/solid-5.86.0.tar.xz";

634− sha256 = "0vcb47rh7bvvplfjbhrx8iz0vsrc5rgb9cinbyz0a9qhg062r1m0";

635− name = "solid-5.86.0.tar.xz";

633+ url = "${mirror}/stable/frameworks/5.87/solid-5.87.0.tar.xz";

634+ sha256 = "0zmcc4ryp4j93999f0fgwvchs4gycbynsz0wghrhdqkfhsjvhqra";

635+ name = "solid-5.87.0.tar.xz";

636636 };

637637 };

638638 sonnet = {

639− version = "5.86.0";

639+ version = "5.87.0";

640640 src = fetchurl {

641− url = "${mirror}/stable/frameworks/5.86/sonnet-5.86.0.tar.xz";

642− sha256 = "0rx32rdb1f45d2ihbjlhivv7088iqmdl22mj9sqi3phwn6xb3z0j";

643− name = "sonnet-5.86.0.tar.xz";

641+ url = "${mirror}/stable/frameworks/5.87/sonnet-5.87.0.tar.xz";

642+ sha256 = "1cc9j9ks33s6amr01a7ywnqiqvm498vlmqqva40ddvkfq1azxmhs";

643+ name = "sonnet-5.87.0.tar.xz";

644644 };

645645 };

646646 syndication = {

647− version = "5.86.0";

647+ version = "5.87.0";

648648 src = fetchurl {

649− url = "${mirror}/stable/frameworks/5.86/syndication-5.86.0.tar.xz";

650− sha256 = "13kbkgbqxqx1ldzi2jsg6xhhwszvmf0ahzjgvjxa3mighzyv2d7f";

651− name = "syndication-5.86.0.tar.xz";

649+ url = "${mirror}/stable/frameworks/5.87/syndication-5.87.0.tar.xz";

650+ sha256 = "1xbs83smgqzk01r7nds6p74v9n1pa0zhlafbbxlj2m226p1zf8bs";

651+ name = "syndication-5.87.0.tar.xz";

652652 };

653653 };

654654 syntax-highlighting = {

655− version = "5.86.0";

655+ version = "5.87.0";

656656 src = fetchurl {

657− url = "${mirror}/stable/frameworks/5.86/syntax-highlighting-5.86.0.tar.xz";

658− sha256 = "0381j4vvh4g2773zbfd4f54iq6d7mclpqcsrc1bplyy5avmsa073";

659− name = "syntax-highlighting-5.86.0.tar.xz";

657+ url = "${mirror}/stable/frameworks/5.87/syntax-highlighting-5.87.0.tar.xz";

658+ sha256 = "148wm3qdjkwzvcm51x3cppsxl4rylbjyjp1pfh6545fhikm5nqi6";

659+ name = "syntax-highlighting-5.87.0.tar.xz";

660660 };

661661 };

662662 threadweaver = {

663− version = "5.86.0";

663+ version = "5.87.0";

664664 src = fetchurl {

665− url = "${mirror}/stable/frameworks/5.86/threadweaver-5.86.0.tar.xz";

666− sha256 = "1gk45q3li66m8m9h26rm0l1ywzzdsy6shndd2d5hhq19irjbxp44";

667− name = "threadweaver-5.86.0.tar.xz";

665+ url = "${mirror}/stable/frameworks/5.87/threadweaver-5.87.0.tar.xz";

666+ sha256 = "1gqpzv2ijw66fpvaqv66xsglh19lv0k4j9i505xmmkzlyddbhkch";

667+ name = "threadweaver-5.87.0.tar.xz";

668668 };

669669 };

670670}

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

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 pname = "libaom";

5− version = "3.1.2";

5+ version = "3.1.3";

77 src = fetchzip {

88 url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";

9− sha256 = "1c7yrhb56qj5c3lz54n1f9cbrvdr32g2yrrdiiy72sib8ycq9hz2";

9+ sha256 = "08rk31d2cp9k9nj37s6a4n7klpfqfbj62anwyiggzsz7b68psjq3";

1010 stripRoot = false;

1111 };

1212

pkgs/development/libraries/libaom/outputs.patch+46−22

@@ -1,37 +1,55 @@

1+diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake

2+index 0bd2bf035..5cf5acea8 100644

13--- a/build/cmake/aom_install.cmake

24+++ b/build/cmake/aom_install.cmake

3−@@ -45,2 +45,2 @@ macro(setup_aom_install_targets)

5+@@ -42,8 +42,8 @@ macro(setup_aom_install_targets)

6+ -DAOM_ROOT=${AOM_ROOT}

7+ -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}

8+ -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}

49- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}

510- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}

611+ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}

712+ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}

8−@@ -82,14 +82,14 @@ macro(setup_aom_install_targets)

9− install(

10− FILES ${AOM_INSTALL_INCS}

11−- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom")

12−+ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom")

13− install(

14− FILES "${AOM_PKG_CONFIG_FILE}"

15−- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")

16−+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")

17− install(TARGETS ${AOM_INSTALL_LIBS} DESTINATION

18−- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")

19−+ "${CMAKE_INSTALL_FULL_LIBDIR}")

20−

21− if(ENABLE_EXAMPLES)

22− install(TARGETS ${AOM_INSTALL_BINS} DESTINATION

23−- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")

24−+ "${CMAKE_INSTALL_FULL_BINDIR}")

25− endif()

13+ -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}

14+ -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}

15+ -DCONFIG_TUNE_VMAF=${CONFIG_TUNE_VMAF}

16+@@ -84,12 +84,12 @@ macro(setup_aom_install_targets)

17+ # Setup the install rules. install() will automatically prepend

18+ # CMAKE_INSTALL_PREFIX to relative paths

19+ install(FILES ${AOM_INSTALL_INCS}

20+- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aom")

21++ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom")

22+ install(FILES "${AOM_PKG_CONFIG_FILE}"

23+- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

24++ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")

25+ install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS}

26+- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

27+- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

28+- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")

29++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"

30++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"

31++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")

2632 endif()

33+ endmacro()

34+diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake

35+index e8fff2e77..b8a73aad4 100644

2736--- a/build/cmake/pkg_config.cmake

2837+++ b/build/cmake/pkg_config.cmake

29−@@ -14,2 +14,2 @@

38+@@ -11,8 +11,8 @@

39+ cmake_minimum_required(VERSION 3.5)

40+

41+ set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "CMAKE_INSTALL_PREFIX"

3042- "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR"

3143- "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME"

3244+ "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR"

3345+ "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME"

34−@@ -38,4 +38,4 @@ endif()

46+ "CONFIG_MULTITHREAD" "HAVE_PTHREAD_H")

47+

48+ foreach(arg ${REQUIRED_ARGS})

49+@@ -35,15 +35,15 @@ else()

50+ endif()

51+

52+ # Write pkg-config info.

3553-set(prefix "${CMAKE_INSTALL_PREFIX}")

3654-set(bindir "${CMAKE_INSTALL_BINDIR}")

3755-set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")

@@ -40,6 +58,12 @@

4058+get_filename_component(exec_prefix "${CMAKE_INSTALL_FULL_LIBDIR}" DIRECTORY)

4159+get_filename_component(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}" NAME)

4260+get_filename_component(libdir "${CMAKE_INSTALL_FULL_LIBDIR}" NAME)

43−@@ -46 +46 @@ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")

61+ set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")

62+ string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)

63+ file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")

64+ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")

4465-file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n")

4566+file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n")

67+ file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/${includedir}\n")

68+ file(APPEND "${pkgconfig_file}" "libdir=\${exec_prefix}/${libdir}\n\n")

69+ file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")

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

@@ -15,11 +15,11 @@ in

1515with lib;

1616stdenv.mkDerivation rec {

1717 pname = "libass";

18− version = "0.15.1";

18+ version = "0.15.2";

1919

2020 src = fetchurl {

2121 url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";

22− sha256 = "sha256-HN05ydAHsG5zfnc4AE1/OM+bHpKEPzcweyTn/2OrjlM=";

22+ sha256 = "sha256-G+LfnESFpX14uxjAqO0Ve8h6Wo3UjGYZYcYlyxEoMv0=";

2323 };

2424

2525 configureFlags = [

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

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

33stdenv.mkDerivation rec {

44 pname = "libdeflate";

5− version = "1.7";

5+ version = "1.8";

77 src = fetchFromGitHub {

88 owner = "ebiggers";

99 repo = "libdeflate";

1010 rev = "v${version}";

11− sha256 = "1hnn1yd9s5h92xs72y73izak47kdz070kxkw3kyz2d3az6brfdgh";

11+ sha256 = "sha256-P7YbuhP2/zJCpE9dxZev1yy5oda8WKAHY84ZLTL8gVs=";

1212 };

1313

1414 postPatch = ''

pkgs/development/libraries/libfido2/default.nix+2−13

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

11{ lib

22, stdenv

33, fetchurl

4−, fetchpatch

54, cmake

65, pkg-config

76, hidapi

@@ -13,24 +12,14 @@

1312

1413stdenv.mkDerivation rec {

1514 pname = "libfido2";

16− version = "1.7.0";

15+ version = "1.8.0";

1716

1817 # releases on https://developers.yubico.com/libfido2/Releases/ are signed

1918 src = fetchurl {

2019 url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";

21− sha256 = "13khkp2q8g447797l09p83qxy0z8vgmzr54l8dcnapy9lsr4jrqi";

20+ sha256 = "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm";

2221 };

2322

24− patches = [

25− # fix log truncation

26− # https://github.com/Yubico/libfido2/issues/318

27− # https://github.com/Yubico/libfido2/pull/319

28− (fetchpatch {

29− url = "https://github.com/Yubico/libfido2/commit/8edb9a204b2f4aeb487e282908c3187f1d02d606.patch";

30− sha256 = "1i360bghwbdccgkzjfzvhilscnwsj9lhfiviy000n928698l4wan";

31− })

32− ];

33−

3423 nativeBuildInputs = [ cmake pkg-config ];

3524

3625 buildInputs = [ libcbor openssl zlib ]

pkgs/development/libraries/libfive/default.nix−2

@@ -36,8 +36,6 @@ mkDerivation {

3636 -change libfive.dylib $out/lib/libfive.dylib \

3737 -change libfive-guile.dylib $out/lib/libfive-guile.dylib \

3838 $out/Applications/Studio.app/Contents/MacOS/Studio

39−

40− wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio

4139 '' else ''

4240 # Link "Studio" binary to "libfive-studio" to be more obvious:

4341 ln -s "$out/bin/Studio" "$out/bin/libfive-studio"

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

@@ -22,11 +22,11 @@ in

2222

2323stdenv.mkDerivation rec {

2424 pname = "libinput";

25− version = "1.18.1";

25+ version = "1.19.1";

2626

2727 src = fetchurl {

2828 url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz";

29− sha256 = "1jx7y48ym89grjz67jmn80h5j8c36qgwb0h5c703nln2zchl18cw";

29+ sha256 = "sha256-C9z1sXg7c3hUt68coi32e8Nqb+fJz6cfAekUn5IgRG0=";

3030 };

3131

3232 outputs = [ "bin" "out" "dev" ];

pkgs/development/libraries/libksba/default.nix+4−2

@@ -1,10 +1,11 @@

11{ buildPackages, lib, stdenv, fetchurl, gettext, libgpg-error }:

33stdenv.mkDerivation rec {

4− name = "libksba-1.5.1";

4+ pname = "libksba";

5+ version = "1.5.1";

67 src = fetchurl {

7− url = "mirror://gnupg/libksba/${name}.tar.bz2";

8+ url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2";

89 sha256 = "sha256-sPTGXk5EfZojSfa4wOd6KL6VMeRUi6AsVF0fRtx7+SE=";

910 };

1011

@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {

2627 homepage = "https://www.gnupg.org";

2728 description = "CMS and X.509 access library";

2829 platforms = platforms.all;

30+ maintainers = with maintainers; [ ];

2931 license = licenses.lgpl3;

3032 };

3133}

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

@@ -15,13 +15,13 @@

1515

1616stdenv.mkDerivation rec {

1717 pname = "libqmi";

18− version = "1.28.8";

18+ version = "1.30.2";

1919

2020 outputs = [ "out" "dev" "devdoc" ];

2121

2222 src = fetchurl {

2323 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";

24− sha256 = "sha256-bju70gC8G2SyP2JU/vkhLyaZ7HfPsyB10rpQecc6n3g=";

24+ sha256 = "sha256-vgHs4OosIZTL6ldEv1qvBsBLpft+x4h6ExFsdtEU/t0=";

2525 };

2626

2727 nativeBuildInputs = [

pkgs/development/libraries/librsvg/default.nix+24−12

@@ -12,10 +12,12 @@

1212, ApplicationServices

1313, Foundation

1414, libobjc

15+, rustPlatform

1516, rustc

1617, cargo

1718, gnome

1819, vala

20+, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform

1921, gobject-introspection

2022, nixosTests

2123}:

@@ -31,15 +33,21 @@ stdenv.mkDerivation rec {

3133 sha256 = "14zkdd7a9mymnfs3laqj0gr69c16nwixvbc5a4gvd534w6riz0mx";

3234 };

3335

36+ cargoVendorDir = "vendor";

37+

38+ strictDeps = true;

39+

40+ depsBuildBuild = [ pkg-config ];

41+

3442 nativeBuildInputs = [

43+ gdk-pixbuf

3544 pkg-config

3645 rustc

3746 cargo

3847 vala

48+ rustPlatform.cargoSetupHook

49+ ] ++ lib.optionals withIntrospection [

3950 gobject-introspection

40− ] ++ lib.optionals stdenv.isDarwin [

41− ApplicationServices

42− Foundation

4351 ];

4452

4553 buildInputs = [

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

4755 bzip2

4856 pango

4957 libintl

58+ ] ++ lib.optionals withIntrospection [

59+ gobject-introspection

5060 ] ++ lib.optionals stdenv.isDarwin [

61+ ApplicationServices

62+ Foundation

5163 libobjc

5264 ];

5365

@@ -58,12 +70,12 @@ stdenv.mkDerivation rec {

5870 ];

5971

6072 configureFlags = [

61− "--enable-introspection"

62− ] ++ lib.optionals (!stdenv.isDarwin) [

73+ (lib.enableFeature withIntrospection "introspection")

74+

6375 # Vapi does not build on MacOS.

6476 # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004

65− "--enable-vala"

66− ] ++ [

77+ (lib.enableFeature (withIntrospection && !stdenv.isDarwin) "vala")

78+

6779 "--enable-installed-tests"

6880 "--enable-always-build-tests"

6981 ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic";

@@ -95,11 +107,11 @@ stdenv.mkDerivation rec {

95107 -i gdk-pixbuf-loader/librsvg.thumbnailer.in

96108 '';

97109

98− # Merge gdkpixbuf and librsvg loaders

99− postInstall = ''

100− mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp

101− cat ${gdk-pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache

102− rm $GDK_PIXBUF/loaders.cache.tmp

110+ # Not generated when cross compiling.

111+ postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''

112+ # Merge gdkpixbuf and librsvg loaders

113+ cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp

114+ mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache

103115 '';

104116

105117 passthru = {

pkgs/development/libraries/libvirt/5.9.0.nix+3−4

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

22, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch

33, coreutils, libxml2, gnutls, perl, python2, attr

44, iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext

5−, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor

5+, libtasn1, libgcrypt, yajl, pmutils, libcap_ng, libapparmor

66, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages

77, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc

88, enableXen ? false, xen ? null

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

5454

5555 preConfigure = ''

5656 ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }

57− PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

57+ PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

5858 # the path to qemu-kvm will be stored in VM's .xml and .save files

5959 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations

6060 substituteInPlace src/lxc/lxc_conf.c \

@@ -75,7 +75,6 @@ in stdenv.mkDerivation rec {

7575 ] ++ optionals stdenv.isLinux [

7676 "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"

7777 "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"

78− "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"

7978 "CFLAGS=-I${libtirpc.dev}/include/tirpc"

8079 "--with-attr"

8180 "--with-apparmor"

@@ -101,7 +100,7 @@ in stdenv.mkDerivation rec {

101100

102101

103102 postInstall = let

104− binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];

103+ binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];

105104 in ''

106105 substituteInPlace $out/libexec/libvirt-guests.sh \

107106 --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \

pkgs/development/libraries/libvirt/default.nix+2−17

@@ -22,7 +22,6 @@

2222, gettext

2323, libtasn1

2424, iptables

25−, ebtables

2625, libgcrypt

2726, yajl

2827, pmutils

@@ -68,19 +67,6 @@ with lib;

6867# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>

6968let

7069 buildFromTarball = stdenv.isDarwin;

71− # libvirt hardcodes the binary name 'ebtables', but in nixpkgs the ebtables

72− # binary we want to use is named 'ebtables-legacy'.

73− # Create a derivation to alias the binary name so that libvirt can find the right one, and use that below.

74− ebtables-compat = stdenv.mkDerivation {

75− pname = "ebtables-compat";

76− version = ebtables.version;

77− src = null;

78− buildInputs = [ ebtables ];

79− buildCommand = ''

80− mkdir -p $out/bin

81− ln -sf ${ebtables}/bin/ebtables-legacy $out/bin/ebtables

82− '';

83− };

8470in

8571stdenv.mkDerivation rec {

8672 pname = "libvirt";

@@ -179,7 +165,7 @@ stdenv.mkDerivation rec {

179165 '';

180166 in

181167 ''

182− PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

168+ PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

183169 # the path to qemu-kvm will be stored in VM's .xml and .save files

184170 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations

185171 substituteInPlace src/lxc/lxc_conf.c \

@@ -227,8 +213,7 @@ stdenv.mkDerivation rec {

227213

228214 postInstall =

229215 let

230− # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332)

231− binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];

216+ binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];

232217 in

233218 ''

234219 substituteInPlace $out/libexec/libvirt-guests.sh \

pkgs/development/libraries/libxml2/default.nix+4−1

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

11{ stdenv, lib, fetchurl, fetchpatch

22, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs

3+, libiconv

34, pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform

45, icuSupport ? false, icu ? null

56, enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic

@@ -52,7 +53,9 @@ stdenv.mkDerivation rec {

5253 # RUNPATH for that, leading to undefined references for its users.

5354 ++ lib.optional stdenv.isFreeBSD xz;

5455

55− propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu;

56+ propagatedBuildInputs = [ zlib findXMLCatalogs ]

57+ ++ lib.optional stdenv.isDarwin libiconv

58+ ++ lib.optional icuSupport icu;

5659

5760 configureFlags = [

5861 "--exec_prefix=$dev"

pkgs/development/libraries/mesa/default.nix+6−2

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

3333let

3434 # Release calendar: https://www.mesa3d.org/release-calendar.html

3535 # Release frequency: https://www.mesa3d.org/releasing.html#schedule

36− version = "21.2.3";

36+ version = "21.2.5";

3737 branch = versions.major version;

3838

3939self = stdenv.mkDerivation {

@@ -47,7 +47,7 @@ self = stdenv.mkDerivation {

4747 "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"

4848 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"

4949 ];

50− sha256 = "0x3ivd34j938js2iffzlvnlj4hwywxrscd8q1rvq894x2m52hibj";

50+ sha256 = "1fxcdf4qs4vmyjcns7jv62w4jy3gr383ar5b7mr77nb0nxgmhjcf";

5151 };

5252

5353 # TODO:

@@ -93,6 +93,10 @@ self = stdenv.mkDerivation {

9393 ++ lib.optional stdenv.isLinux "driversdev"

9494 ++ lib.optional enableOpenCL "opencl";

9595

96+ preConfigure = ''

97+ PATH=${llvmPackages.libllvm.dev}/bin:$PATH

98+ '';

99+

96100 # TODO: Figure out how to enable opencl without having a runtime dependency on clang

97101 mesonFlags = [

98102 "--sysconfdir=/etc"

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

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

2727 # It will rebuild itself using the version of this package (NSS) and if

2828 # an update is required do the required changes to the expression.

2929 # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

30− version = "3.70";

30+ version = "3.71";

3131

3232in

3333stdenv.mkDerivation rec {

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

3636

3737 src = fetchurl {

3838 url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz";

39− sha256 = "sha256-K4mruGAe5AW+isW1cD1x8fs4pRw6ZKPYNDh/eLMlURs=";

39+ sha256 = "0ly2l3dv6z5hlxs72h5x6796ni3x1bq60saavaf42ddgv4ax7b4r";

4040 };

4141

4242 depsBuildBuild = [ buildPackages.stdenv.cc ];

pkgs/development/libraries/p11-kit/default.nix+1−1

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

3131 configureFlags = [

3232 "--sysconfdir=/etc"

3333 "--localstatedir=/var"

34− "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt"

34+ "--with-trust-paths=/etc/ssl/trust-source:/etc/ssl/certs/ca-certificates.crt"

3535 ];

3636

3737 enableParallelBuilding = true;

pkgs/development/libraries/qt-5/5.15/default.nix+5

@@ -112,6 +112,11 @@ let

112112 url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8";

113113 sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc";

114114 })

115+ (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/363880/3 is included in an release.

116+ name = "qtbase-mysql-version-vs-functionality-check.patch";

117+ url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=211369133cf40b2f522caaff259c19069ed23ca4";

118+ sha256 = "19kq9h10qm344fpdqa9basrbzh1y5kr48c6jzz3nvk61pk4ja1k4";

119+ })

115120 ];

116121 qtdeclarative = [ ./qtdeclarative.patch ];

117122 qtscript = [ ./qtscript.patch ];

pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh+2−2

@@ -76,7 +76,7 @@ wrapQtAppsHook() {

7676 [ -z "$wrapQtAppsHookHasRun" ] || return 0

7777 wrapQtAppsHookHasRun=1

7878

79− local targetDirs=( "$prefix/bin" "$prefix/sbin" "$prefix/libexec" )

79+ local targetDirs=( "$prefix/bin" "$prefix/sbin" "$prefix/libexec" "$prefix/Applications" "$prefix/"*.app )

8080 echo "wrapping Qt applications in ${targetDirs[@]}"

8181

8282 for targetDir in "${targetDirs[@]}"

@@ -85,7 +85,7 @@ wrapQtAppsHook() {

8585

8686 find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file

8787 do

88− patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue

88+ isELF "$file" || isMachO "$file" || continue

8989

9090 if [ -f "$file" ]

9191 then

pkgs/development/libraries/science/math/suitesparse/default.nix+3−3

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

1212

1313stdenv.mkDerivation rec {

1414 pname = "suitesparse";

15− version = "5.9.0";

15+ version = "5.10.1";

1616

1717 outputs = [ "out" "dev" "doc" ];

1818

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

2020 owner = "DrTimothyAldenDavis";

2121 repo = "SuiteSparse";

2222 rev = "v${version}";

23− sha256 = "sha256-tvwpSVgZrfYZHXHN8OQF0Y/aJM03JHGPFok7hUqPE/4=";

23+ sha256 = "sha256-ifuoXgVQp2vHR/reC/Hjbt3vqaKpql3Nfxdb/Cgv/aU=";

2424 };

2525

2626 nativeBuildInputs = [

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

5353 "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"

5454 ] ++ lib.optionals stdenv.isDarwin [

5555 # Unless these are set, the build will attempt to use `Accelerate` on darwin, see:

56− # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.9.0/SuiteSparse_config/SuiteSparse_config.mk#L368

56+ # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.10.1/SuiteSparse_config/SuiteSparse_config.mk#L368

5757 "BLAS=-lblas"

5858 "LAPACK=-llapack"

5959 ]

pkgs/development/libraries/uthash/default.nix+10−10

@@ -1,23 +1,23 @@

1−{ lib, stdenv, fetchurl, perl }:

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

33stdenv.mkDerivation rec {

44 pname = "uthash";

5− version = "2.1.0";

5+ version = "2.3.0";

7− src = fetchurl {

8− url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";

9− sha256 = "17k6k97n20jpi9zj3lzvqfw8pv670r6rdqrjf8vrbx6hcj7csb0m";

7+ src = fetchFromGitHub {

8+ owner = "troydhanson";

9+ repo = pname;

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

11+ sha256 = "sha256-F0M5ENT3bMn3dD16Oaq9mBFYOWzVliVWupAIrLc2nkQ=";

1012 };

1113

12− dontBuild = false;

13−

1414 doCheck = true;

1515 checkInputs = [ perl ];

16− checkTarget = "-C tests/";

16+ checkTarget = "all";

17+ preCheck = "cd tests";

1718

1819 installPhase = ''

19− mkdir -p "$out/include"

20− cp ./src/* "$out/include/"

20+ install -Dm644 $src/include/*.h -t $out/include

2121 '';

2222

2323 meta = with lib; {

pkgs/development/python-modules/FormEncode/default.nix+26−10

@@ -1,34 +1,50 @@

1−{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools-scm, six, isPy27 }:

1+{ lib

2+, buildPythonPackage

3+, isPy27

4+, fetchPypi

5+, nose

6+, setuptools-scm

7+, six

8+, dnspython

9+, pycountry

10+, pytestCheckHook

11+}:

212

313buildPythonPackage rec {

414 pname = "FormEncode";

5− version = "2.0.0";

15+ version = "2.0.1";

616

717 disabled = isPy27;

818

919 src = fetchPypi {

1020 inherit pname version;

11− sha256 = "049pm276140h30xgzwylhpii24xcln1qfdlfmbj69sqpfhlr5szj";

21+ sha256 = "8f2974112c2557839d5bae8b76490104c03830785d923abbdef148bf3f710035";

1222 };

1323

1424 postPatch = ''

15− sed -i 's/setuptools_scm_git_archive//' setup.py

16− sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py

25+ sed -i '/setuptools_scm_git_archive/d' setup.py

1726 '';

1827

1928 nativeBuildInputs = [ setuptools-scm ];

29+

2030 propagatedBuildInputs = [ six ];

2131

22− checkInputs = [ dnspython pycountry nose ];

32+ checkInputs = [

33+ dnspython

34+ pycountry

35+ pytestCheckHook

36+ ];

2337

24− preCheck = ''

25− # requires dns resolving

26− sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py

27− '';

38+ disabledTests = [

39+ # requires network for DNS resolution

40+ "test_doctests"

41+ "test_unicode_ascii_subgroup"

42+ ];

2843

2944 meta = with lib; {

3045 description = "FormEncode validates and converts nested structures";

3146 homepage = "http://formencode.org";

3247 license = licenses.mit;

48+ maintainers = with maintainers; [ ];

3349 };

3450}

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

@@ -8,11 +8,11 @@

99buildPythonPackage rec {

1010 pname = "absl-py";

11− version = "0.13.0";

11+ version = "0.14.1";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "6953272383486044699fd0e9f00aad167a27e08ce19aae66c6c4b10e7e767793";

15+ sha256 = "eb0383bd431c0d7b2320179904cab00120a10977e3c9671d99efbbed17efb55a";

1616 };

1717

1818 propagatedBuildInputs = [

pkgs/development/python-modules/accupy/default.nix+10−7

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

11{ lib

22, buildPythonPackage

3−, fetchPypi

3+, fetchFromGitHub

44, pythonOlder

55, mpmath

66, numpy

@@ -11,17 +11,19 @@

1111, pytestCheckHook

1212, matplotlib

1313, dufte

14−, isPy27

14+, perfplot

1515}:

1616

1717buildPythonPackage rec {

1818 pname = "accupy";

19− version = "0.3.4";

20− disabled = isPy27;

19+ version = "0.3.6";

20+ disabled = pythonOlder "3.7";

2121

22− src = fetchPypi {

23− inherit pname version;

24− sha256 = "36506aca53154528997ac22aee6292c83da0f4850bb375c149512b5284bd4948";

22+ src = fetchFromGitHub {

23+ owner = "nschloe";

24+ repo = pname;

25+ rev = version;

26+ sha256 = "0sxkwpp2xy2jgakhdxr4nh1cspqv8l89kz6s832h05pbpyc0n767";

2527 };

2628

2729 nativeBuildInputs = [

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

3941 ] ++ lib.optional (pythonOlder "3.8") importlib-metadata;

4042

4143 checkInputs = [

44+ perfplot

4245 pytestCheckHook

4346 matplotlib

4447 dufte

pkgs/development/python-modules/afdko/default.nix+7−1

@@ -58,7 +58,13 @@ buildPythonPackage rec {

5858 # https://github.com/adobe-type-tools/afdko/issues/1216

5959 doCheck = stdenv.isx86_64;

6060 checkInputs = [ pytestCheckHook ];

61− preCheck = "export PATH=$PATH:$out/bin";

61+ preCheck = ''

62+ export PATH=$PATH:$out/bin

63+

64+ # Update tests to match ufinormalizer-0.6.1 expectations:

65+ # https://github.com/adobe-type-tools/afdko/issues/1418

66+ find tests -name layerinfo.plist -delete

67+ '';

6268 disabledTests = [

6369 # Disable slow tests, reduces test time ~25 %

6470 "test_report"

pkgs/development/python-modules/aioambient/default.nix+5

@@ -27,6 +27,11 @@ buildPythonPackage rec {

2727 sha256 = "sha256-blejTXyLe3B2kNytBh+zJz0Q0xDP+Vo2SV9gc7OX6S0=";

2828 };

2929

30+ postPatch = ''

31+ substituteInPlace pyproject.toml \

32+ --replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"'

33+ '';

34+

3035 nativeBuildInputs = [

3136 poetry-core

3237 ];

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

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "aiobotocore";

13− version = "1.4.1";

13+ version = "1.4.2";

1414 disabled = pythonOlder "3.7";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "09f06723d1d69c6d407d9a356ca65ab42a5b7b73a45be4b1ed0ed1a6b6057a9f";

18+ sha256 = "c2f4ef325aaa839e9e2a53346b4c1c203656783a4985ab36fd4c2a9ef2dc1d2b";

1919 };

2020

2121 # relax version constraints: aiobotocore works with newer botocore versions

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

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

1414

1515buildPythonPackage rec {

1616 pname = "alembic";

17− version = "1.7.1";

17+ version = "1.7.4";

1818 format = "setuptools";

1919

2020 disabled = pythonOlder "3.6";

2121

2222 src = fetchPypi {

2323 inherit pname version;

24− sha256 = "aea964d3dcc9c205b8759e4e9c1c3935ea3afeee259bffd7ed8414f8085140fb";

24+ sha256 = "9d33f3ff1488c4bfab1e1a6dfebbf085e8a8e1a3e047a43ad29ad1f67f012a1d";

2525 };

2626

2727 propagatedBuildInputs = [

pkgs/development/python-modules/amqtt/default.nix+5

@@ -26,6 +26,11 @@ buildPythonPackage rec {

2626 sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I=";

2727 };

2828

29+ postPatch = ''

30+ substituteInPlace pyproject.toml \

31+ --replace 'websockets = "^9.0"' 'websockets = "^10.0"'

32+ '';

33+

2934 nativeBuildInputs = [ poetry-core ];

3035

3136 propagatedBuildInputs = [

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

@@ -12,13 +12,13 @@

1212

1313buildPythonPackage rec {

1414 pname = "arrow";

15− version = "1.1.1";

15+ version = "1.2.0";

1616

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "dee7602f6c60e3ec510095b5e301441bc56288cb8f51def14dcb3079f623823a";

21+ sha256 = "16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074";

2222 };

2323

2424 postPatch = ''

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

@@ -22,13 +22,13 @@

2222

2323buildPythonPackage rec {

2424 pname = "arviz";

25− version = "0.11.2";

25+ version = "0.11.4";

2626

2727 src = fetchFromGitHub {

2828 owner = "arviz-devs";

2929 repo = "arviz";

3030 rev = "v${version}";

31− sha256 = "0npwrpy262y6zqd0znz4w7ikfdyz4kc4gikmkpj6h1j6vxggrfaa";

31+ sha256 = "0vindadyxhxhrhbalys6kzrda2d4qpqbqbsbwfprp8pxkldgk548";

3232 };

3333

3434 propagatedBuildInputs = [

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

@@ -1,10 +1,12 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4+, fetchpatch

45, pythonOlder

56, isPyPy

67, lazy-object-proxy

78, wrapt

9+, typing-extensions

810, typed-ast

911, pytestCheckHook

1012, setuptools-scm

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

1315

1416buildPythonPackage rec {

1517 pname = "astroid";

16− version = "2.7.3"; # Check whether the version is compatible with pylint

18+ version = "2.8.2"; # Check whether the version is compatible with pylint

1719

1820 disabled = pythonOlder "3.6";

1921

@@ -21,11 +23,19 @@ buildPythonPackage rec {

2123 owner = "PyCQA";

2224 repo = pname;

2325 rev = "v${version}";

24− sha256 = "08qxw58cdyglkni6ahyil4cmnb48zz0wr4v05gzqk4r5ifs4gl2m";

26+ sha256 = "0140h4l7licwdw0scnfzsbi5b2ncxi7fxhdab7c1i3sk01r4asp6";

2527 };

2628

2729 SETUPTOOLS_SCM_PRETEND_VERSION=version;

2830

31+ patches = [

32+ (fetchpatch {

33+ # Allow wrapt 1.13 (https://github.com/PyCQA/astroid/pull/1203)

34+ url = "https://github.com/PyCQA/astroid/commit/fd510e08c2ee862cd284861e02b9bcc9a7fd9809.patch";

35+ sha256 = "1s10whslcqnyz251fb76qkc9p41gagxljpljsmw89id1wywmjib4";

36+ })

37+ ];

38+

2939 nativeBuildInputs = [

3040 setuptools-scm

3141 ];

@@ -34,6 +44,8 @@ buildPythonPackage rec {

3444 propagatedBuildInputs = [

3545 lazy-object-proxy

3646 wrapt

47+ ] ++ lib.optionals (pythonOlder "3.10") [

48+ typing-extensions

3749 ] ++ lib.optional (!isPyPy && pythonOlder "3.8") typed-ast;

3850

3951 checkInputs = [

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

@@ -18,12 +18,12 @@

1818

1919buildPythonPackage rec {

2020 pname = "asyncssh";

21− version = "2.7.1";

21+ version = "2.7.2";

2222 disabled = pythonOlder "3.6";

2323

2424 src = fetchPypi {

2525 inherit pname version;

26− sha256 = "8c8852eb00a09e45c403086e10965cb6d13e5cd203a1688d91e9c81aa080d052";

26+ sha256 = "96b09239c3cc134cfb66ae1138313fdb48cc390806f21f831dd44f8a1d8252a1";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/aws-lambda-builders/default.nix+2−2

@@ -12,14 +12,14 @@

1212

1313buildPythonPackage rec {

1414 pname = "aws-lambda-builders";

15− version = "1.6.0";

15+ version = "1.8.1";

1616

1717 # No tests available in PyPI tarball

1818 src = fetchFromGitHub {

1919 owner = "awslabs";

2020 repo = "aws-lambda-builders";

2121 rev = "v${version}";

22− sha256 = "sha256-H25Y1gusV+sSX0f6ii49bE36CgM1E3oWsX8AiVH85Y4=";

22+ sha256 = "1avq04hmps2cd33dd5n4bc3lclqg0hv6khn804fbv0hmy7lywp8b";

2323 };

2424

2525 # Package is not compatible with Python 3.5

pkgs/development/python-modules/aws-sam-translator/default.nix+2−2

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

1414

1515buildPythonPackage rec {

1616 pname = "aws-sam-translator";

17− version = "1.38.0";

17+ version = "1.39.0";

1818

1919 src = fetchFromGitHub {

2020 owner = "aws";

2121 repo = "serverless-application-model";

2222 rev = "v${version}";

23− sha256 = "0nn9jfqz13kzmxm0r9vy24p8sqxv3mrm5d3lx7ah6rc581q8nv1k";

23+ sha256 = "1a9m7zyqc414adw1i0sr2n9nlnmry0gi1ah1qna3yv9dx4ql9v9c";

2424 };

2525

2626 propagatedBuildInputs = [

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

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

33buildPythonPackage rec {

44 pname = "awscrt";

5− version = "0.12.4";

5+ version = "0.12.5";

77 buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];

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

2222

2323 src = fetchPypi {

2424 inherit pname version;

25− sha256 = "6ad69336bc5277f501bd7e33f82e11db2665370c7d279496ee39fe2f369baeb2";

25+ sha256 = "8bb80b37ebfd01f6078c60bb3231118380ac06842de692f6e37b6f8643e15a1d";

2626 };

2727

2828 meta = with lib; {

pkgs/development/python-modules/azure-core/default.nix+5

@@ -44,6 +44,11 @@ buildPythonPackage rec {

4444 typing-extensions

4545 ];

4646

47+ # test server needs to be available

48+ preCheck = ''

49+ export PYTHONPATH=tests/testserver_tests/coretestserver:$PYTHONPATH

50+ '';

51+

4752 pytestFlagsArray = [ "tests/" ];

4853 # disable tests which touch network

4954 disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ];

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

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

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4+, fetchpatch

45, stdenv

56, zlib

67, xz

@@ -21,15 +22,28 @@

2122

2223buildPythonPackage rec {

2324 pname = "binwalk";

24− version = "2.3.2";

25+ version = "2.3.3";

2526

2627 src = fetchFromGitHub {

2728 owner = "ReFirmLabs";

2829 repo = "binwalk";

2930 rev = "v${version}";

30− sha256 = "sha256-lfHXutAp06Xr/TSBpDwBUBC/mWI9XuyImoKwA3inqgU=";

31+ sha256 = "0phqyqv34vhh80dgipiggs4n3iq2vfjk9ywx2c5d8g61vzgbd2g8";

3132 };

3233

34+ patches = [

35+ # test_firmware_zip fails with 2.3.3 upgrade

36+ # https://github.com/ReFirmLabs/binwalk/issues/566

37+ (fetchpatch {

38+ url = "https://github.com/ReFirmLabs/binwalk/commit/dd4f2efd275c9dd1001130e82e0f985110cd2754.patch";

39+ sha256 = "1707n4nf1d1ay1yn4i8qlrvj2c1120g88hjwyklpsc2s2dcnqj9r";

40+ includes = [

41+ "testing/tests/test_firmware_zip.py"

42+ ];

43+ revert = true;

44+ })

45+ ];

46+

3347 propagatedBuildInputs = [ zlib xz gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]

3448 ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]

3549 ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ];

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

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

55buildPythonPackage rec {

66 pname = "blessed";

7− version = "1.18.1";

7+ version = "1.19.0";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "8b09936def6bc06583db99b65636b980075733e13550cb6af262ce724a55da23";

11+ sha256 = "4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61";

1212 };

1313

1414 checkInputs = [ pytest mock glibcLocales ];

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "block-io";

5− version = "2.0.4";

5+ version = "2.0.5";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "817c9cd2ff76659caca4bb3d6758d5782a85f8c0ea13b08c4e14f0c2a8b7586d";

9+ sha256 = "af70c3be444f2f2d07c0603cef547b51bbd9f4fbd4aadebd8f1e8ee73ccbc5e5";

1010 };

1111

1212 propagatedBuildInputs = [

pkgs/development/python-modules/buildcatrust/default.nixnew file+32

@@ -0,0 +1,32 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pytestCheckHook

5+}:

7+buildPythonPackage rec {

8+ pname = "buildcatrust";

9+ version = "0.1.3";

10+

11+ src = fetchPypi {

12+ inherit pname version;

13+ sha256 = "sha256:0s0m0fy943dakw9cbd40h46qmrhhgrcp292kppyb34m6y27sbagy";

14+ };

15+

16+ checkInputs = [

17+ pytestCheckHook

18+ ];

19+ disabledTestPaths = [

20+ # Non-hermetic, needs internet access (e.g. attempts to retrieve NSS store).

21+ "buildcatrust/tests/test_nonhermetic.py"

22+ ];

23+

24+ pythonImportsCheck = [ "buildcatrust" "buildcatrust.cli" ];

25+

26+ meta = with lib; {

27+ description = "Build SSL/TLS trust stores";

28+ homepage = "https://github.com/lukegb/buildcatrust";

29+ license = licenses.mit;

30+ maintainers = with maintainers; [ lukegb ];

31+ };

32+}

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

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

88buildPythonPackage rec {

99 pname = "certifi";

10− version = "2021.05.30";

10+ version = "2021.10.08";

1111

1212 disabled = isPy27;

1313

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

1515 owner = pname;

1616 repo = "python-certifi";

1717 rev = version;

18− sha256 = "1i4ljsc47iac6kl1w4w6x0qia08s9z394z9lbyzc05pm7y8a3cmj";

18+ sha256 = "sha256-SFb/spVHK15b53ZG1P147DcTjs1dqR0+MBXzpE+CWpo=";

1919 };

2020

2121 checkInputs = [

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

@@ -21,13 +21,13 @@

2121

2222buildPythonPackage rec {

2323 pname = "cfn-lint";

24− version = "0.53.1";

24+ version = "0.54.2";

2525

2626 src = fetchFromGitHub {

2727 owner = "aws-cloudformation";

2828 repo = "cfn-python-lint";

2929 rev = "v${version}";

30− sha256 = "1wj2pzrrmrdf3mkhnz1qx41rshvfpgwlrxrb80d63r098pnq6df8";

30+ sha256 = "04d5zyjnrl3b6cb2fxmbpii27mnq77wqsglfxfv2a1zj2p9xby0p";

3131 };

3232

3333 postPatch = ''

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

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

1010

1111buildPythonPackage rec {

1212 pname = "cftime";

13− version = "1.5.0";

13+ version = "1.5.1";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "b644bcb53346b6f4fe2fcc9f3b574740a2097637492dcca29632c817e0604f29";

17+ sha256 = "8a398caed78389b366f1037ca62939ff01af2f1789c77bce05eb903f19ffd840";

1818 };

1919

2020 checkInputs = [

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

@@ -6,13 +6,13 @@

77buildPythonPackage rec {

88 pname = "charset-normalizer";

9− version = "2.0.1";

9+ version = "2.0.5";

1010

1111 src = fetchFromGitHub {

1212 owner = "Ousret";

1313 repo = "charset_normalizer";

1414 rev = version;

15− sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq";

15+ sha256 = "0pv6yf5ialc82iimsjbq3gp5hh02pg4a7sdma48gd81h4h8qd627";

1616 };

1717

1818 checkInputs = [

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

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

1010

1111buildPythonPackage rec {

1212 pname = "cli_helpers";

13− version = "2.1.0";

13+ version = "2.2.0";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "dd6f164310f7d86fa3da1f82043a9c784e44a02ad49be932a80624261e56979b";

17+ sha256 = "733f65d8c921e0cffa8f7ae4c8735bd7ecdffec383c5246f647ddd0fddb33448";

1818 };

1919

2020 propagatedBuildInputs = [

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

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

55buildPythonPackage rec {

66 pname = "click-didyoumean";

7− version = "0.0.3";

7+ version = "0.3.0";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi";

11+ sha256 = "f184f0d851d96b6d29297354ed981b7dd71df7ff500d82fa6d11f0856bee8035";

1212 };

1313

1414 propagatedBuildInputs = [ click ];

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

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

1010buildPythonPackage rec {

1111 pname = "click";

12− version = "8.0.1";

12+ version = "8.0.2";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "0ymdyf37acq4qxh038q0xx44qgj6y2kf0jd0ivvix6qij88w214c";

16+ sha256 = "7027bc7bbafaab8b2c2816861d8eb372429ee3c02e193fc2f93d6c4ab9de49c5";

1717 };

1818

1919 postPatch = ''

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

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

88buildPythonPackage rec {

99 pname = "cmarkgfm";

10− version = "0.5.3";

10+ version = "0.6.0";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "sha256-tqVJq6Mnq9mG1nSM8hyGN9dBx2hQ5/773vjSi/4TjjI=";

14+ sha256 = "ec2bf8d5799c4b5bbfbae30a4a1dfcb06512f2e17e9ee60ba7e1d390318582fc";

1515 };

1616

1717 propagatedBuildInputs = [ cffi ];

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

@@ -18,13 +18,13 @@

1818

1919buildPythonPackage rec {

2020 pname = "cmd2";

21− version = "2.1.2";

21+ version = "2.2.0";

2222

2323 disabled = pythonOlder "3.6";

2424

2525 src = fetchPypi {

2626 inherit pname version;

27− sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41";

27+ sha256 = "34cd12424d9e2835eff125146af3d9f4a4c2931c6bc5a3cea9790bd4f55756d9";

2828 };

2929

3030 LC_ALL = "en_US.UTF-8";

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

@@ -2,10 +2,10 @@

33buildPythonPackage rec {

44 pname = "curtsies";

5− version = "0.3.5";

5+ version = "0.3.9";

66 src = fetchPypi {

77 inherit pname version;

8− sha256 = "1g8dwafx4vx06isjkn28r3cwb0hw1bv67lgygaz34yk66lrzz1x5";

8+ sha256 = "933b503767ce38fe32a1f77639d9a4fa3d5229d41abb31a91a6fcbdf01511a55";

99 };

1010

1111 propagatedBuildInputs = [ blessings cwcwidth ]

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

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

1010buildPythonPackage rec {

1111 pname = "ddt";

12− version = "1.4.2";

12+ version = "1.4.4";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "sha256-ZKZzZqJxXmNriGlMxgdcwC2ykvAQmLjjhTl8iU05U3g=";

16+ sha256 = "8de39a69730442dc835e4d33f9d2e33043ff91151c8d18086959ee556febb9f8";

1717 };

1818

1919 checkInputs = [ six pyyaml mock pytestCheckHook ];

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

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

66buildPythonPackage rec {

77 pname = "decorator";

8− version = "5.0.9";

8+ version = "5.1.0";

1010 src = fetchPypi {

1111 inherit pname version;

12− sha256 = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5";

12+ sha256 = "e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7";

1313 };

1414

1515 meta = with lib; {

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

@@ -3,14 +3,14 @@

44buildPythonPackage rec {

55 pname = "devtools";

6− version = "0.6.1";

6+ version = "0.8.0";

77 disabled = pythonOlder "3.6";

99 src = fetchFromGitHub {

1010 owner = "samuelcolvin";

1111 repo = "python-${pname}";

1212 rev = "v${version}";

13− sha256 = "0s1d2jwijini7y1a3318yhb98mh1mw4pzlfx2zck3a8nqw984ki3";

13+ sha256 = "0yavcbxzxi1nfa1k326gsl03y8sadi5z5acamwd8b1bsiv15p757";

1414 };

1515

1616 propagatedBuildInputs = [ pygments ];

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "distlib";

5− version = "0.3.2";

5+ version = "0.3.3";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736";

9+ sha256 = "d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05";

1010 extension = "zip";

1111 };

1212

pkgs/development/python-modules/django-haystack/default.nix+41−11

@@ -1,30 +1,60 @@

1−{ lib, buildPythonPackage, fetchPypi

2−, setuptools, setuptools-scm, django, python-dateutil, whoosh, pysolr

3−, coverage, mock, nose, geopy, requests }:

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchPypi

6+# build dependencies

7+, setuptools-scm

9+# dependencies

10+, django

11+

12+# tests

13+, geopy

14+, nose

15+, pysolr

16+, python-dateutil

17+, requests

18+, whoosh

19+}:

420

521buildPythonPackage rec {

622 pname = "django-haystack";

723 version = "3.1.1";

24+ format = "setuptools";

25+ disabled = pythonOlder "3.5";

826

927 src = fetchPypi {

1028 inherit pname version;

1129 sha256 = "6d05756b95d7d5ec1dbd4668eb999ced1504b47f588e2e54be53b1404c516a82";

1230 };

1331

14− checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ];

15− propagatedBuildInputs = [ django setuptools ];

16− nativeBuildInputs = [ setuptools-scm ];

17−

1832 postPatch = ''

19− sed -i 's/geopy==/geopy>=/' setup.py

33+ substituteInPlace setup.py \

34+ --replace "geopy==" "geopy>="

2035 '';

2136

22− # ImportError: cannot import name django.contrib.gis.geos.prototypes

23− doCheck = false;

37+ nativeBuildInputs = [

38+ setuptools-scm

39+ ];

40+

41+ propagatedBuildInputs = [

42+ django

43+ ];

44+

45+ checkInputs = [

46+ geopy

47+ nose

48+ pysolr

49+ python-dateutil

50+ requests

51+ whoosh

52+ ];

2453

2554 meta = with lib; {

26− description = "Modular search for Django";

55+ description = "Pluggable search for Django";

2756 homepage = "http://haystacksearch.org/";

2857 license = licenses.bsd3;

58+ maintainers = with maintainers; [ ];

2959 };

3060}

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

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

55buildPythonPackage rec {

66 pname = "django-mailman3";

7− version = "1.3.6";

7+ version = "1.3.7";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "cd3cb1ac26a3658bd694b82f00eaab98903bd2edff34956e90c187c9ab5c0dae";

11+ sha256 = "6ea8c24c13e7afe744f18e18e4d19d0e74223e0d9bd5d782deea85dcb865feb7";

1212 };

1313

1414 propagatedBuildInputs = [

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

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

11{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }:

33buildPythonPackage rec {

4− version = "3.12.2";

4+ version = "3.12.4";

55 pname = "djangorestframework";

66 disabled = isPy27;

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

99 owner = "encode";

1010 repo = "django-rest-framework";

1111 rev = version;

12− sha256 = "y/dw6qIOc6NaNpBWJXDwHX9aFodgKv9rGKWQKS6STlk=";

12+ sha256 = "sha256-FjMRfVyLmm5J9uOUTLZpO3Pvge3RoYnqIRvzMng7wZo=";

1313 };

1414

1515 # Test settings are missing

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

@@ -14,11 +14,11 @@

1414

1515buildPythonPackage rec {

1616 pname = "docker";

17− version = "5.0.0";

17+ version = "5.0.3";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "sha256-PovEdTTgypMx1ywy8ogbsTuT3tC83qs8gz+3z2HAqaU=";

21+ sha256 = "d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb";

2222 };

2323

2424 nativeBuildInputs = lib.optional isPy27 mock;

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

@@ -9,12 +9,12 @@

1010buildPythonPackage rec {

1111 pname = "docplex";

12− version = "2.21.207";

12+ version = "2.22.213";

1313

1414 # No source available from official repo

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "4f1781592be2b093db939772db8c6575a0f017041fb0cfd784bedf4222ac5e58";

17+ sha256 = "8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd";

1818 };

1919

2020 propagatedBuildInputs = [

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

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "dropbox";

6− version = "11.20.0";

6+ version = "11.21.0";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "1aa351ec8bbb11cf3560e731b81d25f39c7edcb5fa92c06c5d68866cb9f90d54";

10+ sha256 = "6a4697acfe95bea13af9c133a41a8d774946c58ab47083b4c82a017a1b08c380";

1111 };

1212

1313 postPatch = ''

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

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

88buildPythonPackage rec {

99 pname = "editdistance";

10− version = "0.5.3";

10+ version = "0.6.0";

1111

1212

1313 src = fetchFromGitHub {

1414 owner = "roy-ht";

1515 repo = pname;

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

17− sha256 = "0vk8vz41p2cs7s7zbaw3cnw2jnvy5rhy525xral68dh14digpgsd";

16+ rev = version;

17+ sha256 = "1qajskfyx2ki81ybksf0lgl1pdyw7al4ci39zrj66ylsn8fssg89";

1818 };

1919

2020 nativeBuildInputs = [ cython ];

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

@@ -40,7 +40,9 @@ buildPythonPackage rec {

4040 checkPhase = ''

4141 runHook preCheck

4242

43− nosetests --exclude test_getaddrinfo --exclude test_hosts_no_network

43+ # test_fork-after_monkey_patch fails on aarch64 on hydra only

44+ # AssertionError: Expected single line "pass" in stdout

45+ nosetests --exclude test_getaddrinfo --exclude test_hosts_no_network --exclude test_fork_after_monkey_patch

4446

4547 runHook postCheck

4648 '';

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

@@ -1,23 +1,23 @@

11{ lib

22, buildPythonPackage

33, fetchPypi

4−, python-dateutil

5−, text-unidecode

64, freezegun

5+, pillow

76, pytestCheckHook

7+, python-dateutil

8+, text-unidecode

89, ukpostcodeparser

9−, pillow

1010, validators

1111}:

1212

1313buildPythonPackage rec {

1414 pname = "faker";

15− version = "8.8.2";

15+ version = "9.3.1";

1616

1717 src = fetchPypi {

1818 pname = "Faker";

1919 inherit version;

20− sha256 = "sha256-IlNMOqbS7584QDojTcm3G1y4ePt2XHKZS+Xce06vCGU=";

20+ hash = "sha256-zdnpry+6XJbuLsSshBm7pFjia1iiuYwfZGfuZglr7lI=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/falcon/default.nix+34−9

@@ -1,28 +1,53 @@

11{ lib

22, buildPythonPackage

33, fetchPypi

4−, coverage

5−, ddt

6−, nose

4+, pythonOlder

5+, aiofiles

6+, cbor2

7+, httpx

8+, msgpack

9+, pecan

10+, pytest-asyncio

11+, pytestCheckHook

712, pyyaml

813, requests

914, testtools

15+, websockets

1016}:

1117

1218buildPythonPackage rec {

1319 pname = "falcon";

14− version = "2.0.0";

20+ version = "3.0.1";

21+ format = "pyproject";

22+ disabled = pythonOlder "3.5";

1523

1624 src = fetchPypi {

1725 inherit pname version;

18− sha256 = "eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6c3d5fc";

26+ sha256 = "sha256-xB2E2zJYgahw6LcSnV7P2XL6QyPPd7cRmh0qIZZu5oE=";

1927 };

2028

21− checkInputs = [coverage ddt nose pyyaml requests testtools];

29+ checkInputs = [

30+ aiofiles

31+ cbor2

32+ httpx

33+ msgpack

34+ pecan

35+ pytest-asyncio

36+ pytestCheckHook

37+ pyyaml

38+ requests

39+ testtools

40+ websockets

41+ ];

2242

23− # The travis build fails since the migration from multiprocessing to threading for hosting the API under test.

24− # OSError: [Errno 98] Address already in use

25− doCheck = false;

43+ disabledTestPaths = [

44+ # missing optional nuts package

45+ "falcon/bench/nuts/nuts/tests/test_functional.py"

46+ # missing optional mujson package

47+ "tests/test_media_handlers.py"

48+ # tries to run uvicorn binary and doesn't find it

49+ "tests/asgi/test_asgi_servers.py"

50+ ];

2651

2752 meta = with lib; {

2853 description = "An unladen web framework for building APIs and app backends";

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

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

1−{ lib, buildPythonPackage, fetchPypi }:

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchPypi

5+, setuptools-scm

6+, pytestCheckHook

7+}:

39buildPythonPackage rec {

410 pname = "filelock";

5− version = "3.0.12";

11+ version = "3.3.0";

12+ format = "pyproject";

13+ disabled = pythonOlder "3.6";

614

715 src = fetchPypi {

816 inherit pname version;

9− sha256 = "18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59";

17+ sha256 = "8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785";

1018 };

1119

20+ nativeBuildInputs = [

21+ setuptools-scm

22+ ];

23+

24+ checkInputs = [

25+ pytestCheckHook

26+ ];

27+

1228 meta = with lib; {

1329 homepage = "https://github.com/benediktschmitt/py-filelock";

1430 description = "A platform independent file lock for Python";

pkgs/development/python-modules/flake8/default.nix+39−15

@@ -1,6 +1,17 @@

1−{ lib, buildPythonPackage, fetchPypi, pythonOlder

2−, mock, pytest, pytest-runner

3−, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pythonOlder

5+, configparser

6+, enum34

7+, mccabe

8+, pycodestyle

9+, pyflakes

10+, functools32

11+, typing

12+, importlib-metadata

13+, mock

14+, pytestCheckHook

415}:

516

617buildPythonPackage rec {

@@ -12,24 +23,37 @@ buildPythonPackage rec {

1223 sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b";

1324 };

1425

15− checkInputs = [ pytest mock pytest-runner ];

16− propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]

17− ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ]

18− ++ lib.optionals (pythonOlder "3.4") [ enum34 ]

19− ++ lib.optionals (pythonOlder "3.5") [ typing ]

20− ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

26+ postPatch = ''

27+ substituteInPlace setup.cfg \

28+ --replace "pyflakes >= 2.3.0, < 2.4.0" "pyflakes >= 2.3.0, < 2.5.0"

29+ '';

30+

31+ propagatedBuildInputs = [

32+ pyflakes

33+ pycodestyle

34+ mccabe

35+ ] ++ lib.optionals (pythonOlder "3.2") [

36+ configparser

37+ functools32

38+ ] ++ lib.optionals (pythonOlder "3.4") [

39+ enum34

40+ ] ++ lib.optionals (pythonOlder "3.5") [

41+ typing

42+ ] ++ lib.optionals (pythonOlder "3.8") [

43+ importlib-metadata

44+ ];

2145

2246 # Tests fail on Python 3.7 due to importlib using a deprecated interface

2347 doCheck = !(pythonOlder "3.8");

2448

25− # fixtures fail to initialize correctly

26− checkPhase = ''

27− py.test tests --ignore=tests/integration/test_checker.py

28− '';

49+ checkInputs = [

50+ mock

51+ pytestCheckHook

52+ ];

2953

3054 meta = with lib; {

31− description = "Code checking using pep8 and pyflakes";

32− homepage = "https://pypi.python.org/pypi/flake8";

55+ description = "Flake8 is a wrapper around pyflakes, pycodestyle and mccabe.";

56+ homepage = "https://github.com/pycqa/flake8";

3357 license = licenses.mit;

3458 maintainers = with maintainers; [ ];

3559 };

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

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

1111}:

1212

1313buildPythonPackage rec {

14− version = "2.0.1";

14+ version = "2.0.2";

1515 pname = "Flask";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w";

19+ sha256 = "7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2";

2020 };

2121

2222 propagatedBuildInputs = [

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

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

77buildPythonPackage rec {

88 pname = "flexmock";

9− version = "0.10.9";

9+ version = "0.10.10";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "9c128b7cf31fac5340062c9c2cf1e0b12c601ee2d5c10ef39cc191036fb2e688";

13+ sha256 = "8bb073f4b7b590672e8c312e73d6a14f88ae624a867b691462f9e8c24b9f19d1";

1414 };

1515

1616 checkInputs = [ pytest ];

pkgs/development/python-modules/flufl/bounce.nix+1−1

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

1010 src = fetchPypi {

1111 inherit pname version;

12− sha256 = "25504aeb976ec0fe5a19cd6c413a3410cb514fdcdbdca9f9b5d8d343a8603831";

12+ sha256 = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE=";

1313 };

1414}

pkgs/development/python-modules/flufl/i18n.nix+1−1

@@ -12,6 +12,6 @@ buildPythonPackage rec {

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "c35c8f8eab66adb7fd64a1420860105066d2b36cb655b33ffb14afe8e223ed62";

15+ sha256 = "sha256-w1yPjqtmrbf9ZKFCCGAQUGbSs2y2VbM/+xSv6OIj7WI=";

1616 };

1717}

pkgs/development/python-modules/flufl/lock.nix+1−1

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

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "fc748ee609ec864b4838ef649dbd1170fa79deb0c213c2fd51151bee6a7fc242";

11+ sha256 = "sha256-/HSO5gnshktIOO9knb0RcPp53rDCE8L9URUb7mp/wkI=";

1212 };

1313

1414 propagatedBuildInputs = [ atpublic psutil ];

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

@@ -9,14 +9,14 @@

1010buildPythonPackage rec {

1111 pname = "frozendict";

12− version = "2.0.5"; # 2.0.6 breaks canonicaljson

12+ version = "2.0.6"; # 2.0.6 breaks canonicaljson

1313 format = "setuptools";

1414

1515 disabled = !isPy3k;

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "sha256-wb7hwHDY2fZA4SjluHV2pEAAhgCfeGLRPAv4YA5iE9M=";

19+ sha256 = "3f00de72805cf4c9e81b334f3f04809278b967d2fed84552313a0fcce511beb1";

2020 };

2121

2222 pythonImportsCheck = [

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

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

1010buildPythonPackage rec {

1111 pname = "furl";

12− version = "2.1.2";

12+ version = "2.1.3";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "sha256-99ujPq++59vIOWNTSyXnL4FsztSKxTGR7mC/zGKTORg=";

16+ sha256 = "5a6188fe2666c484a12159c18be97a1977a71d632ef5bb867ef15f54af39cc4e";

1717 };

1818

1919 propagatedBuildInputs = [

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

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

1313

1414buildPythonPackage rec {

1515 pname = "geventhttpclient";

16− version = "1.5.1";

16+ version = "1.5.2";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "4aead64253d2769a6528544f7812ce8d71ae13551d079f2d9a3533d72818f2e0";

20+ sha256 = "f3c5884d62be75162426728e3d86788740b13e363b197ef592f1443dba240709";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-datastore/default.nix+2−2

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

1313

1414buildPythonPackage rec {

1515 pname = "google-cloud-datastore";

16− version = "2.1.6";

16+ version = "2.2.0";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "sha256-31PBHWnU0KbX8ymFh7+dP0uVbM6BWexdaumMVQbBO6o=";

20+ sha256 = "e1349f4650ceeec92c266076104a0d9068f6374a20d7ea0f754ba89d16cbf5b1";

2121 };

2222

2323 propagatedBuildInputs = [

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

@@ -22,11 +22,11 @@

2222

2323buildPythonPackage rec {

2424 pname = "gradient";

25− version = "1.7.4";

25+ version = "1.8.9";

2626

2727 src = fetchPypi {

2828 inherit pname version;

29− sha256 = "de1d33672f13d4de37a66ba9aebfd503a098d0ca26e5eb8b071e1c0dacd557ea";

29+ sha256 = "c05913efe7fcc9f75c1fe84c157d2c2cf3ec0983e132d418c6e59fabc6361a1e";

3030 };

3131

3232 postPatch = ''

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

@@ -9,12 +9,12 @@

1010buildPythonPackage rec {

1111 pname = "greenlet";

12− version = "1.1.1";

12+ version = "1.1.2";

1313 disabled = isPyPy; # builtin for pypy

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481";

17+ sha256 = "e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a";

1818 };

1919

2020 checkPhase = ''

pkgs/development/python-modules/hass-nabucasa/default.nix+7−6

@@ -24,6 +24,13 @@ buildPythonPackage rec {

2424 sha256 = "sha256-0E8eiHzqbxHbtAd97MbvFMRDWTu25E9x/44oNGC4mUM=";

2525 };

2626

27+ postPatch = ''

28+ sed -i 's/"acme.*"/"acme"/' setup.py

29+ substituteInPlace setup.py \

30+ --replace "cryptography>=2.8,<4.0" "cryptography" \

31+ --replace "snitun==" "snitun>="

32+ '';

33+

2734 propagatedBuildInputs = [

2835 acme

2936 aiohttp

@@ -40,12 +47,6 @@ buildPythonPackage rec {

4047 pytestCheckHook

4148 ];

4249

43− postPatch = ''

44− sed -i 's/"acme.*"/"acme"/' setup.py

45− substituteInPlace setup.py \

46− --replace "snitun==" "snitun>="

47− '';

48−

4950 pythonImportsCheck = [ "hass_nabucasa" ];

5051

5152 meta = with lib; {

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

@@ -9,13 +9,13 @@

99}:

1010

1111buildPythonPackage rec {

12− version = "3.11.0";

12+ version = "3.12.0";

1313 pname = "humanize";

1414 disabled = isPy27; # setup.py no longer compatible

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f";

18+ sha256 = "5ec1a66e230a3e31fb3f184aab9436ea13d4e37c168e0ffc345ae5bb57e58be6";

1919 };

2020

2121 nativeBuildInputs = [ setuptools-scm ];

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

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

1818 # If you need these, you can just add them to your environment.

1919

2020 pname = "hypothesis";

21− version = "6.17.3";

21+ version = "6.23.2";

2222

2323 # Use github tarballs that includes tests

2424 src = fetchFromGitHub {

2525 owner = "HypothesisWorks";

2626 repo = "hypothesis-python";

2727 rev = "hypothesis-python-${version}";

28− sha256 = "1g96q3l97lq3xps36cv147dvj44nh1b0k67z817x7zfwyw844sgn";

28+ sha256 = "1mdygyq6ra4kysi0y2g3a4bgpqrcb8ci2061117zyms419qwwh4l";

2929 };

3030

3131 postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";

pkgs/development/python-modules/imap-tools/default.nix+5−2

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

88buildPythonPackage rec {

99 pname = "imap-tools";

10− version = "0.48.1";

10+ version = "0.49.1";

1111

1212 disabled = isPy27;

1313

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

1515 owner = "ikvk";

1616 repo = "imap_tools";

1717 rev = "v${version}";

18− sha256 = "sha256-AS407jsDk+dAz1DPM44vTUQEleohr9xKnjgCw5Rjs9M=";

18+ sha256 = "071bri1h6j8saqqlb50zibdrk5hgkpwp4ysiskl1zin18794bq82";

1919 };

2020

2121 checkInputs = [

@@ -29,6 +29,9 @@ buildPythonPackage rec {

2929 "test_connectio"

3030 "test_attributes"

3131 "test_live"

32+ # logic operator tests broken in 0.49.0

33+ # https://github.com/ikvk/imap_tools/issues/143

34+ "test_logic_operators"

3235 ];

3336

3437 pythonImportsCheck = [ "imap_tools" ];

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

@@ -10,13 +10,13 @@

1010

1111buildPythonPackage rec {

1212 pname = "importlib-metadata";

13− version = "4.6.4";

13+ version = "4.8.1";

1414 disabled = pythonOlder "3.6";

1515

1616 src = fetchPypi {

1717 pname = "importlib_metadata";

1818 inherit version;

19− sha256 = "sha256-ezCnjbKSLXim9H+zBoMVahTzxqpcwj93zIln6astAC8=";

19+ sha256 = "sha256-8oSz4RJWrR5dA6uGuyzNb1M5aI/xek15eg/n3zJvI7E=";

2020 };

2121

2222 nativeBuildInputs = [ setuptools-scm ];

pkgs/development/python-modules/influxdb/default.nix+2

@@ -57,6 +57,8 @@ buildPythonPackage rec {

5757 # b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n'

5858 "test_write_points_from_dataframe_with_nan_json"

5959 "test_write_points_from_dataframe_with_tags_and_nan_json"

60+ # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that

61+ "test_query_with_empty_result"

6062 ];

6163

6264 pythonImportsCheck = [ "influxdb" ];

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

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

88buildPythonPackage rec {

99 pname = "inform";

10− version = "1.25";

10+ version = "1.26";

1111

1212 src = fetchFromGitHub {

1313 owner = "KenKundert";

1414 repo = "inform";

1515 rev = "v${version}";

16− sha256 = "1r56wmn21c7ggy33548l6dfjswhadkp2iaalfb7xgsxmq7qfcnax";

16+ sha256 = "0snrmvmc3rnz90cql5ayzs878rrkadk46rhvf2sn78nb0x57wa20";

1717 };

1818

1919 postPatch = ''

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

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

1313

1414buildPythonPackage rec {

1515 pname = "ipykernel";

16− version = "6.3.0";

16+ version = "6.4.1";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "5314690a638f893e2cc3bf3d25042920e9fbb873f7d8263033390264caeb95f4";

20+ sha256 = "df3355e5eec23126bc89767a676c5f0abfc7f4c3497d118c592b83b316e8c0cd";

2121 };

2222

2323 propagatedBuildInputs = [

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

@@ -8,11 +8,11 @@

99buildPythonPackage rec {

1010 pname = "ipympl";

11− version = "0.7.0";

11+ version = "0.8.0";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "f0f1f356d8cb9d4fb51bb86dbbf837c190145316cb72f66081872ebc4d6db0a1";

15+ sha256 = "ef5d21820ed88a8bd6efddb884c333d0eaea7f2f7d4b3054e6d386b07a36dd9d";

1616 };

1717

1818 propagatedBuildInputs = [ ipywidgets matplotlib jupyter-packaging ];

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

@@ -23,12 +23,12 @@

2323

2424buildPythonPackage rec {

2525 pname = "ipython";

26− version = "7.27.0";

26+ version = "7.28.0";

2727 disabled = pythonOlder "3.7";

2828

2929 src = fetchPypi {

3030 inherit pname version;

31− sha256 = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13";

31+ sha256 = "2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11";

3232 };

3333

3434 prePatch = lib.optionalString stdenv.isDarwin ''

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

@@ -15,11 +15,11 @@

1515

1616buildPythonPackage rec {

1717 pname = "ipywidgets";

18− version = "7.6.3";

18+ version = "7.6.5";

1919

2020 src = fetchPypi {

2121 inherit pname version;

22− sha256 = "9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0";

22+ sha256 = "00974f7cb4d5f8d494c19810fedb9fa9b64bffd3cda7c2be23c133a1ad3c99c5";

2323 };

2424

2525 # Tests are not distributed

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

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

66buildPythonPackage rec {

77 pname = "iterm2";

8− version = "1.27";

8+ version = "1.29";

1010 src = fetchPypi {

1111 inherit pname version;

12− sha256 = "dcbd89d0502e72a9a41b055f5cf10b5a991f60fb12df29918d9c2183d1389abd";

12+ sha256 = "8245562ed713fd473520f81361cdc1b15835920e1ceb7d588678cd153e77c2b6";

1313 };

1414

1515 propagatedBuildInputs = [ protobuf websockets ];

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

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

88buildPythonPackage rec {

99 pname = "jax";

10− version = "0.2.19";

10+ version = "0.2.21";

1111

1212 # Fetching from pypi doesn't allow us to run the test suite. See https://discourse.nixos.org/t/pythonremovetestsdir-hook-being-run-before-checkphase/14612/3.

1313 src = fetchFromGitHub {

1414 owner = "google";

1515 repo = pname;

1616 rev = "jax-v${version}";

17− sha256 = "sha256-pVn62G7pydR7ybkf7gSbu0FlEq2c0US6H2GTBAljup4=";

17+ sha256 = "05w157h6jv20k8w2gnmlxbycmzf24lr5v392q0c5v0qcql11q7pn";

1818 };

1919

2020 # jaxlib is _not_ included in propagatedBuildInputs because there are

pkgs/development/python-modules/jedi/default.nix+35−12

@@ -1,29 +1,52 @@

1−{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }:

1+{ lib

2+, stdenv

3+, buildPythonPackage

4+, pythonOlder

5+, fetchFromGitHub

6+, fetchPypi

7+, colorama

8+, django

9+, docopt

10+, pytestCheckHook

11+, parso

12+}:

213

314buildPythonPackage rec {

415 pname = "jedi";

5− # switch back to stable version on the next release.

6− # current stable is incompatible with parso

7− version = "2020-08-06";

16+ version = "0.18.0";

17+ disabled = pythonOlder "3.6";

818

919 src = fetchFromGitHub {

1020 owner = "davidhalter";

1121 repo = "jedi";

12− rev = "216f976fd5cab7a460e5d287e853d11759251e52";

13− sha256 = "1kb2ajzigadl95pnwglg8fxz9cvpg9hx30hqqj91jkgrc7djdldj";

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

23+ sha256 = "0d8zdj56hyxbsvvrid6r3nprm0ygxaad6zpsbhbj6k7p3dcx7acw";

1424 fetchSubmodules = true;

1525 };

1626

17− checkInputs = [ pytest glibcLocales tox pytest-cov ];

18−

1927 propagatedBuildInputs = [ parso ];

2028

21− checkPhase = ''

22− LC_ALL="en_US.UTF-8" py.test test

29+ checkInputs = [

30+ colorama

31+ django

32+ docopt

33+ pytestCheckHook

34+ ];

35+

36+ preCheck = ''

37+ export HOME=$TMPDIR

2338 '';

2439

25− # tox required for tests: https://github.com/davidhalter/jedi/issues/808

26− doCheck = false;

40+ disabledTests = [

41+ # Assertions mismatches with pytest>=6.0

42+ "test_completion"

43+

44+ # sensitive to platform, causes false negatives on darwin

45+ "test_import"

46+ ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [

47+ # AssertionError: assert 'foo' in ['setup']

48+ "test_init_extension_module"

49+ ];

2750

2851 meta = with lib; {

2952 homepage = "https://github.com/davidhalter/jedi";

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

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "Jinja2";

13− version = "3.0.1";

13+ version = "3.0.2";

1414 disabled = pythonOlder "3.6";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh";

18+ sha256 = "827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45";

1919 };

2020

2121 propagatedBuildInputs = [

@@ -31,6 +31,13 @@ buildPythonPackage rec {

3131 pytestCheckHook

3232 ];

3333

34+ pytestFlagsArray = [

35+ # Avoid failure due to deprecation warning

36+ # Fixed in https://github.com/python/cpython/pull/28153

37+ # Remove after cpython 3.9.8

38+ "-p no:warnings"

39+ ];

40+

3441 meta = with lib; {

3542 homepage = "http://jinja.pocoo.org/";

3643 description = "Stand-alone template engine";

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

@@ -13,12 +13,12 @@

1313

1414buildPythonPackage rec {

1515 pname = "joblib";

16− version = "1.0.1";

16+ version = "1.1.0";

1717 disabled = pythonOlder "3.7";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7";

21+ sha256 = "4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35";

2222 };

2323

2424 checkInputs = [ sphinx numpydoc pytestCheckHook ];

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

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

1010

1111buildPythonPackage rec {

1212 pname = "josepy";

13− version = "1.9.0";

13+ version = "1.10.0";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "51cce8d97ced0556aae0ce3161b26d5f0f54bc42c749d3c606edc6d97d9802dc";

17+ sha256 = "e9bcaf605411cadaec04841ae2d5f77ebb178b7b6df7c9aed1d97399ac18685b";

1818 };

1919

2020 postPatch = ''

pkgs/development/python-modules/jupyter-client/default.nix+4−5

@@ -13,13 +13,12 @@

1313}:

1414

1515buildPythonPackage rec {

16− pname = "jupyter-client";

17− version = "7.0.2";

16+ pname = "jupyter_client";

17+ version = "7.0.6";

1818

1919 src = fetchPypi {

20− pname = "jupyter_client";

21− inherit version;

22− sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c";

20+ inherit pname version;

21+ sha256 = "8b6e06000eb9399775e0a55c52df6c1be4766666209c22f90c2691ded0e338dc";

2322 };

2423

2524 propagatedBuildInputs = [

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

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

1212

1313buildPythonPackage rec {

1414 pname = "jupyter_core";

15− version = "4.7.1";

15+ version = "4.8.1";

1616 disabled = !isPy3k;

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4";

20+ sha256 = "ef210dcb4fca04de07f2ead4adf408776aca94d17151d6f750ad6ded0b91ea16";

2121 };

2222

2323 checkInputs = [ pytest mock glibcLocales nose ];

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

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "jupyterlab";

13− version = "3.1.17";

13+ version = "3.1.18";

1414 disabled = pythonOlder "3.5";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "7e829cedce4fec676fb9d83850805df9e563b3ca7f20f70bd2ea177a462b7a78";

18+ sha256 = "a43733acc3729557fc4758cff55652e52896e42c64c1f12540656ae7f298b806";

1919 };

2020

2121 nativeBuildInputs = [ jupyter-packaging ];

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

@@ -16,12 +16,12 @@

1616

1717buildPythonPackage rec {

1818 pname = "jupyterlab_server";

19− version = "2.8.1";

19+ version = "2.8.2";

2020 disabled = pythonOlder "3.6";

2121

2222 src = fetchPypi {

2323 inherit pname version;

24− sha256 = "39fd519e9b3275873bd15de891363c28f2649814f7bbc11c57469c60e8408e97";

24+ sha256 = "26d813c8162c83d466df7d155865987dabe70aa452f9187dfb79fd88afc8fa0b";

2525 };

2626

2727 postPatch = ''

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

@@ -13,12 +13,12 @@

1313

1414buildPythonPackage rec {

1515 pname = "keyring";

16− version = "23.1.0";

16+ version = "23.2.1";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4";

21+ sha256 = "6334aee6073db2fb1f30892697b1730105b5e9a77ce7e61fca6b435225493efe";

2222 };

2323

2424 nativeBuildInputs = [

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

@@ -19,14 +19,14 @@

1919

2020buildPythonPackage rec {

2121 pname = "labelbox";

22− version = "3.2.0";

22+ version = "3.6.1";

2323 disabled = pythonOlder "3.6";

2424

2525 src = fetchFromGitHub {

2626 owner = "Labelbox";

2727 repo = "labelbox-python";

28− rev = "V${version}";

29− sha256 = "0vp1lk7hipa4ixa1zcy99r9b5xb1gv54h4i0izx6fv4zf9m0gmw1";

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

29+ sha256 = "0mix7ajdvyhyvi8nwmxz62mzwl3242h2pzj84zikrmh1ampwvg3g";

3030 };

3131

3232 propagatedBuildInputs = [

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

@@ -1,16 +1,35 @@

1−{ lib, fetchPypi, buildPythonPackage, six }:

1+{ lib

2+, fetchPypi

3+, buildPythonPackage

4+, six

5+, cssselect

6+, lxml

7+, nose

8+}:

310buildPythonPackage rec {

411 pname = "leather";

5− version = "0.3.3";

12+ version = "0.3.4";

613

714 src = fetchPypi {

815 inherit pname version;

9− sha256 = "125r372q7bwcajfdysp7w5zh5wccwxf1mkhqawl8h518nl1icv87";

16+ sha256 = "b43e21c8fa46b2679de8449f4d953c06418666dc058ce41055ee8a8d3bb40918";

1017 };

1118

1219 propagatedBuildInputs = [ six ];

1320

21+ checkInputs = [

22+ cssselect

23+ lxml

24+ nose

25+ ];

26+

27+ checkPhase = ''

28+ runHook preCheck

29+ nosetests

30+ runHook postCheck

31+ '';

32+

1433 meta = with lib; {

1534 homepage = "http://leather.rtfd.io";

1635 description = "Python charting library";

pkgs/development/python-modules/libarchive-c/default.nix−5

@@ -38,11 +38,6 @@ buildPythonPackage rec {

3838 pytestCheckHook

3939 ];

4040

41− disabledTests = lib.optionals (pythonAtLeast "3.9") [

42− # causes python3.9 to segfault

43− "test_custom_writer_and_stream_reader"

44− ];

45−

4641 meta = with lib; {

4742 homepage = "https://github.com/Changaco/python-libarchive-c";

4843 description = "Python interface to libarchive";

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

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

1−{ lib, stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }:

1+{ lib, stdenv, buildPythonPackage, fetchPypi, libusb1, pytestCheckHook }:

33buildPythonPackage rec {

44 pname = "libusb1";

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

1717

1818 buildInputs = [ libusb1 ];

1919

20− checkInputs = [ pytest ];

20+ checkInputs = [ pytestCheckHook ];

2121

22− checkPhase = ''

23− py.test usb1/testUSB1.py

24− '';

22+ pytestFlagsArray = [

23+ "usb1/testUSB1.py"

24+ ];

2525

2626 meta = with lib; {

2727 homepage = "https://github.com/vpelletier/python-libusb1";

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

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

1111

1212buildPythonPackage rec {

1313 pname = "line_profiler";

14− version = "3.3.0";

14+ version = "3.3.1";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "8bd8353e9403b226def4438dbfdb57cafefb24488e49a6039cc63906c0bc8836";

18+ sha256 = "6e2fb792ca022f900f374f9659fd3e7c530cd4df7d3b7e84be889093b487639f";

1919 };

2020

2121 nativeBuildInputs = [

pkgs/development/python-modules/makefun/default.nix+14−8

@@ -2,24 +2,30 @@

22, fetchPypi

33, buildPythonPackage

44, setuptools-scm

5+, pytestCheckHook

56}:

78buildPythonPackage rec {

89 pname = "makefun";

9− version = "1.11.3";

10+ version = "1.12.1";

1011

1112 src = fetchPypi {

1213 inherit pname version;

13− sha256 = "033eed65e2c1804fca84161a38d1fc8bb8650d32a89ac1c5dc7e54b2b2c2e88c";

14+ sha256 = "4d0e90ca3fdbdeb6a4a0891e2da7d4b8e80386e19e6db91ce29b8aa5c876ecfe";

1415 };

1516

16− nativeBuildInputs = [ setuptools-scm ];

17+ postPatch = ''

18+ substituteInPlace setup.cfg \

19+ --replace "pytest-runner" ""

20+ '';

1721

18− # Disabling tests for now due to various (transitive) dependencies on modules

19− # from @smarie which are, as of yet, not part of nixpkgs. Also introduces

20− # a tricky dependency: makefun tests depend on pytest-cases, installing

21− # pytest-cases depends on makefun.

22− doCheck = false;

22+ nativeBuildInputs = [

23+ setuptools-scm

24+ ];

25+

26+ checkInputs = [

27+ pytestCheckHook

28+ ];

2329

2430 pythonImportsCheck = [ "makefun" ];

2531

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

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "mathlibtools";

6− version = "1.0.0";

6+ version = "1.1.0";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "da41c65e206f55b1faea303581fc11215e52d6e6990b827336b2e1eb82aad96c";

10+ sha256 = "789f070f35424e89e4f2e2c007382250133cc48877627e37c5c463bcf4a1b58a";

1111 };

1212

1313 propagatedBuildInputs = [

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

@@ -8,11 +8,11 @@

99buildPythonPackage rec {

1010 pname = "matplotlib-inline";

11− version = "0.1.2";

11+ version = "0.1.3";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "0glrhcv1zqck1whsh3p75x0chda588xw22swbmvqalwz7kvmy7gl";

15+ sha256 = "a04bfba22e0d1395479f866853ec1ee28eea1485c1d69a6faf00dc3e24ff34ee";

1616 };

1717

1818 propagatedBuildInputs = [

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

@@ -6,20 +6,22 @@

66, poetry-core

77, pytestCheckHook

88, pythonOlder

9+, tomli

910, typing-extensions

1011}:

1112

1213buildPythonPackage rec {

1314 pname = "mdformat";

14− version = "0.7.9";

15+ version = "0.7.10";

1516 format = "pyproject";

16− disabled = pythonOlder "3.6";

17+

18+ disabled = pythonOlder "3.7";

1719

1820 src = fetchFromGitHub {

1921 owner = "executablebooks";

2022 repo = pname;

2123 rev = version;

22− sha256 = "sha256-qGRZCDo/ACSXtJa4omepjaR0KNWeR4vvvUUbQpKlrtI=";

24+ sha256 = "sha256-Zw7ZGV/Hd0MRxxQVwkjtE6MJXNLQ0A0PJlQr4x9h2ww=";

2325 };

2426

2527 nativeBuildInputs = [

@@ -28,6 +30,7 @@ buildPythonPackage rec {

2830

2931 propagatedBuildInputs = [

3032 markdown-it-py

33+ tomli

3134 ] ++ lib.optionals (pythonOlder "3.10") [

3235 importlib-metadata

3336 ] ++ lib.optionals (pythonOlder "3.7") [

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

@@ -4,8 +4,8 @@ self: rec {

44 sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";

55 };

66 mistune_2_0 = self.callPackage ./common.nix {

7− version = "2.0.0a4";

8− sha256 = "0i6cblmjl58kdmaa21xm0l1ls0kvjpfy45sf73fw3ws6305f628k";

7+ version = "2.0.0rc1";

8+ sha256 = "1nd7iav1ixh9hlj4hxn6lmpava88d86ys8rqm30wgvr7gjlxnas5";

99 };

1010 mistune = mistune_0_8;

1111}

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

@@ -25,12 +25,12 @@

2525

2626buildPythonPackage rec {

2727 pname = "mlflow";

28− version = "1.20.1";

28+ version = "1.20.2";

2929 disabled = isPy27;

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "71764443c4942f181fee2d5bf44dd74a0507bcc5b62a1f1e08079d1f40a15fc0";

33+ sha256 = "b15ff0c7e5e64f864a0b40c99b9a582227315eca2065d9f831db9aeb8f24637b";

3434 };

3535

3636 # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config

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

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

1010buildPythonPackage rec {

1111 pname = "more-itertools";

12− version = "8.8.0";

12+ version = "8.10.0";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a";

16+ sha256 = "sha256-HevKvrHfeTgUhZ1kqBrXyxBQTCQ0k2jM8hTGZMR09B8=";

1717 };

1818

1919 checkInputs = [ nose ];

pkgs/development/python-modules/msal/default.nix+7

@@ -21,6 +21,13 @@ buildPythonPackage rec {

2121 requests

2222 ];

2323

24+ # we already have cryptography included, version bounds are causing issues

25+ postPatch = ''

26+ substituteInPlace setup.py \

27+ --replace "PyJWT[crypto]>=1.0.0,<3" "PyJWT" \

28+ --replace "cryptography>=0.6,<38" "cryptography"

29+ '';

30+

2431 # Tests assume Network Connectivity:

2532 # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73

2633 doCheck = false;

pkgs/development/python-modules/multidict/default.nix+10−5

@@ -1,22 +1,27 @@

11{ lib

22, fetchPypi

33, buildPythonPackage

4−, pytestCheckHook, pytest-runner, pytest-cov

4+, pytestCheckHook

55, isPy3k

66}:

88buildPythonPackage rec {

99 pname = "multidict";

10− version = "5.1.0";

10+ version = "5.2.0";

11+

12+ disabled = !isPy3k;

1113

1214 src = fetchPypi {

1315 inherit pname version;

14− sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5";

16+ sha256 = "0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce";

1517 };

1618

17− checkInputs = [ pytestCheckHook pytest-runner pytest-cov ];

19+ postPatch = ''

20+ substituteInPlace setup.cfg \

21+ --replace "--cov=multidict --cov-report term-missing:skip-covered --cov-report xml" ""

22+ '';

1823

19− disabled = !isPy3k;

24+ checkInputs = [ pytestCheckHook ];

2025

2126 meta = with lib; {

2227 description = "Multidict implementation";

pkgs/development/python-modules/multimethod/default.nix+9−7

@@ -1,21 +1,23 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

3+, fetchFromGitHub

44, pytestCheckHook

5−, pytest-cov

65}:

77buildPythonPackage rec {

88 pname = "multimethod";

9− version = "1.5";

9+ version = "1.6";

10+ format = "pyproject";

1011

11− src = fetchPypi {

12− inherit pname version;

13− sha256 = "b9c6f85ecf187f14a3951fff319643e1fac3086d757dec64f2469e1fd136b65d";

12+ src = fetchFromGitHub {

13+ owner = "coady";

14+ repo = pname;

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

16+ sha256 = "09vrxzv8q0lqsbh6d83wjdd29ja66rj31y7wmyha14jk603fd9k0";

1417 };

1518

1619 checkInputs = [

1720 pytestCheckHook

18− pytest-cov

1921 ];

2022

2123 pythonImportsCheck = [

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

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

33buildPythonApplication rec {

44 pname = "mypy-protobuf";

5− version = "2.9";

5+ version = "2.10";

6+ format = "pyproject";

78 disabled = pythonOlder "3.6";

910 src = fetchPypi {

1011 inherit pname version;

11− sha256 = "278172935d7121c2f8c7c0a05518dd565a2b76d9e9c4a0a3fcd08a21fa685d43";

12+ sha256 = "1fed214e16351b09946770794a321a818abb744078b1d863a479da070028684c";

1213 };

1314

1415 propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ];

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

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

2323

2424buildPythonPackage rec {

2525 pname = "nbconvert";

26− version = "6.1.0";

26+ version = "6.2.0";

2727

2828 src = fetchPypi {

2929 inherit pname version;

30− sha256 = "d22a8ff202644d31db254d24d52c3a96c82156623fcd7c7f987bba2612303ec9";

30+ sha256 = "16ceecd0afaa8fd26c245fa32e2c52066c02f13aa73387fffafd84750baea863";

3131 };

3232

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

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

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

1010buildPythonPackage rec {

1111 pname = "networkx";

1212 # upgrade may break sage, please test the sage build or ping @timokau on upgrade

13− version = "2.6.2";

13+ version = "2.6.3";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "2306f1950ce772c5a59a57f5486d59bb9cab98497c45fc49cbc45ac0dec119bb";

17+ sha256 = "c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51";

1818 };

1919

2020 propagatedBuildInputs = [ decorator setuptools ];

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

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "nilearn";

6− version = "0.8.0";

6+ version = "0.8.1";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "f2d3dc81005f829f3a183efa6c90d698ea6818c06264d2e3f03e805c4340febb";

10+ sha256 = "a0489940855130f35bbc4cac0750479a6f82025215ea7b1d778faca064219298";

1111 };

1212

1313 checkInputs = [ pytestCheckHook ];

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

@@ -55,7 +55,8 @@ buildPythonPackage rec {

5555

5656 postPatch = ''

5757 substituteInPlace setup.py \

58− --replace "Jinja2~=2.11" "Jinja2>=2.11"

58+ --replace "Jinja2~=2.11" "Jinja2>=2.11" \

59+ --replace "pyvcd~=0.2.2" "pyvcd"

5960 '';

6061

6162 pythonImportsCheck = [ "nmigen" ];

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

@@ -27,12 +27,12 @@

2727

2828buildPythonPackage rec {

2929 pname = "notebook";

30− version = "6.4.3";

30+ version = "6.4.4";

3131 disabled = !isPy3k;

3232

3333 src = fetchPypi {

3434 inherit pname version;

35− sha256 = "03awxl8hr7ibwr6n48gci8jx80f18zll439wyr8gj35h6vnxzdp6";

35+ sha256 = "26b0095c568e307a310fd78818ad8ebade4f00462dada4c0e34cbad632b9085d";

3636 };

3737

3838 LC_ALL = "en_US.utf8";

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

@@ -12,13 +12,13 @@

1212}:

1313

1414buildPythonPackage rec {

15− version = "0.54.0";

15+ version = "0.54.1";

1616 pname = "numba";

1717 disabled = pythonOlder "3.6" || pythonAtLeast "3.10";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "bad6bd98ab2e41c34aa9c80b8d9737e07d92a53df4f74d3ada1458b0b516ccff";

21+ sha256 = "f9dfc803c864edcc2381219b800abf366793400aea55e26d4d5b7d953e14f43f";

2222 };

2323

2424 postPatch = ''

pkgs/development/python-modules/ocrmypdf/default.nix+9−4

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

55, fetchFromGitHub

66, ghostscript

77, img2pdf

8+, importlib-metadata

89, importlib-resources

910, jbig2enc

1011, leptonica

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

1516, pngquant

1617, pytest-xdist

1718, pytestCheckHook

19+, pythonOlder

1820, reportlab

1921, setuptools

2022, setuptools-scm

@@ -28,7 +30,7 @@

2830

2931buildPythonPackage rec {

3032 pname = "ocrmypdf";

31− version = "12.6.0";

33+ version = "12.7.0";

3234

3335 src = fetchFromGitHub {

3436 owner = "jbarlow83";

@@ -40,7 +42,7 @@ buildPythonPackage rec {

4042 extraPostFetch = ''

4143 rm "$out/.git_archival.txt"

4244 '';

43− sha256 = "0zw7c6l9fkf128gxsbd7v4abazlxiygqys6627jpsjbmxg5jgp5w";

45+ sha256 = "sha256-lpTuaZRrmFoKV1SAFoGpsYfPBkLB2+iB63fg3t9RC5o=";

4446 };

4547

4648 SETUPTOOLS_SCM_PRETEND_VERSION = version;

@@ -66,7 +68,6 @@ buildPythonPackage rec {

6668 cffi

6769 coloredlogs

6870 img2pdf

69− importlib-resources

7071 pdfminer

7172 pikepdf

7273 pillow

@@ -74,7 +75,11 @@ buildPythonPackage rec {

7475 reportlab

7576 setuptools

7677 tqdm

77− ];

78+ ] ++ (lib.optionals (pythonOlder "3.8") [

79+ importlib-metadata

80+ ]) ++ (lib.optionals (pythonOlder "3.9") [

81+ importlib-resources

82+ ]);

7883

7984 checkInputs = [

8085 pytest-xdist

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

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "openpyxl";

13− version = "3.0.7";

13+ version = "3.0.9";

1414 disabled = isPy27; # 2.6.4 was final python2 release

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251";

18+ sha256 = "40f568b9829bf9e446acfffce30250ac1fa39035124d55fc024025c41481c90f";

1919 };

2020

2121 checkInputs = [ pytest ];

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

@@ -30,14 +30,14 @@

3030

3131buildPythonPackage rec {

3232 pname = "optuna";

33− version = "2.9.1";

33+ version = "2.10.0";

3434 disabled = isPy27;

3535

3636 src = fetchFromGitHub {

3737 owner = "optuna";

3838 repo = pname;

3939 rev = "v${version}";

40− sha256 = "1fx80qjrkmnvn2mg9fx26qn3sjlwnwqlmkaf6sqhdw79pn6khlpi";

40+ sha256 = "0fha0pwxq6n3mbpvpz3vk8hh61zqncj5cnq063kzfl5d8rd48vcd";

4141 };

4242

4343 checkInputs = [

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

@@ -33,11 +33,11 @@

3333

3434buildPythonPackage rec {

3535 pname = "pandas";

36− version = "1.3.2";

36+ version = "1.3.3";

3737

3838 src = fetchPypi {

3939 inherit pname version;

40− sha256 = "cbcb84d63867af3411fa063af3de64902665bb5b3d40b25b2059e40603594e87";

40+ sha256 = "272c8cb14aa9793eada6b1ebe81994616e647b5892a370c7135efb2924b701df";

4141 };

4242

4343 nativeBuildInputs = [ cython ];

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

@@ -4,12 +4,12 @@

44}:

66buildPythonPackage rec {

7− version = "1.4.3";

7+ version = "1.5.0";

88 pname = "pandocfilters";

1010 src = fetchPypi {

1111 inherit pname version;

12− sha256 = "bc63fbb50534b4b1f8ebe1860889289e8af94a23bff7445259592df25a3906eb";

12+ sha256 = "0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38";

1313 };

1414

1515 # No tests available

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

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

1313

1414buildPythonPackage rec {

1515 pname = "parfive";

16− version = "1.3.0";

16+ version = "1.5.0";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "c3067e6ca9d6fb88a10958338360bd9c47edfd8ab11098d4c601f7f2887edadd";

20+ sha256 = "f36128e8a93f3494ce3de8af883eeba4bd651ab228682810a46ec4b7897a84b3";

2121 };

2222

2323 buildInputs = [

pkgs/development/python-modules/patsy/default.nix+11−7

@@ -1,31 +1,35 @@

11{ lib

22, fetchPypi

33, buildPythonPackage

4−, nose

54, six

65, numpy

76, scipy # optional, allows spline-related features (see patsy's docs)

8−, parameterized

7+, pytestCheckHook

98}:

109

1110buildPythonPackage rec {

1211 pname = "patsy";

13− version = "0.5.1";

12+ version = "0.5.2";

1413

1514 src = fetchPypi {

1615 inherit pname version;

17− sha256 = "149rbrdzwns0ay88caf1zsm1r53v1q5np1mrb36na50y432cw5gi";

16+ sha256 = "5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d";

1817 };

1918

20− checkInputs = [ nose parameterized ];

21− checkPhase = "nosetests -v";

22−

2319 propagatedBuildInputs = [

2420 six

2521 numpy

2622 scipy

2723 ];

2824

25+ checkInputs = [

26+ pytestCheckHook

27+ ];

28+

29+ pythonImportsCheck = [

30+ "patsy"

31+ ];

32+

2933 meta = {

3034 description = "A Python package for describing statistical models";

3135 homepage = "https://github.com/pydata/patsy";

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

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

1−{ lib, buildPythonPackage, fetchPypi

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, fetchpatch

25, pythonOlder

36, Mako

47, markdown

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

1619 sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7";

1720 };

1821

19− nativeBuildInputs = [ setuptools-git setuptools-scm ];

20− propagatedBuildInputs = [ Mako markdown ];

22+ patches = [

23+ (fetchpatch {

24+ # test_Class_params fails in 0.10.0

25+ # https://github.com/pdoc3/pdoc/issues/355

26+ url = "https://github.com/pdoc3/pdoc/commit/4aa70de2221a34a3003a7e5f52a9b91965f0e359.patch";

27+ sha256 = "07sbf7bh09vgd5z1lbay604rz7rhg88414whs6iy60wwbvkz5c2v";

28+ })

29+ ];

30+

31+ nativeBuildInputs = [

32+ setuptools-git

33+ setuptools-scm

34+ ];

35+

36+ propagatedBuildInputs = [

37+ Mako

38+ markdown

39+ ];

2140

2241 meta = with lib; {

2342 description = "Auto-generate API documentation for Python projects.";

pkgs/development/python-modules/pikepdf/default.nix+14−4

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

22, attrs

33, buildPythonPackage

44, defusedxml

5−, fetchPypi

5+, fetchFromGitHub

66, hypothesis

77, isPy3k

88, jbig2dec

@@ -27,9 +27,17 @@ buildPythonPackage rec {

2727 version = "3.2.0";

2828 disabled = ! isPy3k;

2929

30− src = fetchPypi {

31− inherit pname version;

32− sha256 = "a0582f00440668c07edb8403e82724961c7812c8e6c30655e34825b2645f15cd";

30+ src = fetchFromGitHub {

31+ owner = "pikepdf";

32+ repo = "pikepdf";

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

34+ # The content of .git_archival.txt is substituted upon tarball creation,

35+ # which creates indeterminism if master no longer points to the tag.

36+ # See https://github.com/jbarlow83/OCRmyPDF/issues/841

37+ extraPostFetch = ''

38+ rm "$out/.git_archival.txt"

39+ '';

40+ sha256 = "03c7ihd6rf6kdfc3cpgxy5pi6cj4zwscz8nyxmmp15fmdk3hkw4g";

3341 };

3442

3543 patches = [

@@ -40,6 +48,8 @@ buildPythonPackage rec {

4048 })

4149 ];

4250

51+ SETUPTOOLS_SCM_PRETEND_VERSION = version;

52+

4353 buildInputs = [

4454 pybind11

4555 qpdf

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

@@ -15,13 +15,13 @@

1515

1616buildPythonPackage rec {

1717 pname = "pip-tools";

18− version = "6.2.0";

18+ version = "6.3.1";

1919

2020 disabled = pythonOlder "3.6";

2121

2222 src = fetchPypi {

2323 inherit pname version;

24− sha256 = "9ed38c73da4993e531694ea151f77048b4dbf2ba7b94c4a569daa39568cc6564";

24+ sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9";

2525 };

2626

2727 LC_ALL = "en_US.UTF-8";

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

@@ -11,14 +11,14 @@

1111

1212buildPythonPackage rec {

1313 pname = "platformdirs";

14− version = "2.3.0";

14+ version = "2.4.0";

1515 disabled = pythonOlder "3.6";

1616

1717 src = fetchFromGitHub {

1818 owner = pname;

1919 repo = pname;

2020 rev = version;

21− sha256 = "sha256-g2DPNN7VxK3EjOXOpSWA4a+PghZ7v2jmjw9+VQyCTBI=";

21+ sha256 = "sha256-Ox1CVq2M2eddZtpuZx0IfvuOm6RPsAs27WkMdZSeh0E=";

2222 };

2323

2424 SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

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

1010buildPythonPackage rec {

1111 pname = "plotly";

12− version = "5.3.0";

12+ version = "5.3.1";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "b6dc306c56e7d5fa7d017718894099b27290b427abf4acad8e5b77fdc3bd32ec";

16+ sha256 = "6598393e898a9c5ae78397f76f07002ec41fd92e5f746d3b9806248d53885643";

1717 };

1818

1919 propagatedBuildInputs = [

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

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

22, lib

33, fetchPypi

44, setuptools-scm

5+, pythonOlder

56, importlib-metadata

67}:

@@ -23,12 +24,14 @@ buildPythonPackage rec {

2324

2425 nativeBuildInputs = [ setuptools-scm ];

2526

26− propagatedBuildInputs = [ importlib-metadata ];

27+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [

28+ importlib-metadata

29+ ];

2730

2831 meta = {

2932 description = "Plugin and hook calling mechanisms for Python";

3033 homepage = "https://github.com/pytest-dev/pluggy";

3134 license = lib.licenses.mit;

32− maintainers = with lib.maintainers; [ ];

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

3336 };

3437}

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

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

11{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27

2+, git

23, importlib-metadata

34, intreehooks

45, pathlib2

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

1213

1314buildPythonPackage rec {

1415 pname = "poetry-core";

15− version = "1.0.4";

16+ version = "1.0.7";

1617 format = "pyproject";

1718

1819 src = fetchFromGitHub {

1920 owner = "python-poetry";

2021 repo = pname;

2122 rev = version;

22− sha256 = "0jgd4d7m5y8ly8n0l9lcq7cjab2y3hifk90f343ksmjzssfd5lg3";

23+ sha256 = "0v86x8f8pcbviv2cdn7jjbgj3c994qasx0bqk1kr0mj8m6pjwy9z";

2324 };

2425

2526 postPatch = lib.optionalString (pythonOlder "3.8") ''

@@ -41,6 +42,7 @@ buildPythonPackage rec {

4142 ];

4243

4344 checkInputs = [

45+ git

4446 pep517

4547 pytest-mock

4648 pytestCheckHook

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

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

2424

2525buildPythonPackage rec {

2626 pname = "poetry";

27− version = "1.1.8";

27+ version = "1.1.11";

2828 format = "pyproject";

2929 disabled = isPy27;

3030

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

3232 owner = "python-poetry";

3333 repo = pname;

3434 rev = version;

35− sha256 = "0qcgjb78nj69sppd8146519q9422xxg1bi34gyxy51sjkvd5lxhz";

35+ sha256 = "1f3y3gav2snvcf2h9mbkinvnlcyl9kndf6bh6j0vxkxzlmb4zilx";

3636 };

3737

3838 postPatch = ''

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

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "portend";

6− version = "2.7.1";

6+ version = "2.7.2";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "986ed9a278e64a87b5b5f4c21e61c25bebdce9919a92238d9c14c37a7416482b";

10+ sha256 = "3fbc0df9e4970b661e4d7386a91fc7bcf34ebeaf0333ce15d819d515a71ba8b2";

1111 };

1212

1313 postPatch = ''

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

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

1010

1111buildPythonPackage rec {

1212 pname = "prettytable";

13− version = "2.2.0";

13+ version = "2.2.1";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416";

17+ sha256 = "6d465005573a5c058d4ca343449a5b28c21252b86afcdfa168cdc6a440f0b24c";

1818 };

1919

2020 nativeBuildInputs = [ setuptools-scm ];

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

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "proto-plus";

13− version = "1.19.2";

13+ version = "1.19.4";

1414 disabled = !isPy3k;

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "sha256-ylMLBxjGJbpj8VGrP83INrWTQ9FJt9/RXsLc6zhEwi0=";

18+ sha256 = "416dc38b090ca2093f6fac74977ac4a5599e496483a43c0076e6f6a4dd77ed9c";

1919 };

2020

2121 propagatedBuildInputs = [ protobuf ];

pkgs/development/python-modules/pudb/default.nix+20−6

@@ -1,29 +1,43 @@

11{ lib

22, buildPythonPackage

3+, isPy3k

34, fetchPypi

5+, jedi

46, pygments

57, urwid

6−, isPy3k

8+, pytest-mock

9+, pytestCheckHook

710}:

811

912buildPythonPackage rec {

1013 pname = "pudb";

1114 version = "2021.1";

15+ disabled = !isPy3k;

1216

1317 src = fetchPypi {

1418 inherit pname version;

1519 sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e";

1620 };

1721

18− propagatedBuildInputs = [ pygments urwid ];

22+ propagatedBuildInputs = [

23+ jedi

24+ pygments

25+ urwid

26+ ];

1927

20− # Tests fail on python 3 due to writes to the read-only home directory

21− doCheck = !isPy3k;

28+ preCheck = ''

29+ export HOME=$TMPDIR

30+ '';

31+

32+ checkInputs = [

33+ pytest-mock

34+ pytestCheckHook

35+ ];

2236

2337 meta = with lib; {

2438 description = "A full-screen, console-based Python debugger";

39+ homepage = "https://github.com/inducer/pudb";

2540 license = licenses.mit;

26− platforms = platforms.all;

41+ maintainers = with maintainers; [ ];

2742 };

28−

2943}

pkgs/development/python-modules/pyatv/default.nix−2

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

11{ lib

22, buildPythonPackage

33, aiohttp

4−, audio-metadata

54, bitarray

65, cryptography

76, deepdiff

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

4039

4140 propagatedBuildInputs = [

4241 aiohttp

43− audio-metadata

4442 bitarray

4543 cryptography

4644 mediafile

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

@@ -12,13 +12,13 @@

1212

1313buildPythonPackage rec {

1414 pname = "pybind11";

15− version = "2.7.1";

15+ version = "2.8.0";

1616

1717 src = fetchFromGitHub {

1818 owner = "pybind";

1919 repo = pname;

2020 rev = "v${version}";

21− sha256 = "13nq16pxz4vck7jn936ymhm0y0q82hd7kkw0ip7k85cx7wywzbql";

21+ sha256 = "sha256-kmyfRNZM9AtF0QA1MnWEPwWb6BebkkpanTvQwsraSJo=";

2222 };

2323

2424 nativeBuildInputs = [ cmake ];

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

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

11{ lib

22, buildPythonPackage

33, fetchPypi

4−,

4+, pytestCheckHook

55}:

77buildPythonPackage rec {

@@ -13,10 +13,19 @@ buildPythonPackage rec {

1313 sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241";

1414 };

1515

16+ checkInputs = [

17+ pytestCheckHook

18+ ];

19+

20+ pythonImportsCheck = [

21+ "pycountry"

22+ ];

23+

1624 meta = with lib; {

17− homepage = "https://bitbucket.org/flyingcircus/pycountry";

25+ homepage = "https://github.com/flyingcircusio/pycountry";

1826 description = "ISO country, subdivision, language, currency and script definitions and their translations";

1927 license = licenses.lgpl2;

28+ maintainers = with maintainers; [ ];

2029 };

2130

2231}

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

@@ -1,12 +1,12 @@

11{ lib, fetchPypi, buildPythonPackage }:

33buildPythonPackage rec {

4− version = "3.10.1";

4+ version = "3.11.0";

55 pname = "pycryptodome";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "3e2e3a06580c5f190df843cdb90ea28d61099cf4924334d5297a995de68e4673";

9+ sha256 = "428096bbf7a77e207f418dfd4d7c284df8ade81d2dc80f010e92753a3e406ad0";

1010 };

1111

1212 meta = with lib; {

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

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

66buildPythonPackage rec {

77 pname = "pycryptodomex";

8− version = "3.10.1";

8+ version = "3.11.0";

1010 src = fetchPypi {

1111 inherit pname version;

12− sha256 = "sha256-VBzT4+JS+xmntI9CC3mLU0gzArf+TZlUyUdgXQomPWI=";

12+ sha256 = "0398366656bb55ebdb1d1d493a7175fc48ade449283086db254ac44c7d318d6d";

1313 };

1414

1515 pythonImportsCheck = [ "Cryptodome" ];

pkgs/development/python-modules/pyexcel/default.nix+6−9

@@ -2,41 +2,38 @@

22, buildPythonPackage

33, fetchPypi

44, isPy3k

5+, chardet

56, lml

67, pyexcel-io

78, texttable

8−, nose

99}:

1010

1111buildPythonPackage rec {

1212 pname = "pyexcel";

13− version = "0.6.6";

13+ version = "0.6.7";

1414

1515 disabled = !isPy3k;

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "39b0bb8f033d9b5523b126cf5a5259d1990ea82b8a23c8eab7aa5e23116803df";

19+ sha256 = "cbbd9875729767564b3b64b6ed6a9870b14631184943d13646833d94157dd10f";

2020 };

2121

2222 propagatedBuildInputs = [

23+ chardet

2324 lml

2425 pyexcel-io

2526 texttable

2627 ];

2728

28− checkInputs = [

29− nose

29+ pythonImportsCheck = [

30+ "pyexcel"

3031 ];

3132

3233 # Tests depend on pyexcel-xls & co. causing circular dependency.

3334 # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt

3435 doCheck = false;

3536

36− pythonImportsCheck = [ "pyexcel" ];

37−

38− checkPhase = "nosetests";

39−

4037 meta = {

4138 description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";

4239 homepage = "http://docs.pyexcel.org/";

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "pyflakes";

5− version = "2.3.1";

5+ version = "2.4.0";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db";

9+ sha256 = "05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c";

1010 };

1111

1212 checkInputs = [ unittest2 ];

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "pygit2";

5− version = "1.6.1";

5+ version = "1.7.0";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "c3303776f774d3e0115c1c4f6e1fc35470d15f113a7ae9401a0b90acfa1661ac";

9+ sha256 = "602bffa8b4dbc185a6c7f36515563b600e0ee9002583c97ae3150eedaf340edb";

1010 };

1111

1212 preConfigure = lib.optionalString stdenv.isDarwin ''

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

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

1616

1717buildPythonPackage rec {

1818 pname = "pylint";

19− version = "2.10.2";

19+ version = "2.11.1";

2020

2121 disabled = pythonOlder "3.6";

2222

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

2424 owner = "PyCQA";

2525 repo = pname;

2626 rev = "v${version}";

27− sha256 = "sha256-hkrkgUdC5LO1oSPFL6gvIk0zFpMw45gCmnoRbdPZuRs=";

27+ sha256 = "08kc9139v1sd0vhna0rqikyds0xq8hxv0j9707n2i1nbv2z6xhsv";

2828 };

2929

3030 nativeBuildInputs = [

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

@@ -21,11 +21,11 @@

2121

2222buildPythonPackage rec {

2323 pname = "pymatgen";

24− version = "2022.0.12";

24+ version = "2022.0.14";

2525

2626 src = fetchPypi {

2727 inherit pname version;

28− sha256 = "bad712c883a12d774a8a58c35abc5d582c5e5eafdbb5351dc06ebe98c28bd135";

28+ sha256 = "03d24ebafc21becab376c26de09437dd5cfb7bda7099046194e95b4c9fa35209";

2929 };

3030

3131 nativeBuildInputs = [ glibcLocales ];

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

@@ -15,11 +15,11 @@

1515

1616buildPythonPackage rec {

1717 pname = "pyperf";

18− version = "2.2.0";

18+ version = "2.3.0";

1919

2020 src = fetchPypi {

2121 inherit pname version;

22− sha256 = "498bb4d1fe21350c2b7c1aa8bb3eae9c9979358d0b66327954bc66839fcba8b6";

22+ sha256 = "8a85dd42e067131d5b26b71472336da7f7f4b87ff9c97350d89f5ff0de9adedc";

2323 };

2424

2525 checkInputs = [ nose psutil ] ++

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

@@ -15,12 +15,12 @@

1515

1616buildPythonPackage rec {

1717 pname = "pytest-astropy";

18− version = "0.8.0";

18+ version = "0.9.0";

1919 disabled = pythonOlder "3.6";

2020

2121 src = fetchPypi {

2222 inherit pname version;

23− sha256 = "619800eb2cbf64548fbea25268efe7c6f6ae206cb4825f34abd36f27bcf946a2";

23+ sha256 = "7cdac1b2a5460f37477a329712c3a5d4af4ddf876b064731995663621be4308b";

2424 };

2525

2626 nativeBuildInputs = [

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

@@ -10,12 +10,12 @@

1010

1111buildPythonPackage rec {

1212 pname = "pytest-doctestplus";

13− version = "0.10.1";

13+ version = "0.11.0";

1414 disabled = pythonOlder "3.7";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "7e9e0912c206c53cd6ee996265aa99d5c99c9334e37d025ce6114bc0416ffc14";

18+ sha256 = "efcb24a366d3b033d343298c2a60eae418b06803c85373450f10306815c7c632";

1919 };

2020

2121 nativeBuildInputs = [

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

@@ -13,12 +13,12 @@

1313

1414buildPythonPackage rec {

1515 pname = "pytest-xdist";

16− version = "2.3.0";

16+ version = "2.4.0";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "e8ecde2f85d88fbcadb7d28cb33da0fa29bca5cf7d5967fa89fc0e97e5299ea5";

21+ sha256 = "89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9";

2222 };

2323

2424 nativeBuildInputs = [ setuptools-scm ];

pkgs/development/python-modules/python-miio/default.nix+1−1

@@ -37,6 +37,7 @@ buildPythonPackage rec {

3737 substituteInPlace pyproject.toml \

3838 --replace 'click = "^7"' 'click = "*"' \

3939 --replace 'croniter = "^0"' 'croniter = "*"' \

40+ --replace 'cryptography = "^3"' 'cryptography = "*"' \

4041 --replace 'defusedxml = "^0.6"' 'defusedxml = "*"'

4142 '';

4243

@@ -74,4 +75,3 @@ buildPythonPackage rec {

7475 maintainers = with maintainers; [ flyfloh ];

7576 };

7677}

77−

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "pytz";

5− version = "2021.1";

5+ version = "2021.3";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "sha256-g6SpCJS/OOJDzwUsi1jzgb/pp6SD9qnKsUC8f3AqxNo=";

9+ sha256 = "acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326";

1010 };

1111

1212 checkPhase = ''

pkgs/development/python-modules/pyvcd/default.nix+6−9

@@ -4,33 +4,30 @@

44, pythonOlder

55, setuptools-scm

66, six

7−, pytest

7+, pytestCheckHook

88}:

1010buildPythonPackage rec {

11− version = "0.2.4";

11+ version = "0.3.0";

1212 pname = "pyvcd";

1313 disabled = pythonOlder "3.6";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d";

17+ sha256 = "ec4d9198bd20f9e07d78f6558ff8bcd45b172ee332e7e8a4588727eeb6a362bc";

1818 };

1919

2020 buildInputs = [ setuptools-scm ];

21− propagatedBuildInputs = [ six ];

2221

23− checkPhase = ''

24− py.test

25− '';

22+ propagatedBuildInputs = [ six ];

2623

27− checkInputs = [ pytest ];

24+ checkInputs = [ pytestCheckHook ];

2825

2926 meta = with lib; {

3027 description = "Python package for writing Value Change Dump (VCD) files";

3128 homepage = "https://github.com/SanDisk-Open-Source/pyvcd";

3229 changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${version}/CHANGELOG.rst";

3330 license = licenses.mit;

34− maintainers = [ maintainers.sb0 maintainers.emily ];

31+ maintainers = with maintainers; [ sb0 emily ];

3532 };

3633}

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

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

1010buildPythonPackage rec {

1111 pname = "pyzmq";

12− version = "22.2.1";

12+ version = "22.3.0";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− sha256 = "6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242";

16+ sha256 = "8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c";

1717 };

1818

1919 checkInputs = [

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

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

1111}:

1212buildPythonPackage rec {

1313 pname = "qiling";

14− version = "1.2.4";

14+ version = "1.3.0";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "ecaa4415eea44f6f48021c1f7794c0d9fae7d64c8e43a3ff1d5de8e99bd963aa";

18+ sha256 = "084ad706f6803d7de2391eab928ecf4cb3e8d892fd2988666d4791a422d6ab9a";

1919 };

2020

2121 propagatedBuildInputs = [

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "QtPy";

5− version = "1.10.0";

5+ version = "1.11.2";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "3d20f010caa3b2c04835d6a2f66f8873b041bdaf7a76085c2a0d7890cdd65ea9";

9+ sha256 = "d6e4ae3a41f1fcb19762b58f35ad6dd443b4bdc867a4cb81ef10ccd85403c92b";

1010 };

1111

1212 # no concrete propagatedBuildInputs as multiple backends are supposed

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

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

1010

1111buildPythonPackage rec {

1212 pname = "rdflib";

13− version = "6.0.0";

13+ version = "6.0.1";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "7ce4d757eb26f4dd43205ec340d8c097f29e5adfe45d6ea20238c731dc679879";

17+ sha256 = "f071caff0b68634e4a7bd1d66ea3416ac98f1cc3b915938147ea899c32608728";

1818 };

1919

2020 propagatedBuildInputs = [isodate html5lib SPARQLWrapper ];

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

@@ -13,12 +13,12 @@

1313

1414buildPythonPackage rec {

1515 pname = "readme_renderer";

16− version = "29.0";

16+ version = "30.0";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s=";

21+ sha256 = "sha256-gplwDXqRDDBAcqdgHq+tpnEqWwEaIBOUF+Gx6fBGRdg=";

2222 };

2323

2424 propagatedBuildInputs = [

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

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

88buildPythonPackage rec {

99 pname = "regex";

10− version = "2021.8.28";

10+ version = "2021.10.8";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1";

14+ sha256 = "26895d7c9bbda5c52b3635ce5991caa90fbb1ddfac9c9ff1c7ce505e2282fb2a";

1515 };

1616

1717 # Sources for different Python releases are located in same folder

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

@@ -36,12 +36,10 @@ buildPythonPackage rec {

3636 '';

3737

3838 propagatedBuildInputs = [

39− brotlicffi

4039 certifi

41− charset-normalizer

42− chardet

4340 idna

4441 urllib3

42+ chardet

4543 ] ++ lib.optionals (isPy3k) [

4644 brotlicffi

4745 charset-normalizer

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

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

1313

1414buildPythonPackage rec {

1515 pname = "rich";

16− version = "10.9.0";

16+ version = "10.12.0";

1717 format = "pyproject";

1818 disabled = pythonOlder "3.6";

1919

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

2121 owner = "willmcgugan";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "0lf2s7n9b31aavwl5xjl3x1pjc756s8pbk0whh5kag80z5v6qc32";

24+ sha256 = "1qq4k0pxq3r0463z4h65i9rb8cvilpnqmparklj5y5qk6svz0y2n";

2525 };

2626

2727 nativeBuildInputs = [ poetry-core ];

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

@@ -10,13 +10,13 @@

1010

1111buildPythonPackage rec {

1212 pname = "sanic-testing";

13− version = "0.6.0";

13+ version = "0.7.0";

1414

1515 src = fetchFromGitHub {

1616 owner = "sanic-org";

1717 repo = "sanic-testing";

1818 rev = "v${version}";

19− sha256 = "1pf619cd3dckn3d8gh18vbn7dflvb0mzpf6frx4y950x2j3rdplk";

19+ sha256 = "0ib6rf1ly1059lfprc3hpmy377c3wfgfhnar6n4jgbxiyin7vzm7";

2020 };

2121

2222 postPatch = ''

pkgs/development/python-modules/schedule/default.nix+7

@@ -15,6 +15,13 @@ buildPythonPackage rec {

1515

1616 buildInputs = [ mock ];

1717

18+ preCheck = ''

19+ # https://github.com/dbader/schedule/issues/488

20+ substituteInPlace test_schedule.py --replace \

21+ "self.assertRaises(ScheduleValueError, every().day.until, datetime.time(hour=5))" \

22+ "# self.assertRaises(ScheduleValueError, every().day.until, datetime.time(hour=5))"

23+ '';

24+

1825 meta = with lib; {

1926 description = "Python job scheduling for humans";

2027 homepage = "https://github.com/dbader/schedule";

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

@@ -8,12 +8,12 @@

99buildPythonPackage rec {

1010 pname = "setuptools-scm";

11− version = "6.3.1";

11+ version = "6.3.2";

1212

1313 src = fetchPypi {

1414 pname = "setuptools_scm";

1515 inherit version;

16− sha256 = "sha256-D2omORKxN5jAKLmicdka873g5CeECRx5fezMOtOn9ZY=";

16+ sha256 = "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4";

1717 };

1818

1919 propagatedBuildInputs = [

pkgs/development/python-modules/signify/default.nix+33−15

@@ -1,31 +1,49 @@

1−{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook

2−, certvalidator, pyasn1, pyasn1-modules

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, asn1crypto

6+, certvalidator

7+, oscrypto

8+, pyasn1

9+, pyasn1-modules

10+, pytestCheckHook

311}:

412

513buildPythonPackage rec {

614 pname = "signify";

7− version = "0.3.0";

8− disabled = pythonOlder "3.5";

15+ version = "0.4.0";

16+ disabled = pythonOlder "3.6";

17+ format = "setuptools";

918

1019 src = fetchFromGitHub {

1120 owner = "ralphje";

1221 repo = pname;

1322 rev = "v${version}";

14− sha256 = "sha256-JxQECpwHhPm8TCVW/bCnEpu5I/WETyZVBx29SQE4NmE=";

23+ sha256 = "sha256-YJc9RIqkEL7dd1ahE4IbxyyZgsZWBDqbXZAvI/nK24M=";

1524 };

16− patches = [

17− # Upstream patch is available here:

18− # https://github.com/ralphje/signify/commit/8c345be954e898a317825bb450bed5ba0304b2b5.patch

19− # But update a couple other things and dont apply cleanly. This is an extract of the part

20− # we care about and breaks the tests after 2021-03-01

21− ./certificate-expiration-date.patch

25+

26+ propagatedBuildInputs = [

27+ asn1crypto

28+ certvalidator

29+ oscrypto

30+ pyasn1

31+ pyasn1-modules

2232 ];

2333

24− propagatedBuildInputs = [ certvalidator pyasn1 pyasn1-modules ];

34+ pythonImportsCheck = [

35+ "signify"

36+ ];

2537

26− checkInputs = [ pytestCheckHook ];

27− pytestFlagsArray = [ "-v" ];

28− pythonImportsCheck = [ "signify" ];

38+ checkInputs = [

39+ pytestCheckHook

40+ ];

41+

42+ disabledTests = [

43+ # chain doesn't validate because end-entitys certificate expired

44+ # https://github.com/ralphje/signify/issues/27

45+ "test_revoked_certificate"

46+ ];

2947

3048 meta = with lib; {

3149 homepage = "https://github.com/ralphje/signify";

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

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

1212

1313buildPythonPackage rec {

1414 pname = "sigtools";

15− version = "2.0.2";

15+ version = "2.0.3";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "1b890f22ece64bc47d3d4e84c950581e83917794a6cf1548698145590e221aff";

19+ sha256 = "e7789628ec0d02e421bca76532b0d5da149f96f09e7ed4a5cbf318624b75e949";

2020 };

2121

2222 buildInputs = [ repeated_test sphinx mock coverage unittest2 ];

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

@@ -6,13 +6,13 @@

66}:

88buildPythonPackage rec {

9− version = "0.8.2";

9+ version = "0.8.3";

1010 pname = "simpleai";

1111 disabled = isPy3k;

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "2927d460b09ff6dd177999c2f48f3275c84c956efe5b41b567b5316e2259d21e";

15+ sha256 = "1d5be7a00f1f42ed86683019262acbb14e6eca1ed92ce7d7fdf932838d3742e5";

1616 };

1717

1818 propagatedBuildInputs = [ numpy ];

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

@@ -3,11 +3,11 @@

44buildPythonPackage rec {

55 pname = "spyder-kernels";

6− version = "2.1.0";

6+ version = "2.1.3";

88 src = fetchPypi {

99 inherit pname version;

10− sha256 = "6c287207c7855bb581eae66ef8d990407382d5f9caccb1e0cabf909aaaf10c9b";

10+ sha256 = "ab5c2a90d44f0a26e7a6862e3cb73bb2d7084bc72f9336d8c2d2a78c145c4645";

1111 };

1212

1313 propagatedBuildInputs = [

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

@@ -8,13 +8,13 @@

99buildPythonPackage rec {

1010 pname = "spyder";

11− version = "5.1.1";

11+ version = "5.1.5";

1212

1313 disabled = isPy27;

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "6551acfd6fedfebd1f938ef67d3db415b33540f8377e7de3f4d4a2a11dd1b915";

17+ sha256 = "f9ce23187f5de18f489fb03c38d884e4484b9c7292f9831faaa029fb7752fc93";

1818 };

1919

2020 nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];

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

@@ -8,13 +8,13 @@

99buildPythonPackage rec {

1010 pname = "sqlparse";

11− version = "0.4.1";

11+ version = "0.4.2";

1212

1313 disabled = !isPy3k;

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8";

17+ sha256 = "0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae";

1818 };

1919

2020 nativeBuildInputs = [ installShellFiles ];

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

@@ -14,8 +14,9 @@ buildPythonPackage rec {

1414

1515 meta = with lib; {

1616 description = "A one step database access tool, built on the SQLAlchemy ORM";

17− homepage = "https://bitbucket.org/zzzeek/sqlsoup";

17+ homepage = "https://github.com/zzzeek/sqlsoup";

1818 license = licenses.mit;

1919 maintainers = [ maintainers.globin ];

20+ broken = true; # incompatible with sqlalchemy>=1.4 and unmaintained since 2016

2021 };

2122}

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

@@ -13,12 +13,12 @@

1313

1414buildPythonPackage rec {

1515 pname = "statsmodels";

16− version = "0.12.2";

16+ version = "0.13.0";

1717 disabled = isPy27;

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "8ad7a7ae7cdd929095684118e3b05836c0ccb08b6a01fe984159475d174a1b10";

21+ sha256 = "f2efc02011b7240a9e851acd76ab81150a07d35c97021cb0517887539a328f8a";

2222 };

2323

2424 nativeBuildInputs = [ cython ];

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

@@ -8,11 +8,11 @@

99buildPythonPackage rec {

1010 pname = "subprocess-tee";

11− version = "0.3.2";

11+ version = "0.3.5";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "01b0z8mcm568v9carhi0py1hs34wrbnlzyvdmhqzipql407kdpk2";

15+ sha256 = "ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577";

1616 };

1717

1818 nativeBuildInputs = [

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

@@ -8,11 +8,11 @@

99buildPythonPackage rec {

1010 pname = "sympy";

11− version = "1.8";

11+ version = "1.9";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb";

15+ sha256 = "c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc";

1616 };

1717

1818 checkInputs = [ glibcLocales ];

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

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

77buildPythonPackage rec {

88 pname = "tempora";

9− version = "4.1.1";

9+ version = "4.1.2";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "c54da0f05405f04eb67abbb1dff4448fd91428b58cb00f0f645ea36f6a927950";

13+ sha256 = "fd6cafd66b01390d53a760349cf0b3123844ec6ae3d1043d7190473ea9459138";

1414 };

1515

1616 disabled = pythonOlder "3.2";

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

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

88buildPythonPackage rec {

99 pname = "terminado";

10− version = "0.11.1";

10+ version = "0.12.1";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "962b402edbb480718054dc37027bada293972ecadfb587b89f01e2b8660a2132";

14+ sha256 = "b20fd93cc57c1678c799799d117874367cc07a3d2d55be95205b1a88fa08393f";

1515 };

1616

1717 propagatedBuildInputs = [ ptyprocess tornado ];

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

@@ -9,13 +9,13 @@

1010buildPythonPackage rec {

1111 pname = "termplotlib";

12− version = "0.3.8";

12+ version = "0.3.9";

1313

1414 src = fetchFromGitHub {

1515 owner = "nschloe";

1616 repo = pname;

1717 rev = "v${version}";

18− sha256 = "10k70pb7554cc2zwkcgxfak8nb7iqqw6njbnaqfdz07l4v9f6smm";

18+ sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1";

1919 };

2020

2121 format = "pyproject";

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

@@ -16,11 +16,11 @@

1616

1717buildPythonPackage rec {

1818 pname = "tern";

19− version = "2.7.0";

19+ version = "2.8.0";

2020

2121 src = fetchPypi {

2222 inherit pname version;

23− sha256 = "cfd59431cafd6adf05ccb94be964098d9301f83a03bf715def7861811e4a4b74";

23+ sha256 = "dd7d8ad929ffe951b1f7f86310b9d5ba749b4306132c3611ff1d5a2c4d79d2bd";

2424 };

2525

2626 preBuild = ''

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

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

1313

1414buildPythonPackage rec {

1515 pname = "tifffile";

16− version = "2021.8.8";

16+ version = "2021.8.30";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "8260f31c4700143e8374ff6cde5cef7fe54fc9b7313afe88329f407881901dc5";

20+ sha256 = "8760e61e30106ea0dab9ec42a238d70a3ff55dde9c54456e7b748fe717cb782d";

2121 };

2222

2323 patches = lib.optional isPy27 ./python2-regex-compat.patch;

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

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

88buildPythonPackage rec {

99 pname = "tomli";

10− version = "1.1.0";

10+ version = "1.2.1";

1111 format = "pyproject";

1212

1313 outputs = [

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

1919 owner = "hukkin";

2020 repo = pname;

2121 rev = version;

22− sha256 = "1cj6iil9sii1zl0l4pw7h4alcnhwdbxinpph2f0rm5rghrp6prjm";

22+ sha256 = "sha256-30AQ9MQmclcjl1d83mIoxFXzaJn1OFKQlVxayqC5NxY=";

2323 };

2424

2525 nativeBuildInputs = [ flit-core ];

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

@@ -24,13 +24,13 @@ let

2424 cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;

2525in buildPythonPackage rec {

2626 pname = "torchvision";

27− version = "0.10.0";

27+ version = "0.10.1";

2828

2929 src = fetchFromGitHub {

3030 owner = "pytorch";

3131 repo = "vision";

3232 rev = "v${version}";

33− sha256 = "13j04ij0jmi58nhav1p69xrm8dg7jisg23268i3n6lnms37n02kc";

33+ sha256 = "0dw4q4yf86wwkm38bpsjf0yfzai46icvaly861ymh5v9f90q60jw";

3434 };

3535

3636 nativeBuildInputs = [ libpng ninja which ]

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

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

1313

1414buildPythonPackage rec {

1515 pname = "tox";

16− version = "3.24.3";

16+ version = "3.24.4";

1717

1818 buildInputs = [ setuptools-scm ];

1919 propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];

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

2222

2323 src = fetchPypi {

2424 inherit pname version;

25− sha256 = "c6c4e77705ada004283610fd6d9ba4f77bc85d235447f875df9f0ba1bc23b634";

25+ sha256 = "c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca";

2626 };

2727

2828 meta = with lib; {

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

@@ -14,11 +14,11 @@

1414

1515buildPythonPackage rec {

1616 pname = "tqdm";

17− version = "4.62.2";

17+ version = "4.62.3";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5";

21+ sha256 = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d";

2222 };

2323

2424 nativeBuildInputs = [

pkgs/development/python-modules/traits/default.nix+5−11

@@ -9,22 +9,16 @@

1010buildPythonPackage rec {

1111 pname = "traits";

12− version = "6.2.0";

13− disabled = isPy27; # setup.py no longer py3 compat

12+ version = "6.3.0";

13+ disabled = isPy27;

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "16fa1518b0778fd53bf0547e6a562b1787bf68c8f6b7995a13bd1902529fdb0c";

17+ sha256 = "770241df047feb9e3ed4c26a36c2468a5b754e6082a78eeb737f058bd45344f5";

1818 };

1919

20− # Use pytest because its easier to discover tests

21− buildInputs = [ pytest ];

2220 propagatedBuildInputs = [ numpy ];

2321

24− checkPhase = ''

25− py.test $out/${python.sitePackages}

26− '';

27−

2822 # Test suite is broken for 3.x on latest release

2923 # https://github.com/enthought/traits/issues/187

3024 # https://github.com/enthought/traits/pull/188

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

3428 meta = with lib; {

3529 description = "Explicitly typed attributes for Python";

3630 homepage = "https://pypi.python.org/pypi/traits";

37− license = "BSD";

31+ license = licenses.bsd3;

32+ maintainers = with maintainers; [ ];

3833 };

39−

4034}

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

@@ -23,12 +23,12 @@

2323

2424buildPythonApplication rec {

2525 pname = "trytond";

26− version = "6.0.5";

26+ version = "6.0.8";

2727 disabled = pythonOlder "3.5";

2828

2929 src = fetchPypi {

3030 inherit pname version;

31− sha256 = "3ccb98dbf905d99991ed0151e13c91cd9267e4aa104fa40097df4e02580dadfc";

31+ sha256 = "686d498f9648875f48edc9fc2e97cd465ed4ea9270c4984b6f2db20a2eac4942";

3232 };

3333

3434 # Tells the tests which database to use

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

@@ -9,13 +9,13 @@

1010buildPythonPackage rec {

1111 pname = "tubeup";

12− version = "0.0.26";

12+ version = "0.0.27";

1313

1414 disabled = isPy27;

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "842bc03c354d8f952436109264db6cd9146f26cee281d1540d5d7c3aa7371bcc";

18+ sha256 = "77affb4105fc319d82c56aa5706151a4976b8b504dd252fe3db01443e27cba50";

1919 };

2020

2121 postPatch = ''

pkgs/development/python-modules/typed-settings/default.nix+20−3

@@ -1,8 +1,10 @@

11{ lib

22, buildPythonPackage

3+, pythonOlder

34, fetchPypi

45, setuptoolsBuildHook

56, attrs

7+, cattrs

68, toml

79, pytestCheckHook

810, click

@@ -10,28 +12,43 @@

1012

1113buildPythonPackage rec {

1214 pname = "typed-settings";

13− version = "0.10.0";

15+ version = "0.11.1";

1416 format = "pyproject";

17+ disabled = pythonOlder "3.7";

1518

1619 src = fetchPypi {

1720 inherit pname version;

18− sha256 = "1fr6qkq3ldlp5i5l4b891w9ail9lfhaxlar3yij912slq5w0s8aw";

21+ sha256 = "sha256-gcyOeUyRAwU5s+XoQO/yM0tx7QHjDsBeyoe5HRZHtIs=";

1922 };

2023

2124 nativeBuildInputs = [

2225 setuptoolsBuildHook

23− pytestCheckHook

2426 ];

2527

2628 propagatedBuildInputs = [

2729 attrs

30+ cattrs

2831 toml

2932 ];

3033

34+ preCheck = ''

35+ pushd tests

36+ '';

37+

3138 checkInputs = [

3239 click

40+ pytestCheckHook

3341 ];

3442

43+ disabledTests = [

44+ # mismatches in click help output

45+ "test_help"

46+ ];

47+

48+ postCheck = ''

49+ popd

50+ '';

51+

3552 meta = {

3653 description = "Typed settings based on attrs classes";

3754 homepage = "https://gitlab.com/sscherfke/typed-settings";

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

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

33buildPythonPackage rec {

44 pname = "ufonormalizer";

5− version = "0.6.0";

5+ version = "0.6.1";

77 disabled = pythonOlder "3.5";

99 src = fetchPypi {

1010 inherit pname version;

11− sha256 = "0w44qlvg4xks7jb0lf3lhsbylagq956x0wkcal9ix34bz3p7vdxd";

11+ sha256 = "e61110e75a500083f265385b1354b578610f9542e3bbbeedb98a2a6155e4aa6c";

1212 extension = "zip";

1313 };

1414

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

@@ -9,12 +9,12 @@

1010buildPythonPackage rec {

1111 pname = "ujson";

12− version = "4.1.0";

12+ version = "4.2.0";

1313 disabled = isPyPy || pythonOlder "3.5";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "sha256-IrY+xECfDS8sTJ1aozGZfgJHC3oVoyM/PMMvL5uS1Yw=";

17+ sha256 = "fffe509f556861c7343c6cba57ed05fe7bcf4b48a934a5b946ccb45428cf8883";

1818 };

1919

2020 nativeBuildInputs = [

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

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

1212

1313buildPythonPackage rec {

1414 pname = "uncompyle6";

15− version = "3.7.4";

15+ version = "3.8.0";

1616 disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "af8330861bf940e7a3ae0f06d129b8e645191a36bf73ca15ff51997a837d41f8";

20+ sha256 = "sha256-YgYzYY9t/B8+eBh+Igk014/8Y5wOOdrsofxTWquBcBQ=";

2121 };

2222

2323 checkInputs = [ nose pytest hypothesis six ];

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

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "unrardll";

5− version = "0.1.4";

5+ version = "0.1.5";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "4149c0729cf96a0bae80360e7d94dc40af1088c8da7f6eb8d10e09b8632e92ad";

9+ sha256 = "8bebb480b96cd49d4290d814914f39cff75cf0fa0514c4790bb32b1757227c78";

1010 };

1111

1212 buildInputs = [ unrar ];

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

@@ -19,11 +19,11 @@

1919

2020buildPythonPackage rec {

2121 pname = "urllib3";

22− version = "1.26.6";

22+ version = "1.26.7";

2323

2424 src = fetchPypi {

2525 inherit pname version;

26− sha256 = "sha256-9XtMFsYvonYLfj2Xw1slVRL7a1miWXMPNroyzp+ONC8=";

26+ sha256 = "sha256-SYfGVVT3otvzDBj9SHeO8SSvb6t3GjdxA9oFheIzbs4=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/virtualenv/default.nix+4−7

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

2323

2424buildPythonPackage rec {

2525 pname = "virtualenv";

26− version = "20.7.2";

26+ version = "20.8.1";

2727

2828 src = fetchPypi {

2929 inherit pname version;

30− sha256 = "9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0";

30+ sha256 = "bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8";

3131 };

3232

3333 nativeBuildInputs = [

@@ -72,11 +72,8 @@ buildPythonPackage rec {

7272 ];

7373

7474 disabledTests = [

75− "test_can_build_c_extensions"

76− "test_xonsh" # imports xonsh, which is not in pythonPackages

77− # tests search `python3`, fail on python2, pypy

78− "test_python_via_env_var"

79− "test_python_multi_value_prefer_newline_via_env_var"

75+ # Permission Error

76+ "test_bad_exe_py_info_no_raise"

8077 ];

8178

8279 pythonImportsCheck = [ "virtualenv" ];

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

@@ -10,12 +10,12 @@

1010}:

1111buildPythonPackage rec {

1212 pname = "vivisect";

13− version = "1.0.4";

13+ version = "1.0.5";

1414 disabled = isPy3k;

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "bd47b2cf5874cd2f74e6c36b8a97bf301785bacf9ac0297bbe78ec1b8c86c755";

18+ sha256 = "f629dc0143656b06b64e2da1772deda67d37a3e048e74bd728de4a4f24bf877b";

1919 };

2020

2121 propagatedBuildInputs = [

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

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

1313

1414buildPythonPackage rec {

1515 pname = "watchdog";

16− version = "2.1.5";

16+ version = "2.1.6";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "5563b005907613430ef3d4aaac9c78600dd5704e84764cb6deda4b3d72807f09";

20+ sha256 = "sha256-o25132x2fL9G9hqRxws7pxgR36CspKMk2UB6Bqi3ouc=";

2121 };

2222

2323 buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

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

@@ -8,14 +8,14 @@

99buildPythonPackage rec {

1010 pname = "websockets";

11− version = "9.1";

11+ version = "10.0";

1212 disabled = pythonOlder "3.7";

1313

1414 src = fetchFromGitHub {

1515 owner = "aaugustin";

1616 repo = pname;

1717 rev = version;

18− sha256 = "sha256-7Y12IUG+ulD4+CTRlY+NE6qYZyI9gCPDydwpt+uyYZk=";

18+ sha256 = "sha256-F10C8ukjYfbn2X2PMzrdSDqvs51/A9lx8Y3kv8YJ8Cw=";

1919 };

2020

2121 # Tests fail on Darwin with `OSError: AF_UNIX path too long`

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

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

66buildPythonPackage rec {

77 pname = "wrapt";

8− version = "1.12.1";

8+ version = "1.13.1";

1010 # No tests in archive

1111 doCheck = false;

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7";

15+ sha256 = "909a80ce028821c7ad01bdcaa588126825931d177cdccd00b3545818d4a195ce";

1616 };

1717

1818 meta = {

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

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

77buildPythonPackage rec {

88 pname = "xdis";

9− version = "5.0.11";

9+ version = "6.0.2";

1010 disabled = isPy27;

1111

1212 src = fetchFromGitHub {

1313 owner = "rocky";

1414 repo = "python-xdis";

1515 rev = version;

16− sha256 = "sha256-KTPu0+bERLRCVESqJgBPtcftlniWl2+C9GDcf84ssiA=";

16+ sha256 = "sha256-P8mUkAO3usFCE+E9cna2x1iA2uyHVPX9FHDpX+kTFWQ=";

1717 };

1818

1919 checkInputs = [ pytest ];

pkgs/development/python-modules/yarl/default.nix+32−12

@@ -1,32 +1,52 @@

11{ lib

2−, fetchPypi

32, buildPythonPackage

3+, fetchPypi

4+, python

45, pythonOlder

6+, idna

57, multidict

6−, pytest-runner

7−, pytest

88, typing-extensions

9−, idna

9+, pytestCheckHook

1010}:

1111

1212buildPythonPackage rec {

1313 pname = "yarl";

14− version = "1.6.3";

14+ version = "1.7.0";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10";

18+ sha256 = "8e7ebaf62e19c2feb097ffb7c94deb0f0c9fab52590784c8cd679d30ab009162";

1919 };

2020

21− checkInputs = [ pytest pytest-runner ];

22− propagatedBuildInputs = [ multidict idna ]

23− ++ lib.optionals (pythonOlder "3.8") [

24− typing-extensions

25− ];

21+ postPatch = ''

22+ sed -i '/^addopts/d' setup.cfg

23+ '';

24+

25+ propagatedBuildInputs = [

26+ idna

27+ multidict

28+ ] ++ lib.optionals (pythonOlder "3.8") [

29+ typing-extensions

30+ ];

31+

32+ preCheck = ''

33+ # don't import yarl from ./ so the C extension is available

34+ pushd tests

35+ '';

36+

37+ checkInputs = [

38+ pytestCheckHook

39+ ];

40+

41+ postCheck = ''

42+ popd

43+ '';

44+

45+ pythonImportsCheck = [ "yarl" ];

2646

2747 meta = with lib; {

2848 description = "Yet another URL library";

29− homepage = "https://github.com/aio-libs/yarl/";

49+ homepage = "https://github.com/aio-libs/yarl";

3050 license = licenses.asl20;

3151 maintainers = with maintainers; [ dotlambda ];

3252 };

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

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

88buildPythonPackage rec {

99 pname = "zipp";

10− version = "3.5.0";

10+ version = "3.6.0";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4";

14+ sha256 = "71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832";

1515 };

1616

1717 nativeBuildInputs = [ setuptools-scm ];

pkgs/development/tools/misc/autogen/default.nix+8−1

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

1−{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:

1+{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:

33stdenv.mkDerivation rec {

44 pname = "autogen";

@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {

2828 pname = "31_allow_overriding_AGexe_for_crossbuild";

2929 sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf";

3030 })

31+ # Next upstream release will contain guile-3 support. We apply non-invasive

32+ # patch meanwhile.

33+ (fetchpatch {

34+ name = "guile-3.patch";

35+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch?id=43bcc61c56a5a7de0eaf806efec7d8c0e4c01ae7";

36+ sha256 = "18d7y1f6164dm1wlh7rzbacfygiwrmbc35a7qqsbdawpkhydm5lr";

37+ })

3138 ];

3239

3340 outputs = [ "bin" "dev" "lib" "out" "man" "info" ];

pkgs/development/tools/misc/elfutils/default.nix+22−34

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

1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts

2−, musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs

1+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts

2+, musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs

33, argp-standalone

44, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive

55}:

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

77# TODO: Look at the hardcoded paths to kernel, modules etc.

88stdenv.mkDerivation rec {

99 pname = "elfutils";

10− version = "0.182";

10+ version = "0.185";

1111

1212 src = fetchurl {

1313 url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";

14− sha256 = "7MQGkU7fM18Lf8CE6+bEYMTW1Rdb/dZojBx42RRriFg=";

14+ sha256 = "sha256-3I0+dKsglGXn9Wjhs7uaWhQvhlbitX0QBJpz2irmtaY=";

1515 };

1616

1717 patches = [

@@ -27,43 +27,29 @@ stdenv.mkDerivation rec {

2727 url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

2828 sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";

2929 })

30− (fetchpatch {

31− name = "musl-fts-obstack.patch";

32− url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-fts-obstack.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

33− sha256 = "3lbC0UtscTIJgT7kOXnnjWrpPAVt2PYMbW+uJK6K350=";

34− })

3530 (fetchpatch {

3631 name = "musl-macros.patch";

3732 url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

3833 sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";

3934 })

40− (fetchpatch {

41− name = "musl-qsort_r.patch";

42− url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-qsort_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

43− sha256 = "FPWCkdtFT3zw8aNnz0Jz5Vmu8B/mRfNgfhbM/ej7d8M=";

44− })

45− (fetchpatch {

46− name = "musl-strerror_r.patch";

47− url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strerror_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

48− sha256 = "QF6YwWkcT12dZHKzfqFgxy/1fkIllo0AAosbV0sM5PU=";

49− })

5035 (fetchpatch {

5136 name = "musl-strndupa.patch";

5237 url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

5338 sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";

5439 })

55− ] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];

40+ ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];

5641

57− outputs = [ "bin" "dev" "out" "man" ];

42+ postPatch = ''

43+ patchShebangs tests/*.sh

44+ '';

5845

59− hardeningDisable = [ "format" ];

46+ outputs = [ "bin" "dev" "out" "man" ];

6047

6148 # We need bzip2 in NativeInputs because otherwise we can't unpack the src,

6249 # as the host-bzip2 will be in the path.

6350 nativeBuildInputs = [ m4 bison flex gettext bzip2 ]

64− ++ lib.optional stdenv.hostPlatform.isMusl autoreconfHook

65− ++ lib.optional (enableDebuginfod || stdenv.hostPlatform.isMusl) pkg-config;

66− buildInputs = [ zlib bzip2 xz ]

51+ ++ lib.optional enableDebuginfod pkg-config;

52+ buildInputs = [ zlib zstd bzip2 xz ]

6753 ++ lib.optionals stdenv.hostPlatform.isMusl [

6854 argp-standalone

6955 musl-fts

@@ -77,22 +63,24 @@ stdenv.mkDerivation rec {

7763

7864 propagatedNativeBuildInputs = [ setupDebugInfoDirs ];

7965

80− preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

81− NIX_CFLAGS_COMPILE+=" -Wno-null-dereference"

82− '';

66+ NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isMusl [

67+ "-Wno-null-dereference"

68+ ];

8369

8470 configureFlags = [

8571 "--program-prefix=eu-" # prevent collisions with binutils

8672 "--enable-deterministic-archives"

87− ] ++ lib.optionals (!enableDebuginfod) [

88− "--disable-libdebuginfod"

89− "--disable-debuginfod"

73+ (lib.enableFeature enableDebuginfod "libdebuginfod")

74+ (lib.enableFeature enableDebuginfod "debuginfod")

9075 ];

9176

9277 enableParallelBuilding = true;

9378

94− doCheck = false; # fails 3 out of 174 tests

95− doInstallCheck = false; # fails 70 out of 174 tests

79+ # Backtrace unwinding tests rely on glibc-internal symbol names.

80+ # Musl provides slightly different forms and fails.

81+ # Let's disable tests there until musl support is fully upstreamed.

82+ doCheck = !stdenv.hostPlatform.isMusl;

83+ doInstallCheck = !stdenv.hostPlatform.isMusl;

9684

9785 meta = with lib; {

9886 homepage = "https://sourceware.org/elfutils/";

@@ -101,6 +89,6 @@ stdenv.mkDerivation rec {

10189 # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins,

10290 # but since this package isn't split that way, all three are listed.

10391 license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ];

104− maintainers = [ maintainers.eelco ];

92+ maintainers = with maintainers; [ eelco r-burns ];

10593 };

10694}

pkgs/development/tools/misc/gdb/default.nix+5−2

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

77, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight

99, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null

10+, enableDebuginfod ? false, elfutils

1011, guile ? null

1112, safePaths ? [

1213 # $debugdir:$datadir/auto-load are whitelisted by default by GDB

@@ -48,7 +49,8 @@ stdenv.mkDerivation rec {

4849

4950 buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile sourceHighlight ]

5051 ++ lib.optional pythonSupport python3

51− ++ lib.optional doCheck dejagnu;

52+ ++ lib.optional doCheck dejagnu

53+ ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; });

5254

5355 propagatedNativeBuildInputs = [ setupDebugInfoDirs ];

5456

@@ -89,7 +91,8 @@ stdenv.mkDerivation rec {

8991 "--with-expat" "--with-libexpat-prefix=${expat.dev}"

9092 "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"

9193 ] ++ lib.optional (!pythonSupport) "--without-python"

92− ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls";

94+ ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"

95+ ++ lib.optional enableDebuginfod "--with-debuginfod=yes";

9396

9497 postInstall =

9598 '' # Remove Info files already provided by Binutils and other packages.

pkgs/development/tools/rust/cargo-c/default.nix+21−27

@@ -1,39 +1,34 @@

1−{ rustPlatform, stdenv, lib, fetchFromGitHub, fetchurl

2−, pkg-config, curl, openssl

3−, CoreFoundation, libiconv, Security

1+{ lib

2+, rustPlatform

3+, fetchCrate

4+, pkg-config

5+, curl

6+, openssl

7+, stdenv

8+, CoreFoundation

9+, libiconv

10+, Security

411}:

512

613rustPlatform.buildRustPackage rec {

714 pname = "cargo-c";

815 version = "0.9.2";

916

10− src = stdenv.mkDerivation rec {

11− name = "${pname}-source-${version}";

12−

13− src = fetchFromGitHub {

14− owner = "lu-zero";

15− repo = pname;

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

17− sha256 = "0hvlrhmbplx4cj4l5fynihgr9cdh0rkpwvipizk1gpp6p1ksr5hz";

18− };

19− cargoLock = fetchurl {

20− url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock";

21− sha256 = "0ckn31asz7013206j153ig96602dxvxm6skdz1plan0h05j5mgah";

22− };

23−

24− installPhase = ''

25− mkdir -p $out

26− cp -R ./* $out/

27− cp ${cargoLock} $out/Cargo.lock

28− '';

17+ src = fetchCrate {

18+ inherit pname;

19+ # this version may need to be updated along with package version

20+ version = "${version}+cargo-0.55";

21+ sha256 = "sha256-yh5vAtKlBvoSlJBsW2RSduSK6T8aOssM84WQMNjLZqA=";

2922 };

3023

31− cargoSha256 = "0c0vn2pcy5px02mc0l4a3w7z9n8hc6br5w3ww6nrav5w6911jp52";

32−

24+ cargoSha256 = "sha256-YikTjAeroaHyNe3ygUWRHSXJwdm2BSBV7RgIDN4suZ4=";

3325

3426 nativeBuildInputs = [ pkg-config (lib.getDev curl) ];

35− buildInputs = [ openssl curl ]

36− ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];

27+ buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [

28+ CoreFoundation

29+ libiconv

30+ Security

31+ ];

3732

3833 # Ensure that we are avoiding build of the curl vendored in curl-sys

3934 doInstallCheck = stdenv.hostPlatform.libc == "glibc";

@@ -55,7 +50,6 @@ rustPlatform.buildRustPackage rec {

5550 homepage = "https://github.com/lu-zero/cargo-c";

5651 changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}";

5752 license = licenses.mit;

58− platforms = platforms.unix;

5953 maintainers = with maintainers; [ ];

6054 };

6155}

pkgs/development/web/nodejs/v14.nix+2−2

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

77in

88 buildNodejs {

99 inherit enableNpm;

10− version = "14.18.0";

11− sha256 = "0naqv0aglsqy51pyiz42xz7wx5pfsbyscpdl8rir6kmfl1c52j3b";

10+ version = "14.18.1";

11+ sha256 = "1vc9rypkgr5i5y946jnyr9jjpydxvm74p1s17rg2zayzvlddg89z";

1212 patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

1313 }

pkgs/misc/cups/default.nix+11−24

@@ -28,16 +28,15 @@ stdenv.mkDerivation rec {

2828 pname = "cups";

2929

3030 # After 2.2.6, CUPS requires headers only available in macOS 10.12+

31− version = if stdenv.isDarwin then "2.2.6" else "2.3.3";

31+ version = if stdenv.isDarwin then "2.2.6" else "2.3.3op2";

3232

33− passthru = { inherit version; };

34−

35− src = fetchurl {

33+ src = fetchurl (if stdenv.isDarwin then {

3634 url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";

37− sha256 = if version == "2.2.6"

38− then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"

39− else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6";

40− };

35+ sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20";

36+ } else {

37+ url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";

38+ sha256 = "1pwndz4gwkm7311wkhhzlw2diy7wbck7yy026jbaxh3rprdmgcyy";

39+ });

4140

4241 outputs = [ "out" "lib" "dev" "man" ];

4342

@@ -49,10 +48,8 @@ stdenv.mkDerivation rec {

4948 nativeBuildInputs = [ pkg-config removeReferencesTo ];

5049

5150 buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ]

52− ++ optionals stdenv.isLinux [ avahi pam dbus ]

51+ ++ optionals stdenv.isLinux [ avahi pam dbus acl ]

5352 ++ optional enableSystemd systemd

54− # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change.

55− ++ optionals stdenv.isLinux [ acl ]

5653 ++ optionals stdenv.isDarwin (with darwin; [

5754 configd apple_sdk.frameworks.ApplicationServices

5855 ]);

@@ -129,18 +126,8 @@ stdenv.mkDerivation rec {

129126 sed -e "/^cups_serverbin=/s|$lib|$out|" \

130127 -i "$dev/bin/cups-config"

131128

132− # Rename systemd files provided by CUPS

133129 for f in "$out"/lib/systemd/system/*; do

134− substituteInPlace "$f" \

135− --replace "$lib/$libexec" "$out/$libexec" \

136− --replace "org.cups.cupsd" "cups" \

137− --replace "org.cups." ""

138−

139− if [[ "$f" =~ .*cupsd\..* ]]; then

140− mv "$f" "''${f/org\.cups\.cupsd/cups}"

141− else

142− mv "$f" "''${f/org\.cups\./}"

143− fi

130+ substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec"

144131 done

145132 '' + optionalString stdenv.isLinux ''

146133 # Use xdg-open when on Linux

@@ -149,9 +136,9 @@ stdenv.mkDerivation rec {

149136 '';

150137

151138 meta = {

152− homepage = "https://cups.org/";

139+ homepage = "https://openprinting.github.io/cups/";

153140 description = "A standards-based printing system for UNIX";

154− license = licenses.gpl2; # actually LGPL for the library and GPL for the rest

141+ license = licenses.asl20;

155142 maintainers = with maintainers; [ matthewbauer ];

156143 platforms = platforms.unix;

157144 };

pkgs/os-specific/linux/iptables/default.nix+1−1

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

11{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison

22, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap

3−, nftablesCompat ? false

3+, nftablesCompat ? true

44}:

66with lib;

pkgs/os-specific/linux/kernel/linux-libre.nix+7−2

@@ -14,9 +14,14 @@ let

1414 minor = lib.versions.minor linux.modDirVersion;

1515 patch = lib.versions.patch linux.modDirVersion;

1616

17+ # See http://linux-libre.fsfla.org/pub/linux-libre/releases

18+ versionPrefix = if linux.kernelOlder "5.14" then

19+ "gnu1"

20+ else

21+ "gnu";

1722in linux.override {

1823 argsOverride = {

19− modDirVersion = "${linux.modDirVersion}-gnu1";

24+ modDirVersion = "${linux.modDirVersion}-${versionPrefix}";

2025 isLibre = true;

2126

2227 src = stdenv.mkDerivation {

@@ -37,6 +42,6 @@ in linux.override {

3742

3843 passthru.updateScript = ./update-libre.sh;

3944

40− maintainers = [ lib.maintainers.qyliss ];

45+ maintainers = with lib.maintainers; [ qyliss ivar ];

4146 };

4247}

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

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

44, gmp, jansson, readline

55, withDebugSymbols ? false

66, withPython ? false , python3

7−, withXtables ? false , iptables

7+, withXtables ? true , iptables

88}:

1010with lib;

pkgs/os-specific/linux/systemd/default.nix+9−3

@@ -251,6 +251,7 @@ stdenv.mkDerivation {

251251 { name = "libtss2-esys.so.0"; pkg = opt withTpm2Tss tpm2-tss; }

252252 { name = "libtss2-rc.so.0"; pkg = opt withTpm2Tss tpm2-tss; }

253253 { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; }

254+ { name = "libtss2-tcti-"; pkg = opt withTpm2Tss tpm2-tss; }

254255 { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; }

255256 ];

256257

@@ -267,8 +268,12 @@ stdenv.mkDerivation {

267268 '' else ''

268269 # ensure that the library we provide actually exists

269270 if ! [ -e ${library} ]; then

270− echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`'

271− exit 1

271+ # exceptional case, details:

272+ # https://github.com/systemd/systemd-stable/blob/v249-stable/src/shared/tpm2-util.c#L157

273+ if ! [[ "${library}" =~ .*libtss2-tcti-$ ]]; then

274+ echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`'

275+ exit 1

276+ fi

272277 fi

273278 # make the path to the dependency explicit

274279 for file in $(grep -lr '"${dl.name}"' src); do

@@ -353,6 +358,7 @@ stdenv.mkDerivation {

353358 ++ lib.optionals withHomed [ p11-kit ]

354359 ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]

355360 ++ lib.optionals withLibBPF [ libbpf ]

361+ ++ lib.optional withTpm2Tss tpm2-tss

356362 ;

357363

358364 #dontAddPrefix = true;

@@ -452,7 +458,7 @@ stdenv.mkDerivation {

452458 "-Dnss-systemd=false"

453459 ] ++ lib.optionals withLibBPF [

454460 "-Dbpf-framework=true"

455− ];

461+ ] ++ lib.optional withTpm2Tss "-Dtpm2=true";

456462

457463 preConfigure = ''

458464 mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")

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

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

11{ lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng

2−, ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }:

2+, ncurses ? null, pam, systemd ? null

3+, nlsSupport ? true

4+}:

46stdenv.mkDerivation rec {

57 pname = "util-linux";

@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {

1416 ./rtcwake-search-PATH-for-shutdown.patch

1517 ];

1618

17− outputs = [ "bin" "dev" "out" "man" ];

19+ outputs = [ "bin" "dev" "out" "lib" "man" ];

1820

1921 postPatch = ''

2022 patchShebangs tests/run.sh

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

3032 # somewhat risky because we have to consider that mount can setuid

3133 # root...

3234 configureFlags = [

35+ "--localstatedir=/var"

3336 "--enable-write"

3437 "--enable-last"

3538 "--enable-mesg"

@@ -37,30 +40,29 @@ stdenv.mkDerivation rec {

3740 "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"

3841 "--disable-makeinstall-setuid" "--disable-makeinstall-chown"

3942 "--disable-su" # provided by shadow

43+ (lib.enableFeature nlsSupport "nls")

4044 (lib.withFeature (ncurses != null) "ncursesw")

4145 (lib.withFeature (systemd != null) "systemd")

4246 (lib.withFeatureAs (systemd != null)

4347 "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/")

48+ "SYSCONFSTATICDIR=${placeholder "lib"}/lib"

4449 ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

4550 "scanf_cv_type_modifier=ms"

4651 ;

4752

4853 makeFlags = [

4954 "usrbin_execdir=${placeholder "bin"}/bin"

55+ "usrlib_execdir=${placeholder "lib"}/lib"

5056 "usrsbin_execdir=${placeholder "bin"}/sbin"

5157 ];

5258

5359 nativeBuildInputs = [ pkg-config ];

5460 buildInputs =

5561 [ zlib pam libcap_ng ]

56− ++ lib.filter (p: p != null) [ ncurses systemd perl ];

62+ ++ lib.filter (p: p != null) [ ncurses systemd ];

5763

5864 doCheck = false; # "For development purpose only. Don't execute on production system!"

5965

60− postInstall = lib.optionalString minimal ''

61− rm -rf $out/share/{locale,doc,bash-completion}

62− '';

63−

6466 enableParallelBuilding = true;

6567

6668 meta = with lib; {

pkgs/servers/home-assistant/default.nix+3−1

@@ -197,10 +197,12 @@ in with py.pkgs; buildPythonApplication rec {

197197 --replace "awesomeversion==21.4.0" "awesomeversion" \

198198 --replace "bcrypt==3.1.7" "bcrypt" \

199199 --replace "cryptography==3.3.2" "cryptography" \

200+ --replace "jinja2==3.0.1" "jinja2" \

200201 --replace "pip>=8.0.3,<20.3" "pip" \

201202 --replace "requests==2.25.1" "requests>=2.25.1" \

202203 --replace "ruamel.yaml==0.15.100" "ruamel.yaml" \

203− --replace "voluptuous==0.12.1" "voluptuous==0.12.2"

204+ --replace "voluptuous==0.12.1" "voluptuous==0.12.2" \

205+ --replace "yarl==1.6.3" "yarl==1.7.0"

204206 substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'

205207 '';

206208

pkgs/servers/mail/mailman/default.nix+43−10

@@ -1,23 +1,52 @@

1−{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython

2−, flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib

3−, requests, zope_configuration, click, falcon, importlib-resources

4−, zope_component, lynx, postfix, authheaders, gunicorn

1+{ lib, python3, fetchPypi, fetchpatch, pythonOlder, postfix, lynx

52}:

4+let

5+ py = python3.override {

6+ packageOverrides = self: super: {

7+ # https://gitlab.com/mailman/mailman/-/issues/845

8+ sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {

9+ version = "1.3.24";

10+ src = oldAttrs.src.override {

11+ inherit version;

12+ sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb";

13+ };

14+ });

15+ };

16+ };

17+

18+in

19+

20+with py.pkgs;

21+

722buildPythonPackage rec {

823 pname = "mailman";

9− version = "3.3.4";

10− disabled = !isPy3k;

24+ version = "3.3.5";

25+ disabled = pythonOlder "3.6";

1126

1227 src = fetchPypi {

1328 inherit pname version;

14− sha256 = "01rx322b8mzcdj9xh4bjwnl0zis6n2wxd31rrij4cw3a2j03xpas";

29+ sha256 = "12mgxs1ndhdjjkydx48b95na9k9h0disfqgrr6wxx7vda6dqvcwz";

1530 };

1631

1732 propagatedBuildInputs = [

18− alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock

19− importlib-resources lazr_config passlib requests zope_configuration

20− zope_component authheaders gunicorn

33+ aiosmtpd

34+ alembic

35+ authheaders

36+ click

37+ dnspython

38+ falcon

39+ flufl_bounce

40+ flufl_i18n

41+ flufl_lock

42+ gunicorn

43+ importlib-resources

44+ lazr_config

45+ passlib

46+ requests

47+ sqlalchemy

48+ zope_component

49+ zope_configuration

2150 ];

2251

2352 patches = [

@@ -33,6 +62,9 @@ buildPythonPackage rec {

3362 ];

3463

3564 postPatch = ''

65+ substituteInPlace setup.py \

66+ --replace "alembic>=1.6.2,<1.7" "alembic>=1.6.2"

67+

3668 substituteInPlace src/mailman/config/postfix.cfg \

3769 --replace /usr/sbin/postmap ${postfix}/bin/postmap

3870 substituteInPlace src/mailman/config/schema.cfg \

@@ -48,6 +80,7 @@ buildPythonPackage rec {

4880 # 'runner' scripts.

4981 dontWrapPythonPrograms = true;

5082

83+ # requires flufl.testing, which the upstream has archived

5184 doCheck = false;

5285

5386 meta = {

pkgs/servers/mail/mailman/hyperkitty.nix+63−15

@@ -1,35 +1,83 @@

1−{ lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock

2−, robot-detection, django_extensions, rjsmin, cssmin, django-mailman3

3−, django-haystack, flufl_lock, networkx, python-dateutil, defusedxml

4−, django-paintstore, djangorestframework, django, django-q

5−, django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitLab

4+, isPy3k

6+# dependencies

7+, defusedxml

8+, django

9+, django-gravatar2

10+, django-haystack

11+, django-mailman3

12+, django-paintstore

13+, django-q

14+, django_compressor

15+, django_extensions

16+, djangorestframework

17+, flufl_lock

18+, mistune_2_0

19+, networkx

20+, psycopg2

21+, python-dateutil

22+, robot-detection

23+

24+# tests

25+, beautifulsoup4

26+, elasticsearch

27+, mock

28+, whoosh

629}:

730

831buildPythonPackage rec {

932 pname = "HyperKitty";

1033 # Note: Mailman core must be on the latest version before upgrading HyperKitty.

1134 # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309

12− version = "1.3.4";

35+ #

36+ # Update to next stable version > 1.3.4 that has fixed tests, see

37+ # https://gitlab.com/mailman/django-mailman3/-/issues/48

38+ version = "1.3.5";

1339 disabled = !isPy3k;

1440

15− src = fetchPypi {

16− inherit pname version;

17− sha256 = "1lbh8n66fp3l5s0xvmvsbfvgs3z4knx0gwf0q117n2nfkslf13zp";

41+ src = fetchFromGitLab {

42+ domain = "gitlab.com";

43+ owner = "mailman";

44+ repo = "hyperkitty";

45+ rev = version;

46+ sha256 = "0v70r0r6w0q56hk2hw1qp3ci0bwd9x8inf4gai6ybjqjfskqrxi4";

1847 };

1948

20− nativeBuildInputs = [ isort ];

49+ postPatch = ''

50+ # isort is a development dependency

51+ sed -i '/isort/d' setup.py

52+ '';

53+

2154 propagatedBuildInputs = [

22− robot-detection django_extensions rjsmin cssmin django-mailman3

23− django-haystack flufl_lock networkx python-dateutil defusedxml

24− django-paintstore djangorestframework django django-q

25− django_compressor six psycopg2 isort

55+ django

56+ django-gravatar2

57+ django-haystack

58+ django-mailman3

59+ django-q

60+ django_compressor

61+ django_extensions

62+ djangorestframework

63+ flufl_lock

64+ mistune_2_0

65+ networkx

66+ psycopg2

67+ python-dateutil

68+ robot-detection

2669 ];

2770

2871 # Some of these are optional runtime dependencies that are not

2972 # listed as dependencies in setup.py. To use these, they should be

3073 # dependencies of the Django Python environment, but not of

3174 # HyperKitty so they're not included for people who don't need them.

32− checkInputs = [ beautifulsoup4 coverage elasticsearch mock whoosh ];

75+ checkInputs = [

76+ beautifulsoup4

77+ elasticsearch

78+ mock

79+ whoosh

80+ ];

3381

3482 checkPhase = ''

3583 cd $NIX_BUILD_TOP/$sourceRoot

pkgs/servers/x11/xorg/default.nix+3−3

@@ -3087,11 +3087,11 @@ lib.makeScope newScope (self: with self; {

30873087 # THIS IS A GENERATED FILE. DO NOT EDIT!

30883088 xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt, python3 }: stdenv.mkDerivation {

30893089 pname = "xorgproto";

3090− version = "2021.4";

3090+ version = "2021.5";

30913091 builder = ./builder.sh;

30923092 src = fetchurl {

3093− url = "mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2";

3094− sha256 = "1gwz8lhvczjinndrq2jb0swfvhk7p65rprkwiqwlp132041mfl8g";

3093+ url = "mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2";

3094+ sha256 = "05d0kib351qmnlfimaznaw0220fr0ym7fx2gn9h2jqxxilxncbxa";

30953095 };

30963096 hardeningDisable = [ "bindnow" "relro" ];

30973097 nativeBuildInputs = [ pkg-config python3 ];

pkgs/servers/x11/xorg/tarballs.list+1−1

@@ -211,7 +211,7 @@ mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2

211211mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2

212212mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2

213213mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz

214−mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2

214+mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2

215215mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2

216216mirror://xorg/individual/util/imake-1.0.8.tar.bz2

217217mirror://xorg/individual/util/lndir-1.0.3.tar.bz2

pkgs/stdenv/darwin/default.nix+1−1

@@ -458,7 +458,7 @@ rec {

458458 libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff

459459 openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz

460460 findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils

461− libssh2 nghttp2 libkrb5 ninja brotli;

461+ libssh2 nghttp2 libkrb5 ninja brotli libiconv;

462462

463463 "${finalLlvmPackages}" = super."${finalLlvmPackages}" // (

464464 let

pkgs/stdenv/generic/make-derivation.nix+3

@@ -305,6 +305,9 @@ else let

305305 cpu_family = '${cpuFamily stdenv.targetPlatform}'

306306 cpu = '${stdenv.targetPlatform.parsed.cpu.name}'

307307 endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}

308+

309+ [binaries]

310+ llvm-config = 'llvm-config-native'

308311 '';

309312 in [ "--cross-file=${crossFile}" ] ++ mesonFlags;

310313 } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {

pkgs/stdenv/generic/setup.sh+11−11

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

11set -eu

22set -o pipefail

3+shopt -s inherit_errexit

45if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then

56 echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})"

@@ -409,15 +410,14 @@ findInputs() {

409410 # The current package's host and target offset together

410411 # provide a <=-preserving homomorphism from the relative

411412 # offsets to current offset

412− local -i mapOffsetResult

413413 function mapOffset() {

414414 local -r inputOffset="$1"

415+ local -n outputOffset="$2"

415416 if (( inputOffset <= 0 )); then

416− local -r outputOffset=$((inputOffset + hostOffset))

417+ outputOffset=$((inputOffset + hostOffset))

417418 else

418− local -r outputOffset=$((inputOffset - 1 + targetOffset))

419+ outputOffset=$((inputOffset - 1 + targetOffset))

419420 fi

420− mapOffsetResult="$outputOffset"

421421 }

422422

423423 # Host offset relative to that of the package whose immediate

@@ -429,16 +429,16 @@ findInputs() {

429429

430430 # Host offset relative to the package currently being

431431 # built---as absolute an offset as will be used.

432− mapOffset relHostOffset

433− local -i hostOffsetNext="$mapOffsetResult"

432+ local hostOffsetNext

433+ mapOffset "$relHostOffset" hostOffsetNext

434434

435435 # Ensure we're in bounds relative to the package currently

436436 # being built.

437− [[ "${allPlatOffsets[*]}" = *"$hostOffsetNext"* ]] || continue

437+ (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue

438438

439439 # Target offset relative to the *host* offset of the package

440440 # whose immediate dependencies we are currently exploring.

441− local -i relTargetOffset

441+ local relTargetOffset

442442 for relTargetOffset in "${allPlatOffsets[@]}"; do

443443 (( "$relHostOffset" <= "$relTargetOffset" )) || continue

444444

@@ -448,12 +448,12 @@ findInputs() {

448448

449449 # Target offset relative to the package currently being

450450 # built.

451− mapOffset relTargetOffset

452− local -i targetOffsetNext="$mapOffsetResult"

451+ local targetOffsetNext

452+ mapOffset "$relTargetOffset" targetOffsetNext

453453

454454 # Once again, ensure we're in bounds relative to the

455455 # package currently being built.

456− [[ "${allPlatOffsets[*]}" = *"$targetOffsetNext"* ]] || continue

456+ (( -1 <= hostOffsetNext && hostOffsetNext <= 1 )) || continue

457457

458458 [[ -f "$pkg/nix-support/$file" ]] || continue

459459

pkgs/stdenv/linux/default.nix+1−6

@@ -375,12 +375,7 @@ in

375375 targetPlatform = localSystem;

376376 inherit config;

377377

378− preHook = ''

379− # Make "strip" produce deterministic output, by setting

380− # timestamps etc. to a fixed value.

381− commonStripFlags="--enable-deterministic-archives"

382− ${commonPreHook}

383− '';

378+ preHook = commonPreHook;

384379

385380 initialPath =

386381 ((import ../common-path.nix) {pkgs = prevStage;});

pkgs/tools/admin/lxd/default.nix+2−10

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

11{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl

22, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr

3−, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap

3+, squashfsTools, iproute2, iptables, libcap

44, dqlite, raft-canonical, sqlite-replication, udev

55, writeShellScriptBin, apparmor-profiles, apparmor-parser

66, criu

77, bash

88, installShellFiles

9−, nftablesSupport ? false

109, nixosTests

1110}:

1211

13−let

14− networkPkgs = if nftablesSupport then

15− [ iptables-nftables-compat ]

16− else

17− [ iptables ebtables ];

18−

19−in

2012buildGoPackage rec {

2113 pname = "lxd";

2214 version = "4.19";

@@ -45,7 +37,7 @@ buildGoPackage rec {

4537 rm $out/bin/{deps,macaroon-identity,generate}

4638

4739 wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (

48− networkPkgs

40+ [ iptables ]

4941 ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ]

5042 ++ [ (writeShellScriptBin "apparmor_parser" ''

5143 exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"

pkgs/tools/audio/opl3bankeditor/common.nix−1

@@ -53,7 +53,6 @@ mkDerivation rec {

5353 mv "${binname}.app" $out/Applications/

5454

5555 install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}"

56− wrapQtApp "$out/Applications/${binname}.app/Contents/MacOS/${binname}"

5756

5857 ln -s "$out/Applications/${binname}.app/Contents/MacOS/${binname}" $out/bin/${mainProgram}

5958 '';

pkgs/tools/compression/gzip/default.nix+2−2

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

1111

1212stdenv.mkDerivation rec {

1313 pname = "gzip";

14− version = "1.10";

14+ version = "1.11";

1515

1616 src = fetchurl {

1717 url = "mirror://gnu/gzip/${pname}-${version}.tar.xz";

18− sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4";

18+ sha256 = "01vrly90rvc98af6rcmrb3gwv1l6pylasvsdka23dffwizb9b6lv";

1919 };

2020

2121 outputs = [ "out" "man" "info" ];

pkgs/tools/filesystems/android-file-transfer/default.nix−3

@@ -29,9 +29,6 @@ mkDerivation rec {

2929 postInstall = lib.optionalString stdenv.isDarwin ''

3030 mkdir $out/Applications

3131 mv $out/*.app $out/Applications

32− for f in $out/Applications/android-file-transfer.app/Contents/MacOS/*; do

33− wrapQtApp "$f"

34− done

3532 '';

3633

3734 meta = with lib; {

pkgs/tools/graphics/gnuplot/default.nix−2

@@ -58,8 +58,6 @@ in

5858 --prefix PATH : '${coreutils}/bin' \

5959 --prefix PATH : '${fontconfig.bin}/bin' \

6060 --run '. ${./set-gdfontpath-from-fontconfig.sh}'

61− '' + lib.optionalString (stdenv.isDarwin && withQt) ''

62− wrapQtApp $out/bin/gnuplot

6361 '';

6462

6563 enableParallelBuilding = true;

pkgs/tools/misc/coreutils/default.nix+15−9

@@ -22,15 +22,18 @@ with lib;

2222

2323stdenv.mkDerivation (rec {

2424 pname = "coreutils";

25− version = "8.32";

25+ version = "9.0";

2626

2727 src = fetchurl {

2828 url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";

29− sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=";

29+ sha256 = "sha256-zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84=";

3030 };

3131

32− patches = [ ./sys-getdents-undeclared.patch ]

33− ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch

32+ patches = [

33+ ./fix-chmod-exit-code.patch

34+ # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433

35+ ./disable-seek-hole.patch

36+ ] ++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch

3437 # fix gnulib tests on 32-bit ARM. Included on coreutils master.

3538 # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html

3639 ++ optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;

@@ -74,23 +77,26 @@ stdenv.mkDerivation (rec {

7477 sed '2i print "Skipping id zero test"; exit 77' -i ./tests/id/zero.sh

7578 sed '2i print "Skipping misc help-versiob test"; exit 77' -i ./tests/misc/help-version.sh

7679 sed '2i print "Skipping chown separator test"; exit 77' -i ./tests/chown/separator.sh

77− '' + optionalString (stdenv.hostPlatform.libc == "musl") (lib.concatStringsSep "\n" [

80+ '' + (optionalString (stdenv.hostPlatform.libc == "musl") (lib.concatStringsSep "\n" [

7881 ''

7982 echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c

8083 echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c

8184 ''

82− ]);

85+ ])) + (optionalString stdenv.isAarch64 ''

86+ sed '2i print "Skipping tail assert test"; exit 77' -i ./tests/tail-2/assert.sh

87+ '');

8388

8489 outputs = [ "out" "info" ];

8590

86− nativeBuildInputs = [ perl xz.bin ]

87− ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ]; # due to patch

91+ nativeBuildInputs = [ perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin

92+ ++ optionals stdenv.hostPlatform.isCygwin [ texinfo ]; # due to patch

8893 configureFlags = [ "--with-packager=https://NixOS.org" ]

8994 ++ optional (singleBinary != false)

9095 ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")

9196 ++ optional withOpenssl "--with-openssl"

9297 ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no"

9398 ++ optional withPrefix "--program-prefix=g"

99+ ++ optional stdenv.isDarwin "--disable-nls" # the shipped configure script doesn't enable nls, but using autoreconfHook does so which breaks the build

94100 ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "glibc") [

95101 # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I

96102 # don't know why it is not properly detected cross building with glibc.

@@ -152,7 +158,7 @@ stdenv.mkDerivation (rec {

152158 license = licenses.gpl3Plus;

153159 platforms = platforms.unix ++ platforms.windows;

154160 priority = 10;

155− maintainers = [ maintainers.eelco ];

161+ maintainers = [ maintainers.eelco maintainers.das_j ];

156162 };

157163} // optionalAttrs stdenv.hostPlatform.isMusl {

158164 # Work around a bogus warning in conjunction with musl.

pkgs/tools/misc/coreutils/disable-seek-hole.patchnew file+43

@@ -0,0 +1,43 @@

1+diff --git a/src/copy.c b/src/copy.c

2+index cb9018f93..2a4ccc061 100644

3+--- a/src/copy.c

4++++ b/src/copy.c

5+@@ -502,7 +502,7 @@ write_zeros (int fd, off_t n_bytes)

6+ return true;

7+ }

9+-#ifdef SEEK_HOLE

10++#if 0

11+ /* Perform an efficient extent copy, if possible. This avoids

12+ the overhead of detecting holes in hole-introducing/preserving

13+ copy, and thus makes copying sparse files much more efficient.

14+@@ -1095,7 +1095,7 @@ infer_scantype (int fd, struct stat const *sb,

15+ && ST_NBLOCKS (*sb) < sb->st_size / ST_NBLOCKSIZE))

16+ return PLAIN_SCANTYPE;

17+

18+-#ifdef SEEK_HOLE

19++#if 0

20+ scan_inference->ext_start = lseek (fd, 0, SEEK_DATA);

21+ if (0 <= scan_inference->ext_start)

22+ return LSEEK_SCANTYPE;

23+@@ -1377,7 +1377,7 @@ copy_reg (char const *src_name, char const *dst_name,

24+ off_t n_read;

25+ bool wrote_hole_at_eof = false;

26+ if (! (

27+-#ifdef SEEK_HOLE

28++#if 0

29+ scantype == LSEEK_SCANTYPE

30+ ? lseek_copy (source_desc, dest_desc, buf, buf_size, hole_size,

31+ scan_inference.ext_start, src_open_sb.st_size,

32+diff --git a/tests/seek-data-capable b/tests/seek-data-capable

33+index cc6372214..6e7a9ec1e 100644

34+--- a/tests/seek-data-capable

35++++ b/tests/seek-data-capable

36+@@ -1,5 +1,7 @@

37+ import sys, os, errno, platform

38+

39++sys.exit(1)

40++

41+ # Pass an _empty_ file

42+ if len(sys.argv) != 2:

43+ sys.exit(1)

pkgs/tools/misc/coreutils/fix-chmod-exit-code.patchnew file+108

@@ -0,0 +1,108 @@

1+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001

2+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>

3+Date: Fri, 24 Sep 2021 20:57:41 +0100

4+Subject: [PATCH] chmod: fix exit status when ignoring symlinks

6+* src/chmod.c: Reorder enum so CH_NOT_APPLIED

7+can be treated as a non error.

8+* tests/chmod/ignore-symlink.sh: A new test.

9+* tests/local.mk: Reference the new test.

10+* NEWS: Mention the bug fix.

11+Fixes https://bugs.gnu.org/50784

12+---

13+ NEWS | 6 ++++++

14+ src/chmod.c | 4 ++--

15+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++

16+ tests/local.mk | 1 +

17+ 4 files changed, 40 insertions(+), 2 deletions(-)

18+ create mode 100755 tests/chmod/ignore-symlink.sh

19+

20+diff --git a/NEWS b/NEWS

21+index a1470a7d7..1cb3c28a1 100644

22+--- a/NEWS

23++++ b/NEWS

24+@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-

25+

26+ * Noteworthy changes in release ?.? (????-??-??) [?]

27+

28++** Bug fixes

29++

30++ chmod -R no longer exits with error status when encountering symlinks.

31++ All files would be processed correctly, but the exit status was incorrect.

32++ [bug introduced in coreutils-9.0]

33++

34+

35+ * Noteworthy changes in release 9.0 (2021-09-24) [stable]

36+

37+diff --git a/src/chmod.c b/src/chmod.c

38+index 37b04f500..57ac47f33 100644

39+--- a/src/chmod.c

40++++ b/src/chmod.c

41+@@ -44,8 +44,8 @@ struct change_status

42+ enum

43+ {

44+ CH_NO_STAT,

45+- CH_NOT_APPLIED,

46+ CH_FAILED,

47++ CH_NOT_APPLIED,

48+ CH_NO_CHANGE_REQUESTED,

49+ CH_SUCCEEDED

50+ }

51+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)

52+ if ( ! recurse)

53+ fts_set (fts, ent, FTS_SKIP);

54+

55+- return CH_NO_CHANGE_REQUESTED <= ch.status;

56++ return CH_NOT_APPLIED <= ch.status;

57+ }

58+

59+ /* Recursively change the modes of the specified FILES (the last entry

60+diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh

61+new file mode 100755

62+index 000000000..5ce3de816

63+--- /dev/null

64++++ b/tests/chmod/ignore-symlink.sh

65+@@ -0,0 +1,31 @@

66++#!/bin/sh

67++# Test for proper exit code of chmod on a processed symlink.

68++

70++

71++# This program is free software: you can redistribute it and/or modify

72++# it under the terms of the GNU General Public License as published by

73++# the Free Software Foundation, either version 3 of the License, or

74++# (at your option) any later version.

75++

76++# This program is distributed in the hope that it will be useful,

77++# but WITHOUT ANY WARRANTY; without even the implied warranty of

78++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

79++# GNU General Public License for more details.

80++

81++# You should have received a copy of the GNU General Public License

82++# along with this program. If not, see <https://www.gnu.org/licenses/>.

83++

84++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src

85++print_ver_ chmod

86++

87++mkdir dir || framework_failure_

88++touch dir/f || framework_failure_

89++ln -s f dir/l || framework_failure_

90++

91++# This operation ignores symlinks but should succeed.

92++chmod u+w -R dir 2> out || fail=1

93++

94++compare /dev/null out || fail=1

95++

96++Exit $fail

97+diff --git a/tests/local.mk b/tests/local.mk

98+index 228d0e368..b5b893fb7 100644

99+--- a/tests/local.mk

100++++ b/tests/local.mk

101+@@ -456,6 +456,7 @@ all_tests = \

102+ tests/chmod/c-option.sh \

103+ tests/chmod/equal-x.sh \

104+ tests/chmod/equals.sh \

105++ tests/chmod/ignore-symlink.sh \

106+ tests/chmod/inaccessible.sh \

107+ tests/chmod/octal.sh \

108+ tests/chmod/setgid.sh \

pkgs/tools/misc/coreutils/sys-getdents-undeclared.patchdeleted−100

@@ -1,100 +0,0 @@

1−From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001

2−From: Paul Eggert <eggert@cs.ucla.edu>

3−Date: Thu, 5 Mar 2020 17:25:29 -0800

4−Subject: ls: restore 8.31 behavior on removed directories

5−

6−* NEWS: Mention this.

7−* src/ls.c: Do not include <sys/sycall.h>

8−(print_dir): Don't worry about whether the directory is removed.

9−* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)

10−behavior.

11−---

12− NEWS (removed diff in nixpkgs)| 6 ++++++

13− src/ls.c | 22 ----------------------

14− tests/ls/removed-directory.sh | 10 ++--------

15− 3 files changed, 8 insertions(+), 30 deletions(-)

16−

17−diff --git a/src/ls.c b/src/ls.c

18−index 24b983287..4acf5f44d 100644

19−--- a/src/ls.c

20−+++ b/src/ls.c

21−@@ -49,10 +49,6 @@

22− # include <sys/ptem.h>

23− #endif

24−

25−-#ifdef __linux__

26−-# include <sys/syscall.h>

27−-#endif

28−-

29− #include <stdio.h>

30− #include <assert.h>

31− #include <setjmp.h>

32−@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)

33− struct dirent *next;

34− uintmax_t total_blocks = 0;

35− static bool first = true;

36−- bool found_any_entries = false;

37−

38− errno = 0;

39− dirp = opendir (name);

40−@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)

41− next = readdir (dirp);

42− if (next)

43− {

44−- found_any_entries = true;

45− if (! file_ignored (next->d_name))

46− {

47− enum filetype type = unknown;

48−@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)

49− if (errno != EOVERFLOW)

50− break;

51− }

52−-#ifdef __linux__

53−- else if (! found_any_entries)

54−- {

55−- /* If readdir finds no directory entries at all, not even "." or

56−- "..", then double check that the directory exists. */

57−- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1

58−- && errno != EINVAL)

59−- {

60−- /* We exclude EINVAL as that pertains to buffer handling,

61−- and we've passed NULL as the buffer for simplicity.

62−- ENOENT is returned if appropriate before buffer handling. */

63−- file_failure (command_line_arg, _("reading directory %s"), name);

64−- }

65−- break;

66−- }

67−-#endif

68− else

69− break;

70−

71−diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh

72−index e8c835dab..fe8f929a1 100755

73−--- a/tests/ls/removed-directory.sh

74−+++ b/tests/ls/removed-directory.sh

75−@@ -26,20 +26,14 @@ case $host_triplet in

76− *) skip_ 'non linux kernel' ;;

77− esac

78−

79−-LS_FAILURE=2

80−-

81−-cat <<\EOF >exp-err || framework_failure_

82−-ls: reading directory '.': No such file or directory

83−-EOF

84−-

85− cwd=$(pwd)

86− mkdir d || framework_failure_

87− cd d || framework_failure_

88− rmdir ../d || framework_failure_

89−

90−-returns_ $LS_FAILURE ls >../out 2>../err || fail=1

91−+ls >../out 2>../err || fail=1

92− cd "$cwd" || framework_failure_

93− compare /dev/null out || fail=1

94−-compare exp-err err || fail=1

95−+compare /dev/null err || fail=1

96−

97− Exit $fail

98−--

99−cgit v1.2.1

100−

pkgs/tools/networking/curl/CVE-2021-22945.patchnew file+27

@@ -0,0 +1,27 @@

1+From 43157490a5054bd24256fe12876931e8abc9df49 Mon Sep 17 00:00:00 2001

2+From: z2_ on hackerone <>

3+Date: Tue, 24 Aug 2021 09:50:33 +0200

4+Subject: [PATCH] mqtt: clear the leftovers pointer when sending succeeds

6+CVE-2021-22945

8+Bug: https://curl.se/docs/CVE-2021-22945.html

9+---

10+ lib/mqtt.c | 4 ++++

11+ 1 file changed, 4 insertions(+)

12+

13+diff --git a/lib/mqtt.c b/lib/mqtt.c

14+index f077e6c3dc44..fcd40b41e600 100644

15+--- a/lib/mqtt.c

16++++ b/lib/mqtt.c

17+@@ -128,6 +128,10 @@ static CURLcode mqtt_send(struct Curl_easy *data,

18+ mq->sendleftovers = sendleftovers;

19+ mq->nsend = nsend;

20+ }

21++ else {

22++ mq->sendleftovers = NULL;

23++ mq->nsend = 0;

24++ }

25+ return result;

26+ }

27+

pkgs/tools/networking/curl/default.nix+1

@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {

5757 ./CVE-2021-22897.patch

5858 ./CVE-2021-22898.patch

5959 ./CVE-2021-22901.patch

60+ ./CVE-2021-22945.patch

6061 ];

6162

6263 outputs = [ "bin" "dev" "out" "man" "devdoc" ];

pkgs/tools/networking/ferm/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }:

1+{ lib, stdenv, fetchurl, makeWrapper, perl, iptables, nixosTests }:

33let

44 inherit (lib.versions) majorMinor;

@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {

2323 postInstall = ''

2424 rm -r $out/lib/systemd

2525 for i in "$out/sbin/"*; do

26− wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ipset ebtables ]}"

26+ wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ]}"

2727 done

2828 '';

2929

pkgs/tools/networking/modemmanager/default.nix+2−2

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

66stdenv.mkDerivation rec {

77 pname = "modemmanager";

8− version = "1.16.10";

8+ version = "1.18.2";

1010 src = fetchurl {

1111 url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz";

12− sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4=";

12+ sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o=";

1313 };

1414

1515 nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];

pkgs/tools/networking/networkmanager/default.nix+2−2

@@ -54,11 +54,11 @@ let

5454in

5555stdenv.mkDerivation rec {

5656 pname = "networkmanager";

57− version = "1.32.10";

57+ version = "1.32.12";

5858

5959 src = fetchurl {

6060 url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";

61− sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g=";

61+ sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us=";

6262 };

6363

6464 outputs = [ "out" "dev" "devdoc" "man" "doc" ];

pkgs/tools/networking/openssh/common.nix+1−1

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

122122 changelog = "https://www.openssh.com/releasenotes.html";

123123 license = licenses.bsd2;

124124 platforms = platforms.unix ++ platforms.windows;

125− maintainers = with maintainers; [ eelco aneeshusa ];

125+ maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ eelco aneeshusa ]);

126126 mainProgram = "ssh";

127127 } // extraMeta;

128128}

pkgs/tools/networking/openssh/default.nix+4−3

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

1−{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:

1+{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }:

22let

33 common = opts: callPackage (import ./common.nix opts) { };

44in

@@ -6,14 +6,15 @@ in

77 openssh = common rec {

88 pname = "openssh";

9− version = "8.7p1";

9+ version = "8.8p1";

1010

1111 src = fetchurl {

1212 url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";

13− sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw";

13+ sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425";

1414 };

1515

1616 extraPatches = [ ./ssh-keysign-8.5.patch ];

17+ extraMeta.maintainers = with lib.maintainers; [ das_j ];

1718 };

1819

1920 openssh_hpn = common rec {

pkgs/tools/networking/ppp/default.nix+10−7

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

44, substituteAll

55, libpcap

66, openssl

7+, bash

78}:

910stdenv.mkDerivation rec {

@@ -31,18 +32,22 @@ stdenv.mkDerivation rec {

3132 buildInputs = [

3233 libpcap

3334 openssl

35+ bash

3436 ];

3537

3638 postPatch = ''

37− # strip is not found when cross compiling with seemingly no way to point

38− # make to the right place, fixup phase will correctly strip

39− # everything anyway so we remove it from the Makefiles

4039 for file in $(find -name Makefile.linux); do

41− substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)'

4240 substituteInPlace "$file" --replace '-m 4550' '-m 550'

4341 done

42+

43+ patchShebangs --host \

44+ scripts/{pon,poff,plog}

4445 '';

4546

47+ makeFlags = [

48+ "CC=${stdenv.cc.targetPrefix}cc"

49+ ];

50+

4651 installPhase = ''

4752 runHook preInstall

4853 mkdir -p $out/bin

@@ -52,9 +57,7 @@ stdenv.mkDerivation rec {

5257 '';

5358

5459 postFixup = ''

55− for tgt in pon poff plog; do

56− substituteInPlace "$out/bin/$tgt" --replace "/usr/sbin" "$out/bin"

57− done

60+ substituteInPlace "$out/bin/pon" --replace "/usr/sbin" "$out/bin"

5861 '';

5962

6063 meta = with lib; {

pkgs/tools/networking/shorewall/default.nix−6

@@ -1,10 +1,8 @@

11{ coreutils

2−, ebtables

32, fetchurl

43, gnugrep

54, gnused

65, iproute2

7−, ipset

86, iptables

97, perl

108, perlPackages

@@ -17,8 +15,6 @@ let

1715 [ "${coreutils}/bin"

1816 "${iproute2}/bin"

1917 "${iptables}/bin"

20− "${ipset}/bin"

21− "${ebtables}/bin"

2218 "${util-linux}/bin"

2319 "${gnugrep}/bin"

2420 "${gnused}/bin"

@@ -47,9 +43,7 @@ stdenv.mkDerivation rec {

4743 buildInputs = [

4844 coreutils

4945 iproute2

50− ipset

5146 iptables

52− ebtables

5347 util-linux

5448 gnugrep

5549 gnused

pkgs/tools/text/glogg/default.nix−1

@@ -25,7 +25,6 @@ mkDerivation rec {

2525 mkdir -p $out/Applications

2626 mv $out/bin/glogg.app $out/Applications/glogg.app

2727 rm -fr $out/{bin,share}

28− wrapQtApp $out/Applications/glogg.app/Contents/MacOS/glogg

2928 '';

3029

3130 meta = with lib; {

pkgs/tools/text/gnugrep/default.nix+2−2

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

55# cgit) that are needed here should be included directly in Nixpkgs as

66# files.

8−let version = "3.6"; in

8+let version = "3.7"; in

1010stdenv.mkDerivation {

1111 pname = "gnugrep";

@@ -13,7 +13,7 @@ stdenv.mkDerivation {

1313

1414 src = fetchurl {

1515 url = "mirror://gnu/grep/grep-${version}.tar.xz";

16− sha256 = "0gipv6bzkm1aihj0ncqpyh164xrzgcxcv9r1kwzyk2g1mzl1azk6";

16+ sha256 = "0g42svbc1nq5bamxfj6x7320wli4dlj86padk0hwgbk04hqxl42w";

1717 };

1818

1919 # Perl is needed for testing

pkgs/tools/text/source-highlight/default.nix+6−3

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

44 pname = "source-highlight";

55 version = "3.1.9";

7+ outputs = [ "out" "doc" "dev" ];

79 src = fetchurl {

810 url = "mirror://gnu/src-highlite/${pname}-${version}.tar.gz";

911 sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs";

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

2830 strictDeps = true;

2931 buildInputs = [ boost ];

3032

31− configureFlags = [ "--with-boost=${boost.out}" ];

33+ configureFlags = [

34+ "--with-boost=${boost.out}"

35+ "--with-bash-completion=${placeholder "out"}/share/bash_completion.d"

36+ ];

3237

3338 doCheck = !stdenv.cc.isClang;

3439

@@ -37,8 +42,6 @@ stdenv.mkDerivation rec {

3742 # them in parallel by make will eventually break one or more tests.

3843 enableParallelChecking = false;

3944

40− outputs = [ "out" "doc" "dev" ];

41−

4245 meta = with lib; {

4346 description = "Source code renderer with syntax highlighting";

4447 longDescription = ''

pkgs/tools/typesetting/tex/texlive/combine.nix+4−4

@@ -33,9 +33,9 @@ let

3333 ++ lib.optional (lib.any pkgNeedsRuby splitBin.wrong) ruby;

3434 };

3535

36− uniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list);

36+ sortedUniqueStrings = list: lib.sort (a: b: a < b) (lib.unique list);

3737

38− mkUniqueOutPaths = pkgs: uniqueStrings

38+ mkUniqueOutPaths = pkgs: lib.unique

3939 (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));

4040

4141in (buildEnv {

@@ -124,9 +124,9 @@ in (buildEnv {

124124 # now filter hyphenation patterns and formats

125125 (let

126126 hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong;

127− hyphenPNames = uniqueStrings (map (p: p.pname) hyphens);

127+ hyphenPNames = sortedUniqueStrings (map (p: p.pname) hyphens);

128128 formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong;

129− formatPNames = uniqueStrings (map (p: p.pname) formats);

129+ formatPNames = sortedUniqueStrings (map (p: p.pname) formats);

130130 # sed expression that prints the lines in /start/,/end/ except for /end/

131131 section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n";

132132 script =

pkgs/tools/video/rav1e/default.nix+6−22

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

1−{ stdenv, rustPlatform, rust, fetchurl, fetchFromGitHub, lib, nasm, cargo-c, libiconv }:

1+{ lib, rust, stdenv, rustPlatform, fetchCrate, nasm, cargo-c, libiconv }:

33let

44 rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform;

@@ -6,29 +6,13 @@ in rustPlatform.buildRustPackage rec {

66 pname = "rav1e";

77 version = "0.4.1";

9− src = stdenv.mkDerivation rec {

10− name = "${pname}-${version}-source";

11−

12− src = fetchFromGitHub {

13− owner = "xiph";

14− repo = "rav1e";

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

16− sha256 = "0jnq5a3fv6fzzbmprzfxidlcwwgblkwwm0135cfw741wjv7f7h6r";

17− };

18−

19− cargoLock = fetchurl {

20− url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";

21− sha256 = "14fi9wam9rs5206rvcd2f3sjpzq41pnfml14w74wn2ws3gpi46zn";

22− };

23−

24− installPhase = ''

25− mkdir -p $out

26− cp -r ./* $out/

27− cp ${cargoLock} $out/Cargo.lock

28− '';

9+ src = fetchCrate {

10+ inherit pname version;

11+ sha256 = "sha256-9fBAH1vuLJ3yu8X5+CQGLQFDlzTYoFBUTy3Muo6hLkw=";

2912 };

3013

31− cargoSha256 = "0miq6iiywwbxm6k0alnqg6bnd14pwc8vl9d8fgg6c0vjlfy5zhlb";

14+ cargoSha256 = "sha256-QhWVqHcNjJF94uTvHGVnV8MTp2bYOuCEjaMBfViOLRo=";

15+

3216 nativeBuildInputs = [ nasm cargo-c ];

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

3418

pkgs/top-level/all-packages.nix+16−22

@@ -315,6 +315,8 @@ with pkgs;

315315

316316 html5validator = python3Packages.callPackage ../applications/misc/html5validator { };

317317

318+ buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;

319+

318320 probe-run = callPackage ../development/tools/rust/probe-run {

319321 inherit (darwin.apple_sdk.frameworks) AppKit IOKit;

320322 };

@@ -4241,7 +4243,7 @@ with pkgs;

42414243

42424244 cpcfs = callPackage ../tools/filesystems/cpcfs { };

42434245

4244− coreutils = callPackage ../tools/misc/coreutils { };

4246+ coreutils = callPackage ../tools/misc/coreutils { };

42454247 coreutils-full = coreutils.override { minimal = false; };

42464248 coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };

42474249

@@ -8735,7 +8737,7 @@ with pkgs;

87358737

87368738 pycangjie = pythonPackages.pycangjie;

87378739

8738− pycflow2dot = with python.pkgs; toPythonApplication pycflow2dot;

8740+ pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;

87398741

87408742 pydb = callPackage ../development/tools/pydb { };

87418743

@@ -13431,12 +13433,6 @@ with pkgs;

1343113433 bluezSupport = true;

1343213434 x11Support = true;

1343313435 };

13434− python36Full = python36.override {

13435− self = python36Full;

13436− pythonAttr = "python36Full";

13437− bluezSupport = true;

13438− x11Support = true;

13439− };

1344013436 python37Full = python37.override {

1344113437 self = python37Full;

1344213438 pythonAttr = "python37Full";

@@ -13462,11 +13458,10 @@ with pkgs;

1346213458 python3Packages = python3.pkgs;

1346313459

1346413460 pythonInterpreters = callPackage ./../development/interpreters/python { };

13465− inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy37;

13461+ inherit (pythonInterpreters) python27 python37 python38 python39 python310 python3Minimal pypy27 pypy37;

1346613462

1346713463 # Python package sets.

1346813464 python27Packages = python27.pkgs;

13469− python36Packages = python36.pkgs;

1347013465 python37Packages = python37.pkgs;

1347113466 python38Packages = recurseIntoAttrs python38.pkgs;

1347213467 python39Packages = recurseIntoAttrs python39.pkgs;

@@ -13667,7 +13662,9 @@ with pkgs;

1366713662 # Needed for autogen

1366813663 guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };

1366913664

13670− guile_2_2 = callPackage ../development/interpreters/guile { };

13665+ guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { };

13666+

13667+ guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };

1367113668

1367213669 guile = guile_2_2;

1367313670

@@ -15644,7 +15641,6 @@ with pkgs;

1564415641 bobcat = callPackage ../development/libraries/bobcat { };

1564515642

1564615643 boehmgc = callPackage ../development/libraries/boehm-gc { };

15647− boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { };

1564815644

1564915645 boolstuff = callPackage ../development/libraries/boolstuff { };

1565015646

@@ -18329,6 +18325,7 @@ with pkgs;

1832918325

1833018326 libxml2 = callPackage ../development/libraries/libxml2 {

1833118327 python = python3;

18328+ inherit (darwin) libiconv;

1833218329 };

1833318330

1833418331 libxml2Python = let

@@ -20507,9 +20504,7 @@ with pkgs;

2050720504

2050820505 dex2jar = callPackage ../development/tools/java/dex2jar { };

2050920506

20510− doh-proxy = callPackage ../servers/dns/doh-proxy {

20511− python3Packages = python36Packages;

20512− };

20507+ doh-proxy = callPackage ../servers/dns/doh-proxy { };

2051320508

2051420509 doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust {

2051520510 inherit (darwin.apple_sdk.frameworks) Security;

@@ -21878,9 +21873,9 @@ with pkgs;

2187821873 iputils = hiPrio (callPackage ../os-specific/linux/iputils { });

2187921874 # hiPrio for collisions with inetutils (ping and tftpd.8.gz)

2188021875

21881− iptables = iptables-legacy;

21882− iptables-legacy = callPackage ../os-specific/linux/iptables { };

21883− iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; };

21876+ iptables = callPackage ../os-specific/linux/iptables { };

21877+ iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; };

21878+ iptables-nftables-compat = iptables;

2188421879

2188521880 iptstate = callPackage ../os-specific/linux/iptstate { } ;

2188621881

@@ -22673,9 +22668,8 @@ with pkgs;

2267322668 util-linuxCurses = util-linux;

2267422669

2267522670 util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override {

22676− minimal = true;

22671+ nlsSupport = false;

2267722672 ncurses = null;

22678− perl = null;

2267922673 systemd = null;

2268022674 }) else util-linux;

2268122675

@@ -31620,9 +31614,9 @@ with pkgs;

3162031614 } // (config.caffe or {}));

3162131615

3162231616 caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {

31623− inherit (python36Packages) python future six numpy pydot;

31617+ inherit (python3Packages) python future six numpy pydot;

3162431618 protobuf = protobuf3_1;

31625− python-protobuf = python36Packages.protobuf.override { inherit protobuf; };

31619+ python-protobuf = python3Packages.protobuf.override { inherit protobuf; };

3162631620 opencv3 = opencv3WithoutCuda; # Used only for image loading.

3162731621 });

3162831622

pkgs/top-level/python-packages.nix+2

@@ -1320,6 +1320,8 @@ in {

13201320

13211321 build = callPackage ../development/python-modules/build { };

13221322

1323+ buildcatrust = callPackage ../development/python-modules/buildcatrust { };

1324+

13231325 bumps = callPackage ../development/python-modules/bumps { };

13241326

13251327 bunch = callPackage ../development/python-modules/bunch { };

pkgs/top-level/release-python.nix+4−1

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

44*/

66{ # The platforms for which we build Nixpkgs.

7− supportedSystems ? [ "x86_64-linux" ]

7+ supportedSystems ? [

8+ "aarch64-linux"

9+ "x86_64-linux"

10+ ]

811, # Attributes passed to nixpkgs. Don't build packages marked as unfree.

912 nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }

1013}: