diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index c6fb37cfe584..b81384aa8c0b 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -92,6 +92,7 @@ in fwupd = callInstalledTest ./fwupd.nix {}; gcab = callInstalledTest ./gcab.nix {}; gdk-pixbuf = callInstalledTest ./gdk-pixbuf.nix {}; + geocode-glib = callInstalledTest ./geocode-glib.nix {}; gjs = callInstalledTest ./gjs.nix {}; glib-networking = callInstalledTest ./glib-networking.nix {}; gnome-photos = callInstalledTest ./gnome-photos.nix {}; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 0ba86567c7c8..853613c9a5f5 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -29,29 +28,21 @@ , json-glib , itstool , wrapGAppsHook +, desktop-file-utils , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] +, check }: stdenv.mkDerivation rec { pname = "rhythmbox"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo="; + sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ="; }; - patches = [ - # Fix stuff linking against rhythmdb not finding libxml headers - # included by rhythmdb.h header. - # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch"; - sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg="; - }) - ]; - nativeBuildInputs = [ pkg-config meson @@ -60,6 +51,7 @@ stdenv.mkDerivation rec { glib itstool wrapGAppsHook + desktop-file-utils ]; buildInputs = [ @@ -95,9 +87,16 @@ stdenv.mkDerivation rec { libnotify ] ++ gst_plugins; - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; + checkInputs = [ + check + ]; + + mesonFlags = [ + "-Dtests=disabled" + ]; + + # Requires DISPLAY + doCheck = false; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 6770f1201d68..413071958f5f 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "43.3"; + version = "43.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-HOIBAzR+7OZ1RO+MSpCQKShcikdtWCjdMUO2rE2TxiM="; + sha256 = "sha256-8eqrBQrMvS4cta5RP0ibo4Zc3B8hlkftxaRyvb6JuEY="; }; patches = [ diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index b2c34a883510..09dae9a7ab93 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.1"; + version = "42.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4="; + sha256 = "mXHp/aGqK9ZKdrMxcxNcZBWaSQssS8/757lUj+38eCw="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index d678e3b517b3..337aeaba1a2f 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.1"; + version = "3.44.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM="; + sha256 = "TxgrBaE6wbezOwj7Bm6DlcqpW6fagIiGqpGxQp1tfbM="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index adb457068a03..19d6469e96a7 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.2"; + version = "3.44.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+scGznpXP42WdzfxWtDr66Q6h/48p1f4VBID2ZG+BjM="; + sha256 = "8LFuerrTx5RaKcMi8X2rSgjWHpm9fMkbjfNQU8XBLow="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index bf8168b5ca5f..f4416dcc1340 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-WJtva3LbzVqtcAt0kmnti3RZTPg/CBjk6JQYa2VzpSQ="; + sha256 = "sha256-D5NQaxkGhwyBoScI7fZxnSHC0ABmsUeRf8pZCKooV3w="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 1b97fa9b7c66..5406b7dfa8a8 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,19 +1,16 @@ { lib , fetchurl -, fetchpatch , pkg-config , gettext , itstool , python3 , wrapGAppsHook -, python3Packages , gst_all_1 , gtk3 , gobject-introspection , libpeas , librsvg , gnome -, gnome-desktop , libnotify , gsound , meson @@ -21,15 +18,15 @@ , gsettings-desktop-schemas }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pitivi"; - version = "2021.05"; + version = "2022.06"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z1aTxGxCqw2hSi5Zv89LyIBgS0HpzTqo0uvcYIJ7dcc="; + sha256 = "Uz0448bSEcK9DpXiuWsPCDO98NXUd6zgffYRWDUGyDg="; }; patches = [ @@ -37,13 +34,6 @@ python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch - - # Fix build with meson 0.61 - # https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch"; - sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE="; - }) ]; nativeBuildInputs = [ @@ -61,9 +51,7 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome-desktop gsound - gnome.adwaita-icon-theme gsettings-desktop-schemas libnotify ] ++ (with gst_all_1; [ @@ -77,14 +65,13 @@ python3Packages.buildPythonApplication rec { gst-devtools ]); - pythonPath = with python3Packages; [ + pythonPath = with python3.pkgs; [ pygobject3 gst-python - pyxdg numpy pycairo matplotlib - dbus-python + librosa ]; postPatch = '' diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 9b770c0680e7..ebf80a2ab504 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -13,7 +13,6 @@ , gtk3 , gtksourceview4 , gtk-vnc -, freerdp , libvirt , spice-gtk , python3 @@ -55,16 +54,15 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA="; + sha256 = "98K8oU3K4oONsR+iyA4jQI41SBeK+GGg1NDcxql4ABU="; }; patches = [ - # Fix path to libgovf-0.1.so (and libgtk-frdp-0.1.so when enabling rdp meson option) - # in the gir file. We patch gobject-introspection to hardcode absolute paths but + # Fix path to libgovf-0.1.so in the gir file. We patch gobject-introspection to hardcode absolute paths but # our Meson patch will only pass the info when install_dir is absolute as well. ./fix-gir-lib-path.patch ]; @@ -93,7 +91,6 @@ stdenv.mkDerivation rec { buildInputs = [ acl cyrus_sasl - freerdp gdbm glib glib-networking diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch b/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch index 6b0ba4732997..ec2a4285cc0f 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch +++ b/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch @@ -9,14 +9,3 @@ ) govf_dep = declare_dependency( ---- a/subprojects/gtk-frdp/src/meson.build -+++ b/subprojects/gtk-frdp/src/meson.build -@@ -50,7 +50,7 @@ gtk_frdp_lib = shared_library('gtk-frdp-' + api_version, - gtk_frdp_sources, - dependencies: gtk_frdp_deps, - install: true, -- install_dir: libdir -+ install_dir: get_option ('prefix') / libdir - ) - - gtk_frdp_dep = declare_dependency( diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 3ed33be4e98a..1b419aa892e6 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.2"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Xm0bDKfMk56pGq39pWM6hl6oX6VlADaGGyv+8L/QabE="; + sha256 = "sha256-5FZGf6zzyP0QyThrXnTEPZWVrZ+3Ulf32gFK+YPWnNE="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index d0252bc39c38..e6c9f414b2db 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.44.2"; + version = "3.44.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Ltcq/k1rsXD4co+uoJB/7hAhLf3nqfq4L7zIPQ8i8Cg="; + sha256 = "wMZliDjVi6RgQqS55Qo7sRKWkeTNuEteugvzMLLMsus="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 351673d532e3..c31c6de3b9f1 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "700k5Cpl3IYOYgbztHC30jPCripNSWXYhZqp6oo5Ws0="; + sha256 = "M9qxvKQ2WNZlIJWLD2dMsK0xhc/TDBLkWef2lIHFxqA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index af6a81b34787..d927fff95594 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tZ+0LJllxzYfdilt0qNARatlUGXqQUPeWsiyygyq6l4="; + sha256 = "RdjbevRaeXhOejRYjRSeqVXIvkS7gqNuiWgpQFt8iCA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch index da2e940ba017..f9c326e58396 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch @@ -1,5 +1,5 @@ diff --git a/hddtempUtil.js b/hddtempUtil.js -index e5d1d6d..856654b 100644 +index e5d1d6d..23f6289 100644 --- a/hddtempUtil.js +++ b/hddtempUtil.js @@ -7,7 +7,7 @@ var HddtempUtil = class extends CommandLineUtil.CommandLineUtil { @@ -7,7 +7,7 @@ index e5d1d6d..856654b 100644 constructor() { super(); - let hddtempArgv = GLib.find_program_in_path('hddtemp'); -+ let hddtempArgv = GLib.find_program_in_path('@hddtemp@/bin/hddtemp'); ++ let hddtempArgv = '@hddtemp@/bin/hddtemp'; if(hddtempArgv) { // check if this user can run hddtemp directly. if(!GLib.spawn_command_line_sync(hddtempArgv)[3]){ @@ -17,8 +17,8 @@ index e5d1d6d..856654b 100644 let systemctl = GLib.find_program_in_path('systemctl'); - let pidof = GLib.find_program_in_path('pidof'); - let nc = GLib.find_program_in_path('nc'); -+ let pidof = GLib.find_program_in_path('@procps@/bin/pidof'); -+ let nc = GLib.find_program_in_path('@netcat@/bin/nc'); ++ let pidof = '@procps@/bin/pidof'; ++ let nc = '@netcat@/bin/nc'; let pid = undefined; if(systemctl) { @@ -32,7 +32,7 @@ index e5d1d6d..856654b 100644 pid = Number(output.trim()); } diff --git a/liquidctlUtil.js b/liquidctlUtil.js -index 766bf62..7cd4e94 100644 +index 766bf62..2a6faf8 100644 --- a/liquidctlUtil.js +++ b/liquidctlUtil.js @@ -8,7 +8,7 @@ const commandLineUtil = Me.imports.commandLineUtil; @@ -40,12 +40,12 @@ index 766bf62..7cd4e94 100644 constructor() { super(); - const path = GLib.find_program_in_path('liquidctl'); -+ const path = GLib.find_program_in_path('@liquidctl@/bin/liquidctl'); ++ const path = '@liquidctl@/bin/liquidctl'; this._argv = path ? [path, 'status', '--json'] : null; } diff --git a/nvmecliUtil.js b/nvmecliUtil.js -index ae2ea93..2349b9e 100644 +index 98a61df..8a40624 100644 --- a/nvmecliUtil.js +++ b/nvmecliUtil.js @@ -3,7 +3,7 @@ const GLib = imports.gi.GLib; @@ -53,12 +53,12 @@ index ae2ea93..2349b9e 100644 function getNvmeData (argv){ - const nvme = GLib.find_program_in_path('nvme') -+ const nvme = GLib.find_program_in_path('@nvmecli@/bin/nvme') ++ const nvme = '@nvmecli@/bin/nvme' return JSON.parse(GLib.spawn_command_line_sync(`${nvme} ${argv} -o json`)[1].toString()) } diff --git a/sensorsUtil.js b/sensorsUtil.js -index 62fa580..c017748 100644 +index bd6de61..5951b17 100644 --- a/sensorsUtil.js +++ b/sensorsUtil.js @@ -7,7 +7,7 @@ var SensorsUtil = class extends CommandLineUtil.CommandLineUtil { @@ -66,12 +66,12 @@ index 62fa580..c017748 100644 constructor() { super(); - let path = GLib.find_program_in_path('sensors'); -+ let path = GLib.find_program_in_path('@lm_sensors@/bin/sensors'); ++ let path = '@lm_sensors@/bin/sensors'; // -A: Do not show adapter -j: JSON output this._argv = path ? [path, '-A', '-j'] : null; } diff --git a/smartctlUtil.js b/smartctlUtil.js -index 03d469b..6057a3b 100644 +index 4888323..66b6c61 100644 --- a/smartctlUtil.js +++ b/smartctlUtil.js @@ -3,7 +3,7 @@ const GLib = imports.gi.GLib; @@ -79,7 +79,7 @@ index 03d469b..6057a3b 100644 const ByteArray = imports.byteArray; function getSmartData (argv){ - const smartctl = GLib.find_program_in_path('smartctl') -+ const smartctl = GLib.find_program_in_path('@smartmontools@/bin/smartctl') - return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`${smartctl} ${argv} -j`)[1] )) ++ const smartctl = '@smartmontools@/bin/smartctl' + return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`'${smartctl}' ${argv} -j`)[1] )) } diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 458e0d59a0d5..090dbcc70169 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,31 +1,63 @@ -{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }: +{ fetchurl +, lib +, stdenv +, meson +, ninja +, pkg-config +, gettext +, gtk-doc +, docbook-xsl-nons +, gobject-introspection +, gnome +, libsoup +, json-glib +, glib +, nixosTests +}: stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.2"; + version = "3.26.3"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; + url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; + sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ]; - buildInputs = [ glib libsoup json-glib ]; - patches = [ ./installed-tests-path.patch ]; - postPatch = '' - substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests" - ''; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gtk-doc + docbook-xsl-nons + gobject-introspection + ]; + + buildInputs = [ + glib + libsoup + json-glib + ]; + + mesonFlags = [ + "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; passthru = { updateScript = gnome.updateScript { packageName = pname; }; + tests = { + installed-tests = nixosTests.installed-tests.geocode-glib; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch index 499c68008088..c68b7a3a75c3 100644 --- a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch +++ b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch @@ -1,8 +1,20 @@ --- a/geocode-glib/tests/meson.build +++ b/geocode-glib/tests/meson.build @@ -1,4 +1,4 @@ --install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib' -+install_dir = '@installedTests@/libexec/installed-tests/geocode-glib' +-install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name ++install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name e = executable('geo-uri', 'geo-uri.c', +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,6 +1,9 @@ + option('enable-installed-tests', + type: 'boolean', value: true, + description: 'Build & install test programs') ++option('installed_test_prefix', ++ type: 'string', value: '', ++ description: 'Prefix for installed tests') + option('enable-introspection', + type: 'boolean', value: true, + description: 'Whether to enable the introspection generation') diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index a7dca1959fda..205a16234982 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.295.0"; + version = "2.296.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-C5tINoFkd2PRbpnlSkPL/o59B7+J+so07oVvJu1m3dk="; + hash = "sha256-TLBd+L4k/qtY9q0j+soxaLCfER/USZyYCqk0r8A6sSo="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 018ec0e8a927..cbcb2d04def4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.290"; + version = "4.14.291"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4"; + sha256 = "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 0981efb66a77..d1923b847e76 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.255"; + version = "4.19.256"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hwa3g09cmllc2z01s2jqbczpznzdp3ldngx18k5c2ac7w394fbp"; + sha256 = "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3fb588d3cb93..4fc1ce1f1e59 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.325"; + version = "4.9.326"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl"; + sha256 = "0yw83a8nk5abjsvqrz8m2sj699c228j2f2wr5q8m95vgqzfw5wrb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index b5d58e6cb6a0..d2fb4514a377 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.137"; + version = "5.10.138"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1j0n2r793pkvymjc70fzqwqi6h2j1wkja2kx012ydmsk2i6wssy1"; + sha256 = "1a2vmcqzi71w88j79lxsrgyycq1l1gxp0cvh5ya4afhfisxh7819"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 467cd6ab768c..f2a2f50f02b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.62"; + version = "5.15.63"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0hgiag3mvdlcr6ckfy4bdr7h4471zqi53ahfybdvdkapivg7r086"; + sha256 = "0hbkxgadz0vcslni4r46yc202wcnxblcfvkcph1017b2b8gcvlvd"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix index 227e1e0b4457..c9a864ddfab9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.3"; + version = "5.19.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "08978hjl4khc0v8nb8wvrjnc8x8csvpf7airawpb4pvg0rrdcfsi"; + sha256 = "11xzz5glbc7p3j9mhv6dvi9iv345ykpyihm8mby8vyas12bln8d9"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 3018d83840e3..f08433e50b47 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.210"; + version = "5.4.211"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "13l8zh5balciqhi4k4328sznza30v8g871wxcqqka61cij3rc0wl"; + sha256 = "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 4e7cdfc03463..437366d1f6ec 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18880"; - sha256 = "1h5r57iv71hhx5w85m04c17dslib1rlymanbn23ll9qslv5ag4gn"; + rev = "18885"; + sha256 = "1ywd4bhjh6pqxvv20jgadmyvrcrdwf8333z8rzbjy6r0b4fggpra"; } , ... }: diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 6f47992b512c..f5c7daee3429 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -1,30 +1,30 @@ { lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: let - version = "6.11"; + version = "6.12"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; srcUrl = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - sha256 = "sha256-7mpKkOEspGskt9yfSDrdK7CieJ0AectJKTi8TxLnbtk="; + hash = "sha256-Vh8Hyd3Y2tDapXY+xZ+6W+X7SQGDsy1x61L28sieYKw="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - sha256 = "sha256-pb3QdLqdxIf3ybLfPao3MdilTHYjCB1BujYsTQuEMtE="; + hash = "sha256-ZaGn5OzqVzDojJn8bTrbRh1wvYXM7SK91jl96mbNAeA="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - sha256 = "sha256-q2fC4w2/tJ+GaD3ETPP+V3SAApdlLDgr3eE2YcERQXA="; + hash = "sha256-SR80VxKgLrJqO0JGWMMGUuIuIgGgxcVH+5fCWnVqJks="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - sha256 = "sha256-yHWxAscqnLKrG9Clsaiy6wSbyVz4gpvN6AjyirCmIKQ="; + hash = "sha256-9gfKEr3DE4hMWm9QT79mKgURvzn+BKmyppTJhs00u2c="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); manSrc = fetchurl { url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10"; name = "rar.1"; - sha256 = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw="; + hash = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 8202786dde84..28b4a9cbf96a 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -13,11 +13,12 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.0"; + version = "1.2.1"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-45pVR5Au9FYQGqTHefpms0W9pw0WeI6L0Y5Fj5Ovf2c="; + sha256 = "sha256-n5zi0ZI8szoUfubQgXfYYJdFZ3IbEUL8pnkUoC5kxjM="; }; postPatch = '' @@ -127,6 +128,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://www.borgbackup.org"; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage + mainProgram = "borg"; maintainers = with maintainers; [ flokli dotlambda globin ]; }; } diff --git a/pkgs/tools/misc/changelogger/default.nix b/pkgs/tools/misc/changelogger/default.nix index 16968650d3eb..c659aa543595 100644 --- a/pkgs/tools/misc/changelogger/default.nix +++ b/pkgs/tools/misc/changelogger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changelogger"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r/rnYutjETlE05A/kVQEQ6ICtWXW6kMMfPrv1rw5f3Q="; + sha256 = "sha256-AP5cuXAuh5LX6FTsku38Zh1Y4SVaa4l5XEBTMZnYr6g="; }; vendorSha256 = "sha256-RmLSuLZdYpA557xN7fkPZm5ektxvRHil1E2u1qR7EO0=";