From 57da584e6ff934bba1fc5f0b9c6c85c82efe053c Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Mon, 30 May 2022 12:09:15 +0300 Subject: [PATCH 01/14] deadbeef-statusnotifier-plugin: fix libdbusmenu dependency (cherry picked from commit f630ac5f2d9bd20623e9fe51797a98cf59b12a6d) --- pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix index a1ca052f9c6b..287f439c94d5 100644 --- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl -, libdbusmenu-glib }: +, libdbusmenu }: stdenv.mkDerivation rec { pname = "deadbeef-statusnotifier-plugin"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ deadbeef gtk3 libdbusmenu-glib ]; + buildInputs = [ deadbeef gtk3 libdbusmenu ]; buildFlags = [ "gtk3" ]; From e0b17fd48c44aa89f5e874389fe602d95cff2cc7 Mon Sep 17 00:00:00 2001 From: Smaug123 Date: Thu, 2 Jun 2022 21:52:02 +0100 Subject: [PATCH 02/14] Mark dotnet unbroken (cherry picked from commit 699fe4c869890707ba7fb881a15e99555d9c4e79) --- pkgs/development/compilers/dotnet/build-dotnet.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 7f93a0562a4e..e16049e8594b 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -86,7 +86,6 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; license = licenses.mit; From 39e1db0c739356a461ce2521229309db07949765 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 7 Jun 2022 16:44:23 +0200 Subject: [PATCH 03/14] libxmlb: 0.3.8 -> 0.3.9 (cherry picked from commit 110b8ad1ef1759a06b39dc790642558ef767d751) --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index d4820d6909a4..0e22c82148fd 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.8"; + version = "0.3.9"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "vT/NGFDzP0ut+TKD8pYVQrjTkepzKEJUo3uKF4MX334="; + sha256 = "sha256-4WTuwxpIsE7gHXFiuWuZeu2JMGzPLpsmS1KTEdR3ztg="; }; patches = [ From 25b51afd963d144a9300207a6ff04d7c15b855ba Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 7 Jun 2022 16:44:49 +0200 Subject: [PATCH 04/14] fwupd: 1.8.0 -> 1.8.1 - https://github.com/fwupd/fwupd/releases/tag/1.8.1 (cherry picked from commit a58c728d5f9f01c283eb2e25dd54c049dab7533c) --- ...d-option-for-installation-sysconfdir.patch | 34 +++++++++---------- .../linux/firmware/fwupd/default.nix | 4 +-- .../linux/firmware/fwupd/efi-app-path.patch | 8 ++--- .../fwupd/install-fwupdplugin-to-out.patch | 12 +++---- .../firmware/fwupd/installed-tests-path.patch | 14 ++++---- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index bdb2fc34728a..8f3a2381dc01 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index 2ae29ce5..342cac92 100644 +index 9176aa34..1a0298a9 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -12,7 +12,7 @@ index 2ae29ce5..342cac92 100644 install_data(['power.quirk', 'cfi.quirk'], install_dir: join_paths(datadir, 'fwupd', 'quirks.d')) diff --git a/data/pki/meson.build b/data/pki/meson.build -index 2a7d0f24..091981f7 100644 +index 499b7201..1be13607 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build @@ -12,13 +12,13 @@ install_data([ @@ -31,7 +31,7 @@ index 2a7d0f24..091981f7 100644 ) endif -@@ -26,11 +26,11 @@ if supported_pkcs7 == '1' +@@ -26,11 +26,11 @@ if supported_pkcs7 install_data([ 'LVFS-CA.pem', ], @@ -46,7 +46,7 @@ index 2a7d0f24..091981f7 100644 ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 02d8777b..2c89d593 100644 +index 87e794b1..ebeeeca7 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' @@ -83,10 +83,10 @@ index 02d8777b..2c89d593 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index 394f40fa..7b602c73 100644 +index b91dd037..a8de7810 100644 --- a/meson.build +++ b/meson.build -@@ -187,6 +187,12 @@ endif +@@ -195,6 +195,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -100,16 +100,16 @@ index 394f40fa..7b602c73 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index c1b483cb..047dbdd8 100644 +index d00038db..c84652ca 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') - option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') + option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index e9f12879..a0126dbb 100644 +index 00b7ecda..789f34ca 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build @@ -38,6 +38,6 @@ configure_file( @@ -121,7 +121,7 @@ index e9f12879..a0126dbb 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index 3ea47456..40dbd116 100644 +index 1a278375..f57ae530 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'], @@ -134,10 +134,10 @@ index 3ea47456..40dbd116 100644 shared_module('fu_plugin_msr', fu_hash, diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 4a0a8664..7d9ba77d 100644 +index 8717d50f..9a703723 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish', +@@ -51,7 +51,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], @@ -147,10 +147,10 @@ index 4a0a8664..7d9ba77d 100644 if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 1ba9562f..c074f770 100644 +index aa6c8ce1..61734c4d 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', +@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', ) install_data(['thunderbolt.conf'], @@ -158,9 +158,9 @@ index 1ba9562f..c074f770 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd') ) # we use functions from 2.52 in the tests - if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') + if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index 04cbd51a..9a8c43de 100644 +index 2d9ba819..0feb5f6b 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -21,7 +21,7 @@ if host_machine.system() == 'linux' @@ -172,7 +172,7 @@ index 04cbd51a..9a8c43de 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man') +@@ -112,7 +112,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 4b7a92f0b7ef..f413fa206134 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -117,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.0"; + version = "1.8.1"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -126,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "LAliLnOSowtORQQ0M4z2cNQzKMLyE/RsX//xAWifrps="; + sha256 = "sha256-V1ZGZELrkTT7QM3IpG+eAQAyR8jqyC+l2LFvZCA3W3k="; }; patches = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch index c2502502a40c..afee6d9f61ea 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -1,10 +1,10 @@ diff --git a/meson.build b/meson.build -index 4330512e..e53b70ab 100644 +index b91dd037..01d70a61 100644 --- a/meson.build +++ b/meson.build -@@ -403,7 +403,7 @@ endif - if build_standalone and get_option('plugin_uefi_capsule') - efiboot = dependency('efiboot') +@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() + conf.set('HAVE_EFI_TIME_T', '1') + endif - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') + efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index 6667156e831c..c67665f21207 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,10 +1,10 @@ diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index d6a2ed68..12c82a95 100644 +index 1afa28e1..3da81d30 100644 --- a/libfwupdplugin/meson.build +++ b/libfwupdplugin/meson.build -@@ -216,7 +216,8 @@ fwupdplugin = library( +@@ -220,7 +220,8 @@ fwupdplugin = library( ], - link_args : vflag, + link_args : cc.get_supported_link_arguments([vflag]), link_depends : fwupdplugin_mapfile, - install : true + install : true, @@ -12,7 +12,7 @@ index d6a2ed68..12c82a95 100644 ) fwupdplugin_pkgg = import('pkgconfig') -@@ -276,7 +277,8 @@ if get_option('introspection') +@@ -280,7 +281,8 @@ if introspection.allowed() girtargets, fwupd_gir[0], ], @@ -23,10 +23,10 @@ index d6a2ed68..12c82a95 100644 # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index 38aa36b0..3fb7e579 100644 +index b91dd037..f97b4c26 100644 --- a/meson.build +++ b/meson.build -@@ -521,7 +521,7 @@ if build_standalone +@@ -504,7 +504,7 @@ if build_standalone if host_machine.system() == 'windows' plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) else diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 4b278c33f7fd..49bca65d9c60 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,5 +1,5 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index b8ec916f0..38209b363 100644 +index b8ec916f..38209b36 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build @@ -83,5 +83,5 @@ configure_file( @@ -10,10 +10,10 @@ index b8ec916f0..38209b363 100644 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index d8bd9fdc7..ff924d373 100644 +index b91dd037..d7e20b18 100644 --- a/meson.build +++ b/meson.build -@@ -187,8 +187,8 @@ else +@@ -188,8 +188,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -21,10 +21,10 @@ index d8bd9fdc7..ff924d373 100644 - installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) + installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) + installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) + daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) - localedir = join_paths(prefix, get_option('localedir')) -@@ -487,6 +487,7 @@ gnome = import('gnome') +@@ -492,6 +492,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -33,7 +33,7 @@ index d8bd9fdc7..ff924d373 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index d00038dbc..be1c45b40 100644 +index d00038db..be1c45b4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: @@ -45,7 +45,7 @@ index d00038dbc..be1c45b40 100644 option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4d19e560f..91cfaa616 100644 +index 4d19e560..91cfaa61 100644 --- a/plugins/redfish/fu-self-test.c +++ b/plugins/redfish/fu-self-test.c @@ -27,7 +27,7 @@ fu_test_is_installed_test(void) From 1f2b6e8bb71ed22f439f2069edf3b1ad4e2b28d6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 13 Jun 2022 23:36:09 +0200 Subject: [PATCH 05/14] element-{web,desktop}: 1.10.13 -> 1.10.14 ChangeLog desktop: https://github.com/vector-im/element-desktop/releases/tag/v1.10.14 ChangeLog web: https://github.com/vector-im/element-web/releases/tag/v1.10.14 --- .../element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index b470f658042f..ac17d6d44591 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.13", + "version": "1.10.14", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index c2bc3d8a89ee..87e3937787c8 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.13", - "desktopSrcHash": "tTvpjSIipvmJIfZF1RiRtlDjsKJYHoPQ6XSqI8TGH14=", - "desktopYarnHash": "105bphn4ga4f0n60cvrlppf8wim2c1qy09g8arraadcxymds98n6", - "webHash": "1zxjlzlxh2gbswa1063zbw6ahwlcnvyqkvbwj92vk873c3g8ba72" + "version": "1.10.14", + "desktopSrcHash": "/y4pJSNQrN0Ksc+yjB3Xl6t8AZLNtZ/Rm0UoAhwlgp8=", + "desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n", + "webHash": "0l6nss7iscqlgmp9s48kpgnpnyiyr6f0ngi8ybzgk5b1bk9b4l8j" } From 5afd4c9683d4243ddf2726839584483776624ab0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 07:36:14 +0000 Subject: [PATCH 06/14] palemoon: 31.0.0 -> 31.1.0 --- pkgs/applications/networking/browsers/palemoon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index a07ca4e581de..77419c95eb0a 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,15 +45,15 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.0.0"; + version = "31.1.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "${version}_Release"; + rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0 fetchSubmodules = true; - sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; + sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4="; }; nativeBuildInputs = [ From 598e9baf7d86ed582e67075c6f201ce4d6d866bd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 14 Jun 2022 12:49:22 +0200 Subject: [PATCH 07/14] dovecot: 2.3.19 -> 2.3.19.1 (cherry picked from commit 7aaf277a47ed51f1c55232eb152e92a524d9288a) --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index da4c2b04eb4c..834844f96741 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.19"; + version = "2.3.19.1"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - hash = "sha256:0ys3zq9b1rgj1cz6a0i9l421y6h2j3b5zak2ia5j9dj1sj9zcwq1"; + hash = "sha256-21q82H1zCWWeprRbLLbunF+XSGsrcZpd0Fp1nh9qXFE="; }; enableParallelBuilding = true; From 8da987d804ab54ddc819e39479aa6d578b0191e1 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 14 Jun 2022 23:46:53 -0400 Subject: [PATCH 08/14] go-ethereum: 1.10.17 -> 1.10.18 (cherry picked from commit c841addd7588ec2fafab69ff6dd748ca7fd5047c) --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 661a25c8314b..ef79e514638a 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.17"; + version = "1.10.18"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GBlrg4wOiqEQTZC3CtfAZbIvS16/pSjEedEDrPGNUtY="; + sha256 = "1jfyhzklznjrdki6m8wjgqzp63b6n6vy7ws3l0al58zkaybnpikw"; }; - vendorSha256 = "sha256-D4odWuGFipSvbKbNlA6PkTo3rWGTCptJcn/7V7ZA7qs="; + vendorSha256 = "10xpxz8ybgwqizqy9d3phza8mlxxpsbk4qsf271r7ls4qr5q1wxz"; doCheck = false; From 09319c570a7696edc019fd5de20f961c493e3ea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jun 2022 04:38:19 +0000 Subject: [PATCH 09/14] gnome-text-editor: 42.1 -> 42.2 (cherry picked from commit 434130e202cabce8289fb413aac72d6f4aa36c2d) --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index f14c57cde69c..faf32952cfc2 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-o8hQgDO/tjqLSKBirB5nssMzugFTh5s4xmGWihA60Vw="; + sha256 = "sha256-5W1KjNy86KjxwIgbRd55n4slIF7Ay/ImnlMgJXYcxdo="; }; nativeBuildInputs = [ From 0f96caf132e2347db2d606d8cff9f2d803906e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jun 2022 03:04:11 +0000 Subject: [PATCH 10/14] gnome.ghex: 42.2 -> 42.3 (cherry picked from commit 3c25c57c81d763d6aa6f026f93d8c255c5d97160) --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 5a0722af21ce..58659d1748e5 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "42.2"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Rd6Oa4ofMd5amRC+GMB/CaMo2HU434BAOuxa+IF8ljE="; + sha256 = "rdQPirJJIdsw0nvljwAnMgGXfYf9yNeezq36iw41Te8="; }; nativeBuildInputs = [ From 7bc04740c74eb7520eee2eb62cd78ff3db73c423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jun 2022 05:07:22 +0000 Subject: [PATCH 11/14] gtksourceview5: 5.4.1 -> 5.4.2 (cherry picked from commit 3b95894025ef191d38dc69b242ec8798dd43abe5) --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 29d85980accc..307fb15e98d8 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.4.1"; + version = "5.4.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6zWECZz6CtyaCx7eCN72MgvQmeeedKLQrvtAV82T1o4="; + sha256 = "rRQOB+uEGRDeSDwJK9SIWr0puq3W6V+iLZPtLfC3nec="; }; patches = [ From c385762fbc06fa69d283b9f0c91515d5ecb189f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jun 2022 03:17:14 +0000 Subject: [PATCH 12/14] gnome.gnome-calendar: 42.1 -> 42.2 (cherry picked from commit 9896d3e92902cfb8515bba6305bfd0ffc3b3ca0c) --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 058984ca7472..432980300d2d 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0SKBy78a+GxyN1/mrZNG7Q4sLziKHq6FjOzmQGCm66g="; + sha256 = "rnzGOq6WoCqlmbbWo0hYX0529ylTbznvt0QwKwW1+70="; }; nativeBuildInputs = [ From 761b7375504200c0f08e065d59f6ebbbb3ca425b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Tue, 7 Jun 2022 04:00:36 +0200 Subject: [PATCH 13/14] scala-cli: 0.1.6 -> 0.1.7 (cherry picked from commit 22f30538f29181226cfd6e90cb1b75fd73f95c9b) --- .../development/tools/build-managers/scala-cli/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index eaa53705260a..464675569fd7 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,13 +1,13 @@ { - "version": "0.1.6", + "version": "0.1.7", "assets": { "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1wcm47x0w4gdhkqrqjn0qvgnn36c707mz9m260pdnnffja203vyr" + "sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1jwv67p2r6kxqlz8p2zvk5g5jdswl8cymj822b88lbp78a497kc6" + "sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5" } } } From 891d2bdc0bba57e5778344f262e187a8f7583895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 13 Jun 2022 23:40:34 +0200 Subject: [PATCH 14/14] scala-cli: 0.1.7 -> 0.1.8 (cherry picked from commit 6b0f4f603c16a15f33566ce4bc3512e9b85159d3) --- .../build-managers/scala-cli/default.nix | 19 ++++++++++++++++--- .../build-managers/scala-cli/sources.json | 6 +++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 1eb6b92cbd44..314acfe71ffd 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,5 +1,16 @@ -{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl, callPackage }: +{ stdenv +, coreutils +, lib +, installShellFiles +, zlib +, autoPatchelfHook +, fetchurl +, makeWrapper +, callPackage +, jre +}: +assert lib.versionAtLeast jre.version "17.0.0"; let pname = "scala-cli"; sources = builtins.fromJSON (builtins.readFile ./sources.json); @@ -9,7 +20,7 @@ let in stdenv.mkDerivation { inherit pname version; - nativeBuildInputs = [ installShellFiles ] + nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook; buildInputs = [ coreutils zlib stdenv.cc.cc ]; src = @@ -28,7 +39,9 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -Dm755 scala-cli $out/bin/scala-cli + install -Dm755 scala-cli $out/bin/.scala-cli-wrapped + makeWrapper $out/bin/.scala-cli-wrapped $out/bin/scala-cli \ + --set JAVA_HOME ${jre.home} runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 464675569fd7..5bf6e5f3e2fd 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,13 +1,13 @@ { - "version": "0.1.7", + "version": "0.1.8", "assets": { "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v" + "sha256": "1dxhwhdk7kflzn4ckqxfxkz4v26l39ki6ykpml6k6kvy3nn0wwz3" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5" + "sha256": "0hj22lcmbbfgv69k778myb0kp79gbg7xx9a3b66g3svxmanlbvxf" } } }