From 61e46071436d85dcca7164f12c4ca68c17604f5f Mon Sep 17 00:00:00 2001 From: Skye Date: Sat, 16 Oct 2021 21:27:29 -0400 Subject: [PATCH 01/18] krita-beta: 5.0.0-beta1 -> 5.0.0-beta2 --- pkgs/applications/graphics/krita/beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/beta.nix b/pkgs/applications/graphics/krita/beta.nix index 167a96050fd6..7733c1248fc2 100644 --- a/pkgs/applications/graphics/krita/beta.nix +++ b/pkgs/applications/graphics/krita/beta.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.0.0-beta1"; + version = "5.0.0-beta2"; kde-channel = "unstable"; - sha256 = "1p5l2vpsgcp4wajgn5rgjcyb8l5ickm1nkmfx8zzr4rnwjnyxdbm"; + sha256 = "0hwh6k40f4kmwg14dy0vvm0m8cx8n0q67lrrc620da9mign3hjs7"; }) From f9e0bae4857f6d3aeb8a9ecb35de3e1668132d23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Oct 2021 19:27:15 +0200 Subject: [PATCH 02/18] jrnl: 2.8 -> 2.8.3 --- pkgs/applications/misc/jrnl/default.nix | 56 +++++++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 37142cd20eb5..967d4931c31e 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,36 +1,26 @@ { lib -, ansiwrap -, asteval -, buildPythonApplication -, colorama -, cryptography , fetchFromGitHub -, keyring -, parsedatetime -, poetry -, pytestCheckHook -, python-dateutil -, pytz -, pyxdg -, pyyaml -, tzlocal +, fetchpatch +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "2.8"; + version = "2.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "v${version}"; - sha256 = "1zpsvrjhami9y7204yjbdzi04bkkz6i3apda9fh3hbq83y6wzprz"; + sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ ansiwrap asteval colorama @@ -44,12 +34,32 @@ buildPythonApplication rec { tzlocal ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "jrnl" ]; + checkInputs = with python3.pkgs; [ + pytest-bdd + pytestCheckHook + toml + ]; + + patches = [ + # Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch"; + sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m"; + }) + ]; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + pythonImportsCheck = [ + "jrnl" + ]; meta = with lib; { - homepage = "http://maebert.github.io/jrnl/"; - description = "A simple command line journal application that stores your journal in a plain text file"; + description = "Simple command line journal application that stores your journal in a plain text file"; + homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; maintainers = with maintainers; [ zalakain ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d7ee648a3ce..9cad93ae99e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6529,7 +6529,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; - jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; + jrnl = callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; From ced0efcfd1e19a66c0e816aee3df65ee6a7b7024 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Oct 2021 19:50:58 +0200 Subject: [PATCH 03/18] slides: 0.5.0 -> 0.6.1 --- pkgs/applications/misc/slides/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index c69971919ee9..1484c104c2c4 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -1,14 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }: +{ lib +, bash +, buildGoModule +, fetchFromGitHub +, go +, python3 +, ruby +}: buildGoModule rec { pname = "slides"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "175g823n253d3xg8hxycw3gm1hhqb0vz8zs7xxcbdw5rlpd2hjii"; + sha256 = "sha256-530OsO3Rg13nmFYOoouhWvy12Afd25O4We9RBHe1CmE="; }; checkInputs = [ @@ -18,13 +25,16 @@ buildGoModule rec { ruby ]; - vendorSha256 = "13kx47amwvzyzc251iijsbwa52s8bpld4xllb4y85qkwllfnmq2g"; + vendorSha256 = "sha256-pI5/1LJVP/ZH64Dy2rUoOXM21oqJ8KA0/L8ClGRb5UY="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + # https://github.com/maaslalani/slides/issues/113 + doCheck = false; + meta = with lib; { description = "Terminal based presentation tool"; homepage = "https://github.com/maaslalani/slides"; From aa37d8940547dd706734431d7ae0da128b9de6a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Oct 2021 13:47:57 +0200 Subject: [PATCH 04/18] python3Packages.piccata: enable tests --- .../python-modules/piccata/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index bbb4fcf19934..d041ecc3ec70 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -1,8 +1,14 @@ -{ buildPythonPackage, isPy27, fetchFromGitHub, lib, ipaddress }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +}: buildPythonPackage rec { pname = "piccata"; version = "2.0.0"; + disabled = isPy27; src = fetchFromGitHub { @@ -12,15 +18,23 @@ buildPythonPackage rec { sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - propagatedBuildInputs = [ - ipaddress + checkInputs = [ + pytestCheckHook ]; - pythonImportsCheck = [ "piccata" ]; + disabledTests = [ + # No communication possible in the sandbox + "test_client_server_communication" + ]; - meta = { + pythonImportsCheck = [ + "piccata" + ]; + + meta = with lib; { description = "Simple CoAP (RFC7252) toolkit"; homepage = "https://github.com/NordicSemiconductor/piccata"; - maintainers = with lib.maintainers; [ gebner ]; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; }; } From 2d0ff634f1f2c52622d3371231fb47dcbcb2189d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Oct 2021 14:00:02 +0200 Subject: [PATCH 05/18] python3Packages.pyspinel: unstable-2020-06-19 -> unstable-2021-08-19 --- .../python-modules/pyspinel/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix index dcd35132c2ed..69c06b8876d2 100644 --- a/pkgs/development/python-modules/pyspinel/default.nix +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -1,27 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, future, pyserial, ipaddress +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pythonOlder }: buildPythonPackage rec { pname = "pyspinel"; - version = "unstable-2020-06-19"; # no versioned release since 2018 - disabled = isPy27; + version = "unstable-2021-08-19"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "openthread"; repo = pname; - rev = "e0bb3f8e6f49b593ab248a75de04a71626ae8101"; - sha256 = "0nfmdkgbhmkl82dfxjpwiiarxngm6a3fvdrzpaqp60a4b17pipqg"; + rev = "50d104e29eacd92d229f0b7179ec1067f5851c17"; + sha256 = "0s2r00zb909cq3dd28i91qbl0nz8cga3g98z84gq5jqkjpiy8269"; }; propagatedBuildInputs = [ - future - ipaddress pyserial ]; + # Tests are out-dated doCheck = false; - pythonImportsCheck = [ "spinel" ]; + + pythonImportsCheck = [ + "spinel" + ]; meta = with lib; { description = "Interface to the OpenThread Network Co-Processor (NCP)"; From 7d3bb3928df85fcfb44933c555d9722780c802f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Oct 2021 14:16:27 +0200 Subject: [PATCH 06/18] python3Packages.pc-ble-driver-py: 0.15.0 -> 0.16.1 --- .../pc-ble-driver-py/default.nix | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 058fb8638830..53fbed59dc18 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,26 +1,59 @@ -{ lib, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder -, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }: +{ lib +, boost +, buildPythonPackage +, cmake +, cryptography +, fetchFromGitHub +, git +, pc-ble-driver +, pythonAtLeast +, pythonOlder +, scikit-build +, setuptools +, swig +, udev +, wrapt +}: buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.15.0"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; + version = "0.16.1"; + + disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; - rev = version; - sha256 = "1ckbsq9dwca8hpx9frf9xd80b4z4kn9j7jx94hza9bwzrh26x5ji"; + rev = "v${version}"; + sha256 = "0q2zag77drcjkjm0cbvy2sf6fq2a4yl5li1zv1xfwmy53ami9b5l"; }; + nativeBuildInputs = [ + cmake + swig + git + setuptools + scikit-build + ]; + + buildInputs = [ + boost + pc-ble-driver + ]; + + propagatedBuildInputs = [ + cryptography + wrapt + ]; + + dontUseCmakeConfigure = true; + # doCheck tries to write to the global python directory to install things doCheck = false; - nativeBuildInputs = [ cmake swig git setuptools scikit-build ]; - buildInputs = [ boost pc-ble-driver ]; - propagatedBuildInputs = [ enum34 wrapt future ]; - - dontUseCmakeConfigure = true; + pythonImportsCheck = [ + "pc_ble_driver_py" + ]; meta = with lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; From 05b40133c57dd61fdf8dfd9d13138012aa7e63c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Oct 2021 14:49:11 +0200 Subject: [PATCH 07/18] nrfutil: 6.1 -> 6.1.3 --- .../tools/misc/nrfutil/default.nix | 56 ++++++++++++++++--- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index acc8490b7c20..848afb5b2ca8 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,20 +1,62 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, pkgs +, python3 +, python3Packages +}: +let + py = python3.override { + packageOverrides = self: super: { -with python3Packages; buildPythonApplication rec { + libusb1 = super.libusb1.overridePythonAttrs (oldAttrs: rec { + version = "1.9.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0"; + }; + + postPatch = '' + substituteInPlace usb1/libusb1.py --replace \ + "ctypes.util.find_library(base_name)" \ + "'${pkgs.libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { pname = "nrfutil"; - version = "6.1"; + version = "6.1.3"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-nrfutil"; rev = "v${version}"; - sha256 = "0g43lf5jmk0qxb7r4h68wr38fli6pjjk67w8l2cpdm9rd8jz4lpn"; + sha256 = "1gpxjdcjn4rjvk649vpkh563c7lx3rrfvamazb1qjii1pxrvvqa7"; }; - propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa - protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ]; + propagatedBuildInputs = [ + click + crcmod + ecdsa + libusb1 + intelhex + pc-ble-driver-py + piccata + protobuf + pyserial + pyspinel + pyyaml + tqdm + ]; - checkInputs = [ nose behave ]; + checkInputs = [ + behave + nose + ]; postPatch = '' mkdir test-reports From 6e38d72020a218a3a2ef0a38be55c9a4e15255d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Oct 2021 20:50:55 +0200 Subject: [PATCH 08/18] slides: 0.6.1 -> 0.6.2 --- pkgs/applications/misc/slides/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 1484c104c2c4..23605f683a78 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -3,38 +3,32 @@ , buildGoModule , fetchFromGitHub , go -, python3 -, ruby }: buildGoModule rec { pname = "slides"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "sha256-530OsO3Rg13nmFYOoouhWvy12Afd25O4We9RBHe1CmE="; + sha256 = "sha256-D2ex9/XN5JMKwn+g1cB77UMquYW9NdTzhCCvVtTOBfU="; }; checkInputs = [ bash go - python3 - ruby ]; vendorSha256 = "sha256-pI5/1LJVP/ZH64Dy2rUoOXM21oqJ8KA0/L8ClGRb5UY="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X=main.Version=${version}" ]; - # https://github.com/maaslalani/slides/issues/113 - doCheck = false; - meta = with lib; { description = "Terminal based presentation tool"; homepage = "https://github.com/maaslalani/slides"; From ff38b05b49eafe39e83a9f4ec1d07326ada8b82e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 24 Oct 2021 02:57:47 +0200 Subject: [PATCH 09/18] release-notes: Include note on Cawbird API key change follow up to #140412 --- .../manual/from_md/release-notes/rl-2111.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index cbcc3cb7cfcd..d60a100a2f22 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1613,6 +1613,16 @@ Superuser created successfully. + + + The cawbird Twitter client now uses its own + API keys to count as different application than upstream + builds. This is done to evade application-level rate limiting. + While existing accounts continue to work, users may want to + remove and re-register their account in the client to enjoy a + better user experience and benefit from this change. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 982f87daecdc..a8ca755d611f 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -462,3 +462,5 @@ In addition to numerous new and upgraded packages, this release has the followin - `virtualisation.libvirtd.qemu*` options (e.g.: `virtualisation.libvirtd.qemuRunAsRoot`) were moved to [`virtualisation.libvirtd.qemu`](options.html#opt-virtualisation.libvirtd.qemu) submodule, - software TPM1/TPM2 support (e.g.: Windows 11 guests) ([`virtualisation.libvirtd.qemu.swtpm`](options.html#opt-virtualisation.libvirtd.qemu.swtpm)), - custom OVMF package (e.g.: `pkgs.OVMFFull` with HTTP, CSM and Secure Boot support) ([`virtualisation.libvirtd.qemu.ovmf.package`](options.html#opt-virtualisation.libvirtd.qemu.ovmf.package)). + +- The `cawbird` Twitter client now uses its own API keys to count as different application than upstream builds. This is done to evade application-level rate limiting. While existing accounts continue to work, users may want to remove and re-register their account in the client to enjoy a better user experience and benefit from this change. From 910e1eab7161b60f8e18e2df984e115c0b28fa33 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 23 Oct 2021 22:49:42 +0800 Subject: [PATCH 10/18] flameshot: fix desktop Exec path and autostart directory location --- pkgs/tools/misc/flameshot/default.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index e2e066fd8903..7605c92bf438 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , qtbase , cmake , qttools @@ -19,6 +20,21 @@ mkDerivation rec { sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; }; + patches = [ + # Support for USE_LAUNCHER_ABSOLUTE_PATH. + # Should be removed when the next release comes out. + (fetchpatch { + url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch"; + sha256 = "sha256-o8Zz/bBvitXMDFt5rAfubiUPOx+EQ+ITgrfnFM3dFjE="; + }) + # Fix autostart write path. + # Should be removed when the next release comes out. + (fetchpatch { + url = "https://github.com/flameshot-org/flameshot/commit/7977cbb52c2d785abd0d85d9df5991e8f7cae441.patch"; + sha256 = "sha256-wWa9Y+4flBiggOMuX7KQyL+q3f2cALGeQBGusX2x6sk="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; @@ -28,10 +44,13 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase ]; + # Use relative path for the .desktop file. + cmakeFlags = [ "-DUSE_LAUNCHER_ABSOLUTE_PATH=OFF" ]; + meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; - maintainers = with maintainers; [ scode ]; + maintainers = with maintainers; [ scode oxalica ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; From dc0769c63c65118eb39720d17604d22c7787887d Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 24 Oct 2021 12:13:54 +0200 Subject: [PATCH 11/18] nixos/bookstack: fix error message output (#142729) --- nixos/modules/services/web-apps/bookstack.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index 74eeb2faa4a3..54c491f8b176 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -221,7 +221,7 @@ in { assertions = [ { assertion = db.createLocally -> db.user == user; - message = "services.bookstack.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true."; + message = "services.bookstack.database.user must be set to ${user} if services.bookstack.database.createLocally is set true."; } { assertion = db.createLocally -> db.passwordFile == null; message = "services.bookstack.database.passwordFile cannot be specified if services.bookstack.database.createLocally is set to true."; From 18de1eba7f12e99aa63f593457295a551834af33 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 18:02:20 +0200 Subject: [PATCH 12/18] =?UTF-8?q?gnome-desktop-testing:=20unstable-2019-12?= =?UTF-8?q?-11=20=E2=86=92=202021.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/compare/57239dc8ef49ba74d442603a07a3e132b0cfdc6a...v2021.1 --- .../tools/gnome-desktop-testing/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 5f01881958fe..5531823b8f5b 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv +{ stdenv +, lib , glib , autoreconfHook , pkg-config , systemd , fetchFromGitLab +, nix-update-script }: stdenv.mkDerivation rec { pname = "gnome-desktop-testing"; - version = "unstable-2019-12-11"; + version = "2021.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-desktop-testing"; - rev = "57239dc8ef49ba74d442603a07a3e132b0cfdc6a"; - sha256 = "01c4jhpk23kfcnw3l9kfwjw9v5kgqmfhhqypw4k2d2sdkf4mgfv4"; + rev = "v${version}"; + sha256 = "sha256-PWn4eEZskY0YgMpf6O2dgXNSu8b8T311vFHREv2HE/Q="; }; nativeBuildInputs = [ @@ -30,6 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = "gnome-desktop-testing"; + }; + }; + meta = with lib; { description = "GNOME test runner for installed tests"; homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; From 6ef96ead9a47a0b5ca67a425c90367b85d439c73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:27:30 +0000 Subject: [PATCH 13/18] =?UTF-8?q?gnome.gnome-applets:=203.40.0=20=E2=86=92?= =?UTF-8?q?=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/gnome-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index f581017dd565..2cdafcc23b30 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.40.0"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; + sha256 = "/RaXR7kv7/Rs05/mLyPd+WZ8EAaPRigDOF0TjvxIedQ="; }; nativeBuildInputs = [ From 3d9cb399a65cd0d36a70b9d4187d4a7ad342e8d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:27:53 +0000 Subject: [PATCH 14/18] =?UTF-8?q?gnome.gnome-clocks:=2040.0=20=E2=86=92=20?= =?UTF-8?q?41.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index d9a749a24b09..2e8ec02bd845 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; + sha256 = "34yLBKuS+mGPXe5RGFce+fyeilt5XqAKNcbcZ3ywLaw="; }; nativeBuildInputs = [ From ae56abbb470bc50cb13e92b5d50664894ad33e9f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:29:05 +0000 Subject: [PATCH 15/18] =?UTF-8?q?gnome.gnome-panel:=203.40.0=20=E2=86=92?= =?UTF-8?q?=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/gnome-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 2e33be766b86..aa472230e9cd 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.40.0"; + version = "3.42.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; + hash = "sha256-rqjA78LtuiDpetRpUXnNCiU45kwpBHAsyMWU6OCJhwM="; }; patches = [ From d2ea39144c458b99e7e998b81d9df89b04ba68f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:30:17 +0000 Subject: [PATCH 16/18] =?UTF-8?q?gnome.metacity:=203.40.0=20=E2=86=92=203.?= =?UTF-8?q?42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 702b7ffb38bb..8dcef7922659 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.40.0"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12"; + sha256 = "2J1nnc/tm17vGPBuLcszp6tUPVOzWPqJzmVZPCMe7rw="; }; patches = [ From 522e29d09e587985db1ad0da8a3e8abb14a0c8ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 12:37:57 +0200 Subject: [PATCH 17/18] shotwell.updateScript: fix version policy --- pkgs/applications/graphics/shotwell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 7b74dd745f78..56d41d3dd503 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; }; }; From 453edd71bfc0a7f56ad6e8969d80945ad1cc3c23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:35:21 +0000 Subject: [PATCH 18/18] =?UTF-8?q?vte:=200.64.2=20=E2=86=92=200.66.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.64.0...0.66.0 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0411086c78c3..6b65f8419645 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.2"; + version = "0.66.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; + sha256 = "sha256-0IE6wA+x102IhR52X3VdSWyD4JcJc1jqG6rbOLN7ezM="; }; patches = [