From 7d1458b6b6385d0e29a911622a41e17ea514b1cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 00:16:08 +0000 Subject: [PATCH 01/26] batsignal: 1.3.5 -> 1.5.0 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index c998309bdd33..f7e0597e0705 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.3.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI="; + sha256 = "sha256-gZMGbw7Ij1IVQSWOqG/91YrbWTG3I3l6Yp11QbVCfyY="; }; buildInputs = [ libnotify glib ]; From a746fa431d4a5c81caeaac30cbc7bd250c33365a Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 21 Jun 2022 18:39:24 +0200 Subject: [PATCH 02/26] kicad: 6.0.5 -> 6.0.6 --- .../science/electronics/kicad/versions.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 658223dc4ec6..2c33f5740b09 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "6.0.5"; + version = "6.0.6"; src = { - rev = "a6ca702e916df70e499615d8613102e780e96a40"; - sha256 = "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23"; + rev = "3a73a7531170b37afa1eb22d5924ef8af7f9e71e"; + sha256 = "0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j"; }; }; libVersion = { - version = "6.0.5"; + version = "6.0.6"; libSources = { - symbols.rev = "c7f82c947ab3a1afec8d7b602ee7c6bfdfb24693"; - symbols.sha256 = "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5"; - templates.rev = "5ec65bfd3ecefaf85f79db02981f0568fe8b0eb8"; - templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "35e3d08f1ab23b5b08ba903572776aab6de7499f"; - footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; - packages3d.rev = "6ea94caf40c4bdccecb569e81ed82b902d4c104e"; - packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; + symbols.rev = "3df4c49795a65a051fafb1cf81d291be4c891f62"; + symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; + templates.rev = "17aca4385144bf872e69f41bf5012fd2018cec2c"; + templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; + footprints.rev = "64bae4c4a0d51afbc8129682ef0c2bf28b005c04"; + footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; + packages3d.rev = "6cb25bc10f8c94fbf71479fe9782aecfcc9952bd"; + packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; }; }; }; From 6a66c0822235c02da517ad849c9627e52d8fb3b8 Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 29 May 2022 00:35:29 +0200 Subject: [PATCH 03/26] kicad-unstable: 2022-05-06 -> 2022-06-21 contains fix for upstream issue 9888 (intermittent test failure) --- .../science/electronics/kicad/base.nix | 5 ++-- .../science/electronics/kicad/versions.nix | 24 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 961519bad19b..0fbd824008a5 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -157,9 +157,8 @@ stdenv.mkDerivation rec { ; # debug builds fail all but the python test - #doInstallCheck = !debug; - # temporarily disabled until upstream issue 9888 is resolved - doInstallCheck = false; + # stable release doesn't have the fix for upstream issue 9888 yet + doInstallCheck = !debug && !stable; installCheckTarget = "test"; dontStrip = debug; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 658223dc4ec6..1d93aaa74c0e 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2022-05-06"; + version = "2022-06-21"; src = { - rev = "dfdedfa605f58711d286d6e24e4ae9b5f75444e6"; - sha256 = "1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2"; + rev = "b54bb909755d39dcce38ef277c715d7f31ab8e00"; + sha256 = "0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48"; }; }; libVersion = { - version = "2022-05-06"; + version = "2022-06-21"; libSources = { - symbols.rev = "e1d70243a68a721a9f94a7df1d04c9c6ebc056ef"; - symbols.sha256 = "0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8"; - templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; - templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9"; - footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; - packages3d.rev = "ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e"; - packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; + symbols.rev = "a003b00f6f1056d726e32e911cd65b32946f5503"; + symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; + templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; + templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; + footprints.rev = "5df530ec44892407d6382d933ff9ad42dd19df0e"; + footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; + packages3d.rev = "6bfd8dfa3adc6ac316b9857977c87f22282c6e24"; + packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; }; }; }; From 6cc57b007b346146471df8396465264bb6c85c10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 03:35:40 +0000 Subject: [PATCH 04/26] birdfont: 2.30.0 -> 2.32.0 --- pkgs/tools/misc/birdfont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 3ee53c0f5929..763067a2687d 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.30.0"; + version = "2.32.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-aIhJXmzLY2Sw9mFe2AmLkXb+YRnFu1pMnFeDF+zfHRE="; + sha256 = "sha256-OnbLDKBxk1IGZZlSM/zK6xus6zmzV7OygfvHFBujHUk="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; From 8d048edb7c93b148c37b279aae449747ba2ecd0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 14:53:56 +0000 Subject: [PATCH 05/26] pony-corral: 0.5.7 -> 0.6.0 --- pkgs/development/compilers/ponyc/pony-corral.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index c0ff37e7bd5e..ab7bf63006a2 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "sha256-OLA09C/6s2PyzreBvqFfzsoRDXiRMbdf3Jgnmawr7k4="; + sha256 = "sha256-8hSs1pllAips27Lut1GbSn3E9lbp4BT1L2AlkyDd46o="; }; buildInputs = [ ponyc ]; From d18aeb6351482911fc63cb086ca49d20acabc4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 26 Jun 2022 13:54:59 -0300 Subject: [PATCH 06/26] nixos/xfconf: init - Add a module for xfconf, the Xfce configuration storage system. --- .../from_md/release-notes/rl-2211.section.xml | 7 +++++ .../manual/release-notes/rl-2211.section.md | 2 ++ nixos/modules/module-list.nix | 1 + nixos/modules/programs/thunar.nix | 3 ++- nixos/modules/programs/xfconf.nix | 27 +++++++++++++++++++ .../services/x11/desktop-managers/xfce.nix | 5 ++-- 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/programs/xfconf.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index f29f30660be3..6f5451f89b1a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -319,6 +319,13 @@ release it may be removed. + + + There is a new module for the xfconf + program (the Xfce configuration storage system), which has a + dbus service. + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 89a59edee798..0a92780d9ce4 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -118,4 +118,6 @@ Use `configure.packages` instead. - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. +- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b757e05edce3..251b4b31961c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -230,6 +230,7 @@ ./programs/weylus.nix ./programs/wireshark.nix ./programs/wshowkeys.nix + ./programs/xfconf.nix ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/xss-lock.nix diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix index 343f84698672..5ea2982dd93c 100644 --- a/nixos/modules/programs/thunar.nix +++ b/nixos/modules/programs/thunar.nix @@ -33,12 +33,13 @@ in { services.dbus.packages = [ package - pkgs.xfce.xfconf ]; systemd.packages = [ package ]; + + programs.xfconf.enable = true; } ); } diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix new file mode 100644 index 000000000000..8e854b40e513 --- /dev/null +++ b/nixos/modules/programs/xfconf.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.xfconf; + +in { + meta = { + maintainers = teams.xfce.members; + }; + + options = { + programs.xfconf = { + enable = mkEnableOption "Xfconf, the Xfce configuration storage system"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.xfce.xfconf + ]; + + services.dbus.packages = [ + pkgs.xfce.xfconf + ]; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 3c2dac386f5d..3a468b550627 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -4,10 +4,9 @@ with lib; let cfg = config.services.xserver.desktopManager.xfce; + in - { - meta = { maintainers = teams.xfce.members; }; @@ -95,7 +94,6 @@ in exo garcon libxfce4ui - xfconf mousepad parole @@ -125,6 +123,7 @@ in xfdesktop ] ++ optional cfg.enableScreensaver xfce4-screensaver; + programs.xfconf.enable = true; programs.thunar.enable = true; environment.pathsToLink = [ From e8ac7b9cc6d77519828583f9248a831c69191fb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:41:15 +0200 Subject: [PATCH 07/26] python310Packages.archinfo: 9.2.7 -> 9.2.8 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index f87c7863c264..1fb25447f445 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.7"; + version = "9.2.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-sl5qCH/biH3QBrnfZAQMWd55yKM0PGE/Rx2MscKn4Nk="; + hash = "sha256-glfvSaXlT+PuF8ztA5A6+HG9FQ6CsrOn8ZAir8+db7c="; }; checkInputs = [ From 3529b5d67d17c8510a4bfdff4a752f0273205489 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:41:22 +0200 Subject: [PATCH 08/26] python310Packages.ailment: 9.2.7 -> 9.2.8 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 0b6ba901df52..922d856010d1 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.7"; + version = "9.2.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-zQz8tbxo1Trfeg7zeW/htm+zD4n++guYXUdCHp3cikw="; + hash = "sha256-eZNIRUbwJf58DUm/D4Gtkl++z42wjY3m/4K05s2+Z9E="; }; propagatedBuildInputs = [ From ac98e19d1fb862a719f046d44800eca8c20b8a88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:41:36 +0200 Subject: [PATCH 09/26] python310Packages.pyvex: 9.2.7 -> 9.2.8 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 8710fea109f0..41d033dcd2be 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.7"; + version = "9.2.8"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-vSVkredOekqUAre38jDCE8f8OXd0cNmZ2SmpEQ7+I28="; + hash = "sha256-GHVY+V18OwlNI1aQAQCLmeh5Z9fbT5cm+bh9KAY/gkE="; }; propagatedBuildInputs = [ From 79076ad5ba57adfcc53f7395a4299710037884c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:41:43 +0200 Subject: [PATCH 10/26] python310Packages.claripy: 9.2.7 -> 9.2.8 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index efceffd786d4..494e23f09f34 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.7"; + version = "9.2.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-4t1PbxcHxiv8W/M9McaBu7CTLc74gCZ7om3K4fgpFFI="; + hash = "sha256-ScJoe0YFM5mipVt+7/hy7BI1qytrpO+qcYjY8roBMfc="; }; propagatedBuildInputs = [ From 1800632205d34f4b535a234cb5844bc257810e50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:41:49 +0200 Subject: [PATCH 11/26] python310Packages.cle: 9.2.7 -> 9.2.8 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index db926aad32b4..51166bfac0d7 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.7"; + version = "9.2.8"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-IQLtkS4LNyyEOwInd9A3pHGtj80yXARXcQKA3FonPUE="; + hash = "sha256-VwZSGWJ3XT34kkpXOiUfObGRK28nb54XZ4iskg7xetk="; }; propagatedBuildInputs = [ From 85856baed353fece78a21767dd2da33afbbb063b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 09:41:57 +0200 Subject: [PATCH 12/26] python310Packages.angr: 9.2.7 -> 9.2.8 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 72481814f9d4..335708fb8472 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.7"; + version = "9.2.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-77RLoSZnzggt8ZWQwRcvMhCYGupF2Kp+u2LFZ9ozXlw="; + hash = "sha256-H2+2OS06oeW14Zzd7Twi13XVNaE6O0TJqTnZxxCNW+U="; }; propagatedBuildInputs = [ From 3e3ee91e933dd94ab2f70aa1f9bd6a76f68ec965 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 10:07:54 +0200 Subject: [PATCH 13/26] python310Packages.pynetgear: 0.10.5 -> 0.10.6 --- pkgs/development/python-modules/pynetgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 6c5d7b7c50cd..9c1a17e340a0 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.10.5"; + version = "0.10.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eYcMS8gxJO5JXvgIcZEEei5THb+gDdmoad+/Vokis/Q="; + sha256 = "sha256-lpCBwz7B6QHLmFQwOz+QA3oJ2GOrE1Y/qjWE328vD2A="; }; propagatedBuildInputs = [ From 008ccf301f3dd2bf48fd64395f645eef448989fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 10:09:32 +0200 Subject: [PATCH 14/26] python310Packages.xknx: 0.21.4 -> 0.21.5 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 5b5de10973f5..f5fb49daabd6 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.21.4"; + version = "0.21.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eKbEeW+pa8lUbbzcvexURa6raN3HFzIWjwqE3L80KTY="; + sha256 = "sha256-rtR77b4/cgDA6rf/Q+ecuKI5bl7N4YMim8TeQ7ovKhI="; }; propagatedBuildInputs = [ From b4fe5adbddf1a2307177e14e9335283822abf0a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 10:15:37 +0200 Subject: [PATCH 15/26] python310Packages.simplisafe-python: 2022.06.0 -> 2022.06.1 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 68cfa0035c6a..07f0c1bf1e87 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.06.0"; + version = "2022.06.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-rYWtq56Gjbw5zs2ZqZkNqIP7wEzVziN3VQQfoyF5fJk="; + sha256 = "sha256-5zhj1EAFZ2XCeSfcFN+7gHrcPx/YrEZQ8QfcmLUboIg="; }; nativeBuildInputs = [ From c8941fc6c858e8f310c758e66f7a62d86ccb2fa7 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 29 Jun 2022 10:38:52 +0200 Subject: [PATCH 16/26] zotero: 6.0.8 -> 6.0.9 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b5c1467f6918..f8d94f86907b 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-S3s82F6kpjIOIqMIxlZIBT/7eNpLf6dHjOOaCYxdh6E="; + sha256 = "sha256-yzMppbvdw7ShYtWdmE5HkqutgivwuJKPkAOGq6WkyuQ="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 028af6dd4a5b08333fead4d20023aa181d8a1bb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Jun 2022 18:58:15 +0200 Subject: [PATCH 17/26] python310Packages.karton-mwdb-reporter: unstable-2022-02-22 -> 1.1.0 --- .../python-modules/karton-mwdb-reporter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index f976e3fedba3..0eae4b44213c 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "unstable-2022-02-22"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "1afa32251b4826eac4386596b4a20f295699faec"; - hash = "sha256-dbtIjWSNIRMccrGJspZMOBUD2EzuvW7xESlEwiOhKfQ="; + rev = "v${version}"; + hash = "sha256-2qG/8D6ZlUFJg+BB/QZ9ZMJpbsLei/7TRXd6bF40Fvg="; }; propagatedBuildInputs = [ From ccef4edeaf5175edb5c6a9fa3f81c7d833fb69d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jun 2022 23:16:15 +0000 Subject: [PATCH 18/26] python310Packages.sagemaker: 2.96.0 -> 2.97.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 627f2baf38e8..8c41b908c721 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.96.0"; + version = "2.97.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-40xvL7EwCDx/zsYHJhczx1MqVVrwQiDhlcv3QrEuv/E="; + hash = "sha256-iHh6WOefWmoLDzZYk1p2TtR0CAudP+paQOOj3RVFlRE="; }; propagatedBuildInputs = [ From ba533129002f7fc5974df424679c4a3a8d4d3520 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 00:11:19 +0000 Subject: [PATCH 19/26] python310Packages.sanic-testing: 22.3.0 -> 22.3.1 --- pkgs/development/python-modules/sanic-testing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 398f3dad6322..120f80b57e22 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "22.3.0"; + version = "22.3.1"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; - rev = "v${version}"; - sha256 = "sha256-ZsLQA8rP4RrbVSUy5n0WZs903fnF7jtFqrIe5JVuRIg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-6aJyc5B9e65RPG3FwXAoQByVNdrLAWTEu2/Dqf9hf+g="; }; outputs = [ From ba1db2b2055358d42ea77f74c0958e91109c8fec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 02:17:52 +0000 Subject: [PATCH 20/26] dsq: 0.20.2 -> 0.21.0 --- pkgs/tools/misc/dsq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 62a17142bde6..d9fe703f284e 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II="; + hash = "sha256-jwJw56Z/Y0vnsybE/FfXXHtz0W0J80Q5rrRRoINbjkM="; }; - vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A="; + vendorSha256 = "sha256-7KQDaDM151OFfTYRPOit4MAmwgEzvLOYFWCjXhVmFT0="; ldflags = [ "-X" "main.Version=${version}" ]; From 3e2582c14b53062bf83ef3dba8ac7374f4868cca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 02:56:11 +0000 Subject: [PATCH 21/26] fluxcd: 0.31.2 -> 0.31.3 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 1afb2b7a5e1f..7d060c546d59 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.2"; - sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir"; - manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb"; + version = "0.31.3"; + sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l"; + manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo="; + vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 2c7fcab1ce3ff2d024713498475e18d260e8f887 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jun 2022 06:16:37 +0000 Subject: [PATCH 22/26] lagrange: 1.13.6 -> 1.13.7 --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 15475eae6f60..68e1f3bc720d 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.13.6"; + version = "1.13.7"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-5EIXbdVBFkmftD8xK1VJmZH3Ul99fhFSpFLOQNqSXoU="; + sha256 = "sha256-WUNDkLKT/AgS5WkBKbVSM5/1zSjQuE8Aq68JLSOHFEs="; }; nativeBuildInputs = [ cmake pkg-config zip ]; From 7f3cdfd2ba5a05a2d413c2cd9c421a4b0a28ac94 Mon Sep 17 00:00:00 2001 From: Tero Tervala Date: Wed, 18 May 2022 16:14:01 +0300 Subject: [PATCH 23/26] dtc: fix static building --- ...-instead-of-.so-when-building-static.patch | 90 +++++++++++++++++++ pkgs/development/compilers/dtc/default.nix | 5 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch diff --git a/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch b/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch new file mode 100644 index 000000000000..dcc3a08c1eda --- /dev/null +++ b/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch @@ -0,0 +1,90 @@ +From c1d426bdd477ffeb3dfa03501de089a341b85d0b Mon Sep 17 00:00:00 2001 +From: Tero Tervala +Date: Wed, 15 Jun 2022 13:44:55 +0300 +Subject: [PATCH] Depend on .a instead of .so when building static + +Static build needs to be indicated with environment variable: +STATIC_BUILD=1 + +Checks are skipped on static builds + +Signed-off-by: Tero Tervala +--- + Makefile | 12 +++++++++--- + tests/Makefile.tests | 11 ++++++++--- + 2 files changed, 17 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index ee77115..9f550b4 100644 +--- a/Makefile ++++ b/Makefile +@@ -198,6 +198,12 @@ LIBFDT_lib = $(LIBFDT_dir)/$(LIBFDT_LIB) + LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES)) + LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION)) + ++ifeq ($(STATIC_BUILD),1) ++ LIBFDT_dep = $(LIBFDT_archive) ++else ++ LIBFDT_dep = $(LIBFDT_lib) ++endif ++ + include $(LIBFDT_dir)/Makefile.libfdt + + .PHONY: libfdt +@@ -261,11 +267,11 @@ convert-dtsv0: $(CONVERT_OBJS) + + fdtdump: $(FDTDUMP_OBJS) + +-fdtget: $(FDTGET_OBJS) $(LIBFDT_lib) ++fdtget: $(FDTGET_OBJS) $(LIBFDT_dep) + +-fdtput: $(FDTPUT_OBJS) $(LIBFDT_lib) ++fdtput: $(FDTPUT_OBJS) $(LIBFDT_dep) + +-fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_lib) ++fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_dep) + + dist: + git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \ +diff --git a/tests/Makefile.tests b/tests/Makefile.tests +index 2f78952..f13b16d 100644 +--- a/tests/Makefile.tests ++++ b/tests/Makefile.tests +@@ -60,17 +60,17 @@ TESTS_CLEANDIRS = $(TESTS_CLEANDIRS_L:%=$(TESTS_PREFIX)%) + .PHONY: tests + tests: $(TESTS) $(TESTS_TREES) + +-$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib) ++$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep) + + # Not necessary on all platforms; allow -ldl to be excluded instead of forcing + # other platforms to patch it out. + LIBDL = -ldl +-$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib) ++$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep) + @$(VECHO) LD [libdl] $@ + $(LINK.c) -o $@ $^ $(LIBDL) + + $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ +- util.o $(LIBFDT_lib) ++ util.o $(LIBFDT_dep) + + $(TESTS_PREFIX)dumptrees: $(TESTS_PREFIX)trees.o + +@@ -83,8 +83,13 @@ tests_clean: + rm -f $(TESTS_CLEANFILES) + rm -rf $(TESTS_CLEANDIRS) + ++ifeq ($(STATIC_BUILD),1) ++check: ++ @echo Skipping checks for static build ++else + check: tests ${TESTS_BIN} $(TESTS_PYLIBFDT) + cd $(TESTS_PREFIX); ./run_tests.sh ++endif + + ifeq ($(NO_VALGRIND),1) + checkm: +-- +2.33.3 + diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 78290cfc4231..d3edb3936d6f 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { # based on without requiring the setup.py rework # https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=383e148b70a47ab15f97a19bb999d54f9c3e810f ./python-3.10.patch + + # fix dtc static building + ./0001-Depend-on-.a-instead-of-.so-when-building-static.patch ]; nativeBuildInputs = [ flex bison pkg-config which ] @@ -38,7 +41,7 @@ stdenv.mkDerivation rec { patchShebangs pylibfdt/ ''; - makeFlags = [ "PYTHON=python" ]; + makeFlags = [ "PYTHON=python" "STATIC_BUILD=${toString stdenv.hostPlatform.isStatic}" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; # Checks are broken on aarch64 darwin From a1aed2a716ff3471f91f0ba57f551335202df98b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 29 Jun 2022 18:30:10 +0200 Subject: [PATCH 24/26] builders/writeHaskell: build with threaded GHC runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some haskell code starts silently hanging when not built with a threaded runtime, so let’s assume people using `writeHaskell` don’t care about micro-optimizations like this and do the expected thing. Some architectures don’t support a threaded runtime, for these we provide the `threadedRuntime` option to turn it off (it should fail at build time in that case, easy to detect). If somebody already passed `"-threaded"` before via ghcArgs, this will not add the flag a second time. Thus it’s backward-compatible in this regard. I tested out both branches (with `-threaded` set and not set before), on an example I had where the runtime would hang when not compiled with `-threaded`. --- pkgs/build-support/writers/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index cf9362ca072c..3ec1796458d0 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -132,12 +132,17 @@ let libraries ? [], ghc ? pkgs.ghc, ghcArgs ? [], + threadedRuntime ? true, strip ? true }: - makeBinWriter { + let + appendIfNotSet = el: list: if elem el list then list else list ++ [ el ]; + ghcArgs' = if threadedRuntime then appendIfNotSet "-threaded" ghcArgs else ghcArgs; + + in makeBinWriter { compileScript = '' cp $contentPath tmp.hs - ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs} tmp.hs + ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs mv tmp $out ''; inherit strip; From b44f6df49725d9d968dc14e97cfcb0d21f8368d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 30 Jun 2022 09:50:01 +0200 Subject: [PATCH 25/26] nix-update: 0.5.1 -> 0.6.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index dd6cb2e56052..67d627c4e6b7 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-d2S18cBkFJOIGFKrwj9U4bRvdPjrbuWfRUVug1JEw0s="; + sha256 = "sha256-CkdiNXWhMYjqdxHSSB5qjEiD6cZF6NQfjCUMrLxz8/Q="; }; makeWrapperArgs = [ From 783e2ef46e9ec6639d914aa3f9ecd5cc6b812868 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Thu, 30 Jun 2022 11:24:26 +0200 Subject: [PATCH 26/26] Revert "nix-prefetch-git: Fix inconsistency with fetchgit regarding deepClone" This reverts commit 1dfaad73ed98254c1c0522156fe45b115e0a8eb4. --- pkgs/build-support/fetchgit/nix-prefetch-git | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index f6a317a888a5..4e6f25b8dd7d 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -105,10 +105,6 @@ for arg; do fi done -if test -n $deepClone; then - leaveDotGit=true -fi - if test -z "$url"; then usage fi