From 7d535edec55aca6999b091a1eb21510c964ddd3b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 21 Mar 2021 00:57:24 +0100 Subject: [PATCH] gnome3: support new versioning scheme in the update script https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235 --- .../editors/gnome-builder/default.nix | 6 ++- .../editors/gnome-latex/default.nix | 5 ++- pkgs/applications/graphics/gthumb/default.nix | 1 + .../evolution/evolution-ews/default.nix | 1 + .../evolution/evolution/default.nix | 1 + pkgs/applications/office/gnumeric/default.nix | 1 + .../version-management/meld/default.nix | 1 + .../gnome-3/apps/accerciser/default.nix | 1 + .../core/evolution-data-server/default.nix | 1 + .../gnome-3/core/libgnome-keyring/default.nix | 7 ---- pkgs/desktops/gnome-3/core/rygel/default.nix | 1 + pkgs/desktops/gnome-3/find-latest-version.py | 39 +++++++++++++------ .../gnome-3/misc/gnome-applets/default.nix | 1 + .../gnome-3/misc/gnome-flashback/default.nix | 1 + .../gnome-3/misc/gnome-panel/default.nix | 1 + .../misc/libgnome-games-support/default.nix | 1 + .../gnome-3/misc/metacity/default.nix | 1 + .../gnome-3/misc/nautilus-python/default.nix | 1 + pkgs/desktops/gnome-3/update.nix | 4 +- pkgs/development/libraries/amtk/default.nix | 11 +++++- .../libraries/at-spi2-atk/default.nix | 1 + .../libraries/at-spi2-core/default.nix | 1 + pkgs/development/libraries/atk/default.nix | 1 + pkgs/development/libraries/atkmm/default.nix | 1 + .../libraries/clutter-gst/default.nix | 1 + .../libraries/clutter-gtk/default.nix | 1 + .../development/libraries/clutter/default.nix | 1 + pkgs/development/libraries/cogl/default.nix | 1 + pkgs/development/libraries/dconf/default.nix | 1 + pkgs/development/libraries/gcr/default.nix | 1 + .../libraries/gdk-pixbuf/default.nix | 1 + pkgs/development/libraries/gexiv2/default.nix | 1 + .../libraries/gfbgraph/default.nix | 1 + .../libraries/glib-networking/default.nix | 1 + pkgs/development/libraries/glibmm/default.nix | 1 + .../gobject-introspection/default.nix | 1 + .../development/libraries/goffice/default.nix | 1 + pkgs/development/libraries/gom/default.nix | 1 + .../libraries/goocanvasmm/default.nix | 1 + pkgs/development/libraries/gsound/default.nix | 1 + .../gstreamer/gstreamermm/default.nix | 4 +- pkgs/development/libraries/gtkmm/3.x.nix | 1 + .../libraries/gtksourceview/4.x.nix | 1 + .../libraries/gupnp-av/default.nix | 1 + .../libraries/gupnp-dlna/default.nix | 1 + .../libraries/gupnp-igd/default.nix | 1 + pkgs/development/libraries/gvfs/default.nix | 1 + .../libraries/json-glib/default.nix | 1 + .../libraries/jsonrpc-glib/default.nix | 1 + pkgs/development/libraries/lasem/default.nix | 1 + .../libraries/libchamplain/default.nix | 1 + .../libraries/libcryptui/default.nix | 1 + pkgs/development/libraries/libepc/default.nix | 1 + pkgs/development/libraries/libgda/6.x.nix | 1 + pkgs/development/libraries/libgda/default.nix | 1 + .../libraries/libgdamm/default.nix | 1 + pkgs/development/libraries/libgee/default.nix | 1 + .../libraries/libgnomekbd/default.nix | 11 ++++-- pkgs/development/libraries/libgsf/default.nix | 1 + .../development/libraries/libgtop/default.nix | 1 + .../libraries/libgweather/default.nix | 1 + .../libraries/libhttpseverywhere/default.nix | 1 + .../libraries/libmanette/default.nix | 1 + .../development/libraries/libpeas/default.nix | 1 + .../development/libraries/librest/default.nix | 1 + .../development/libraries/librsvg/default.nix | 1 + .../libraries/libsigcxx/default.nix | 1 + .../development/libraries/libsoup/default.nix | 1 + pkgs/development/libraries/libwnck/3.x.nix | 1 + .../libraries/libxmlxx/default.nix | 1 + .../libraries/libzapojit/default.nix | 1 + pkgs/development/libraries/pango/default.nix | 1 + .../development/libraries/pangomm/default.nix | 1 + pkgs/development/libraries/rarian/default.nix | 6 --- .../libraries/template-glib/default.nix | 1 + pkgs/development/libraries/tepl/default.nix | 5 ++- .../libraries/totem-pl-parser/default.nix | 1 + pkgs/development/libraries/vte/default.nix | 11 ++++-- .../python-modules/pyatspi/default.nix | 1 + .../python-modules/pygobject/3.36.nix | 7 ---- .../python-modules/pygobject/3.nix | 1 + .../tools/profiling/sysprof/default.nix | 1 + pkgs/tools/networking/gupnp-tools/default.nix | 1 + .../networkmanager/applet/default.nix | 1 + .../networkmanager/fortisslvpn/default.nix | 1 + .../networkmanager/libnma/default.nix | 1 + .../networkmanager/openconnect/default.nix | 1 + .../networkmanager/openvpn/default.nix | 1 + .../networkmanager/vpnc/default.nix | 1 + 89 files changed, 143 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index da7b70cecd2a..39ab6911febc 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" # Making the build system correctly detect clang header and library paths @@ -135,7 +134,10 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { description = "An IDE for writing GNOME-based software"; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 7967b78f13c2..a1cb03ae9e34 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -35,7 +35,10 @@ in stdenv.mkDerivation { doCheck = true; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 26de91ee2252..1d1004953250 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3471795b435b..76df11af2a1d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "evolution-ews"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e17507366ffa..4c9c84fcb1d0 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "evolution"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 263a555ab4c1..f65781352b3f 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 89e3a5ea0b53..95a9f2d72424 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 2f8163adc728..e634037b8719 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { updateScript = gnome3.updateScript { packageName = "accerciser"; attrPath = "gnome3.accerciser"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index dc43bdfd4932..9c541bb06a15 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index 65d2bbc2157a..f4b76996ac4b 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -17,13 +17,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 75b2bd292704..da82d30214ee 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py index ad80af24bcb8..3078999e3e5b 100644 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -3,14 +3,21 @@ import math import json import requests import sys +from libversion import Version +from typing import Optional def version_to_list(version): return list(map(int, version.split("."))) -def odd_unstable(version_str, selected): - version = version_to_list(version_str) +def odd_unstable(version: Version, selected): + try: + version = version_to_list(version.value) + except: + # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. + return selected != "stable" + if len(version) < 2: return True @@ -23,28 +30,34 @@ def odd_unstable(version_str, selected): return True -def no_policy(version, selected): +def tagged(version: Version, selected): + if selected == "stable": + return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) + else: + return True + + +def no_policy(version: Version, selected): return True version_policies = { "odd-unstable": odd_unstable, + "tagged": tagged, "none": no_policy, } -def make_version_policy(version_predicate, selected, upper_bound): +def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]): if not upper_bound: - upper_bound = [math.inf, math.inf] + return lambda version: version_predicate(version, selected) else: - upper_bound = version_to_list(upper_bound) - - return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound + return lambda version: version_predicate(version, selected) and version < upper_bound parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") -parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged") parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") @@ -55,6 +68,8 @@ if __name__ == "__main__": package_name = getattr(args, "package-name") requested_release = getattr(args, "requested-release") upper_bound = getattr(args, "upper-bound") + if upper_bound: + upper_bound = Version(upper_bound) version_predicate = version_policies[getattr(args, "version-policy")] version_policy = make_version_policy(version_predicate, requested_release, upper_bound) @@ -64,11 +79,11 @@ if __name__ == "__main__": print("Unknown format of cache.json file.", file=sys.stderr) sys.exit(1) - versions = cache[2][package_name] - versions = sorted(filter(version_policy, versions), key=version_to_list) + versions = map(Version, cache[2][package_name]) + versions = sorted(filter(version_policy, versions)) if len(versions) == 0: print("No versions matched.", file=sys.stderr) sys.exit(1) - print(versions[-1]) + print(versions[-1].value) diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 1947179028bf..3c9de8eb2c93 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 935778aa6490..d74fc1bf0ab7 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -123,6 +123,7 @@ let updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; mkSessionForWm = { wmName, wmLabel, wmCommand }: diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index b820f7750dc0..10dbfadba2d5 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 01899d20b577..0106ebe41855 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index c74d57d9f4dd..7c913fe0b95a 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4db81228a073..0008f66e9adf 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 1bceddf77eb5..928eac45160a 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,8 +1,8 @@ { stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: -{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }: +{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }: let - python = python3.withPackages (p: [ p.requests ]); + python = python3.withPackages (p: [ p.requests p.libversion ]); upperBoundFlag = let package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index f144f847bcf0..b3766ddc75c7 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,6 +1,8 @@ { lib, stdenv , fetchurl , gtk3 +, meson +, ninja , pkg-config , gobject-introspection , gnome3 @@ -18,6 +20,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + meson + ninja pkg-config dbus gobject-introspection @@ -32,10 +36,13 @@ stdenv.mkDerivation rec { export NO_AT_BRIDGE=1 ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --print-errorlogs ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Amtk"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 1e5a1d3fd64c..881c411db392 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 7e1181cf3bdf..4f573976a0fa 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 53eb4459770d..e0cdb3a9b4c3 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index e9c63eb650f7..123e7c984fcf 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 166d4e12c252..f2caa0bd3d55 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 0dfb8c7b9df0..8dfe6781740b 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 002db004dc19..2d0f57f279a6 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 8fd152072879..9962ebf09e88 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -61,6 +61,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 6834a605f1a5..709beacd3c84 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 92c0ec293cb2..a057dc6c1cce 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 2d8e60d06a73..42e4a9773181 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 071e749b4002..958e524aa09c 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index e3550b82a965..4cbc6f341dc4 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 585897341662..1e320c873a2f 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index a9abfbd17764..e952ab04cc06 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index ae65f5aed280..8b535f0f8e12 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 64b5be2e2d33..f3580e904b85 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 4b5effefa57c..56036897ad8e 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 632e434631c9..11ea1e40ab96 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "goocanvasmm2"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 2a3e846d38d6..9f656a428f5b 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 2c683a84da4d..ae361366ac1c 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; # Unpredictable version stability + packageName = "gst_all_1.gstreamermm"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 950e1a976a62..8c14e76b444e 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "${pname}3"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 9ead894e0d25..c6ad8fbeda66 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview4"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 9bf39d94aed3..74a5e6c6d45d 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index e11d86f82e19..be249e0fdcac 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 233eb7e3c85f..93240fc8b33f 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 2c9bac002fd3..f16be1c23299 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index ed086dac90fb..110dcad16e05 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 1ec9c3da41e2..170ae424dcc6 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 22f0436edca9..953cf20afdbc 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 22a062acd6ef..3ad01ba871ea 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 5fdd60abe115..4b60e27a99f7 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index ee8dfb6e94f7..0656f3a2ee91 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index fc24fe41c4d3..6474aceb4173 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "libgda6"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 307cc14a6efe..1599a7868712 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -86,6 +86,7 @@ assert postgresSupport -> postgresql != null; passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 44a0e8bc2121..15ff99f3a556 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -26,6 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 407b99b5a57b..12adf5c50996 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 62228b8837a8..23261020cc11 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; - nativeBuildInputs = [ file intltool @@ -29,6 +25,13 @@ stdenv.mkDerivation rec { glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Keyboard management library"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 77fa161b773a..bfa0b861dd84 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index af4fe04a0b42..c919e667766a 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 9351d3f707fa..b44b77d5f235 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 648eb89a514a..871aafeafd6b 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 76dd4eb20c1a..4e5f44dd1535 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index a8ef9e2f9bb2..43cb30248b90 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index 7b1ff8235aac..3b30181c3267 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "librest"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index efdbf5934630..2df3d8e270e2 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index c933d92f3255..01fefa145226 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "libsigcxx"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 47fcdd41f8ab..64519dc355d4 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPackages = [ glib-networking.out ]; updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 3792b826f594..5fb405f880e8 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "${pname}${lib.versions.major version}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 19282ddc822d..6db7e1f421b7 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index d16f34039f19..805aaba9773c 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 0369cedebf4c..dbe145a8097e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 3eb5f39c3825..d858288af84f 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 522456cfa40d..aa575f7e72aa 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -15,12 +15,6 @@ in stdenv.mkDerivation rec { ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - meta = with lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = "https://rarian.freedesktop.org/"; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 2c89e3f433ab..e2bf9bbd49a5 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 84d50faf54e2..ca33e2e8264b 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { # correctly installed or GVfs metadata are not supported on this platform. In # the latter case, you should configure Tepl with --disable-gvfs-metadata. - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index c93ec8dccf9b..b559d4f59cf0 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index a17b164445f3..c3c3ace9a7c1 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A="; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; - nativeBuildInputs = [ gettext gobject-introspection @@ -80,6 +76,13 @@ stdenv.mkDerivation rec { patchShebangs src/box_drawing_generate.sh ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 5ae00417b6c0..fc2ec2a98645 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index ccad57eba1ed..27bf8762d591 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -23,13 +23,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "python3.pkgs.${pname}3"; - }; - }; - meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 8c26ec6174b2..3aa75cb7e97d 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}3"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 9e749adea209..b27c66170faa 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 655cf1183022..41828d322e85 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index f6c45fc074d4..cffacddf8bd4 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanagerapplet"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 20388f242ea4..25554b279638 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-fortisslvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 3d9749332255..35f79a773c3d 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 462eb3793d8f..6dbb718a6b64 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -69,6 +69,7 @@ in stdenv.mkDerivation { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-openconnect"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 4a9e508fcdc7..ab87bc8371d2 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-openvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 6ac71efc2603..5181e3160e23 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-vpnc"; + versionPolicy = "odd-unstable"; }; };