From bbf0187afdb727beca90b35f74f5e36a8afdcd07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 09:24:57 +0000 Subject: [PATCH 1/6] esbuild: 0.15.3 -> 0.15.5 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index c86b4e2dcc6..61e78085073 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.3"; + version = "0.15.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-UjvVaBeKrZ9T/pFQVdIYFHCsmAO+332Q8Gz0bPEfzgw="; + sha256 = "sha256-vLdj5naUDKVCENqGfQRoxbnHd+nuZu6Ac6HTSPnqoVA="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From a10b7b89713e1f160ebf41d2f200537afbda0378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 11:07:42 +0000 Subject: [PATCH 2/6] go-toml: 2.0.2 -> 2.0.3 --- pkgs/development/tools/go-toml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index f301b985d95..26bf59ecff4 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lZUM31lA6l35EHEZnw6i+WR7qBo692RvlOBkxxBq6Vs="; + sha256 = "sha256-roEJMaRalvk/XT1f15R4DPnlkxo3hPDHdzOfDtZAa8Y="; }; - vendorSha256 = "sha256-/F/ZbeNkiiO2+QibpoKUi1kC3Wv5Jujx6r468irlea0="; + vendorSha256 = "sha256-yDPCfJtYty4aaoDrn3UWFcs1jHJHMJqzc5f06AWQmRc="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; From c425f2d11a99000a93b6eb29d4a6d47ef86a7624 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Aug 2022 15:18:38 +0000 Subject: [PATCH 3/6] nfpm: 2.18.0 -> 2.18.1 --- pkgs/tools/package-management/nfpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index f57bb291a99..cea203c4975 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hRsqu7r6n89KGHybe2D54OtQWq+hBj05xYgi/KPEA7o="; + sha256 = "sha256-Plw8aN1fhZihPcV7dJrlE5Y1flwous7MvrUCJFmkXuc="; }; vendorSha256 = "sha256-6RB27jFK6HI6CR8D9vAPshsRi3ldoQwTTH6S1gyDqxs="; From e49778efefd68f67edda3215d54544d62e60bee6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 06:50:01 +0000 Subject: [PATCH 4/6] python310Packages.mockito: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/mockito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1c27f7bccb4..6cb19f03709 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.4"; + version = "1.3.5"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RdJibODIxwY8xE8Gox9X1B0kHvLsm9pAMtULOedZXrE="; + sha256 = "sha256-gZko9eR1yM4NWX5wUlj7GQ+A/KflYYVojR595VhmMzc="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; From aacd650ab141586d89de431b5a23a78347ed4641 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 14:37:09 +0000 Subject: [PATCH 5/6] python310Packages.approvaltests: 5.3.3 -> 5.4.2 --- pkgs/development/python-modules/approvaltests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 55b3cb1cca7..3ad36749e0e 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "5.3.3"; + version = "5.4.2"; pname = "approvaltests"; format = "setuptools"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lFGwwe8L9hXlzaxcd9pxXin5/NPhCpvM4vFRbeQxZ9U="; + sha256 = "sha256-ZXtIM3McpfDFCaedlbJ6SU+Er5NyfI8kGnrn7sb1V5M="; }; propagatedBuildInputs = [ From 78182194c652df7bdcfa0a6a788d17895188b777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Aug 2022 08:43:12 +0200 Subject: [PATCH 6/6] Revert Merge #184360: json-glib: add installed tests Moving to staging, as it causes lots of rebuilds and it doesn't seem urgent. This reverts commit d6fb90726954441e24b7eece2d05c5d9630a90bc, reversing changes made to 600b02324c37abd1280051f872c914113f1f37bf. --- nixos/tests/installed-tests/default.nix | 1 - nixos/tests/installed-tests/json-glib.nix | 5 ---- .../libraries/json-glib/default.nix | 15 +---------- ...on-add-installed-tests-prefix-option.patch | 27 ------------------- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 nixos/tests/installed-tests/json-glib.nix delete mode 100644 pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 3bb678d3678..b81384aa8c0 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -98,7 +98,6 @@ in gnome-photos = callInstalledTest ./gnome-photos.nix {}; graphene = callInstalledTest ./graphene.nix {}; gsconnect = callInstalledTest ./gsconnect.nix {}; - json-glib = callInstalledTest ./json-glib.nix {}; ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; librsvg = callInstalledTest ./librsvg.nix {}; diff --git a/nixos/tests/installed-tests/json-glib.nix b/nixos/tests/installed-tests/json-glib.nix deleted file mode 100644 index 3dfd3dd0b09..00000000000 --- a/nixos/tests/installed-tests/json-glib.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, makeInstalledTest, ... }: - -makeInstalledTest { - tested = pkgs.json-glib; -} diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index e095945daba..1f8f4fd1acc 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -4,7 +4,6 @@ , glib , meson , ninja -, nixosTests , pkg-config , gettext , gobject-introspection @@ -18,18 +17,13 @@ stdenv.mkDerivation rec { pname = "json-glib"; version = "1.6.6"; - outputs = [ "out" "dev" "devdoc" "installedTests" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; }; - patches = [ - # Add option for changing installation path of installed tests. - ./meson-add-installed-tests-prefix-option.patch - ]; - strictDeps = true; depsBuildBuild = [ @@ -55,9 +49,6 @@ stdenv.mkDerivation rec { glib ]; - mesonFlags = [ - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ]; # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) # it should be a build-time dep for build @@ -82,10 +73,6 @@ stdenv.mkDerivation rec { ''; passthru = { - tests = { - installedTests = nixosTests.installed-tests.json-glib; - }; - updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch deleted file mode 100644 index 626db09cd03..00000000000 --- a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build -index 1eb56c8..dca444e 100644 ---- a/json-glib/tests/meson.build -+++ b/json-glib/tests/meson.build -@@ -21,8 +21,9 @@ test_data = [ - 'stream-load.json', - ] - --installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name) --installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name) -+installed_test_prefix = get_option('installed_test_prefix') -+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name) -+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name) - - install_data(test_data, install_dir: installed_test_bindir) - -diff --git a/meson_options.txt b/meson_options.txt -index 068a03f..03f398a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,3 +10,6 @@ option('man', - option('tests', - type: 'boolean', value: true, - description: 'Build the tests') -+option('installed_test_prefix', -+ description: 'Prefix for installed tests', -+ type: 'string')