From d12c11e30c929383b82603c8b143dbb7bed4f205 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 29 Jul 2020 12:33:39 -0400 Subject: [PATCH] treewide: use nix-update updateScript for packages I maintain --- pkgs/applications/audio/lollypop/default.nix | 8 ++ pkgs/applications/audio/vocal/default.nix | 3 +- .../display-managers/lightdm/default.nix | 8 ++ pkgs/applications/editors/quilter/default.nix | 4 +- pkgs/applications/graphics/fondo/default.nix | 3 +- .../graphics/ideogram/default.nix | 3 +- pkgs/applications/misc/appeditor/default.nix | 3 +- pkgs/applications/misc/cipher/default.nix | 3 +- pkgs/applications/misc/formatter/default.nix | 3 +- pkgs/applications/misc/notejot/default.nix | 4 +- pkgs/applications/misc/olifant/default.nix | 3 +- pkgs/applications/misc/sequeler/default.nix | 4 +- pkgs/applications/misc/tootle/default.nix | 3 +- pkgs/applications/misc/ulauncher/default.nix | 8 ++ .../networking/browsers/eolie/default.nix | 9 +- .../networking/browsers/ephemeral/default.nix | 3 +- .../feedreaders/feedreader/default.nix | 4 +- .../networking/ftp/taxi/default.nix | 4 +- .../instant-messengers/fractal/default.nix | 7 ++ .../networking/p2p/torrential/default.nix | 3 +- pkgs/applications/networking/ping/default.nix | 3 +- .../networking/weather/meteo/default.nix | 9 +- pkgs/applications/office/aesop/default.nix | 4 +- pkgs/applications/office/agenda/default.nix | 3 +- pkgs/applications/office/envelope/default.nix | 3 +- pkgs/applications/office/khronos/default.nix | 3 +- pkgs/applications/office/notes-up/default.nix | 3 +- pkgs/applications/office/spice-up/default.nix | 3 +- .../applications/office/timetable/default.nix | 3 +- pkgs/applications/system/monitor/default.nix | 3 +- pkgs/applications/video/celluloid/default.nix | 7 ++ pkgs/applications/video/peek/default.nix | 8 ++ pkgs/common-updater/nix-update.nix | 5 ++ pkgs/data/themes/adwaita-qt/default.nix | 4 +- .../mpris-indicator-button/default.nix | 8 ++ .../pantheon/apps/appcenter/default.nix | 7 +- .../apps/elementary-calculator/default.nix | 3 +- .../apps/elementary-calendar/default.nix | 3 +- .../apps/elementary-camera/default.nix | 3 +- .../pantheon/apps/elementary-code/default.nix | 3 +- .../apps/elementary-feedback/default.nix | 3 +- .../apps/elementary-files/default.nix | 3 +- .../apps/elementary-music/default.nix | 3 +- .../apps/elementary-photos/default.nix | 3 +- .../elementary-screenshot-tool/default.nix | 3 +- .../apps/elementary-terminal/default.nix | 3 +- .../apps/elementary-videos/default.nix | 3 +- .../pantheon/apps/sideload/default.nix | 3 +- .../apps/switchboard-plugs/a11y/default.nix | 3 +- .../apps/switchboard-plugs/about/default.nix | 3 +- .../applications/default.nix | 3 +- .../switchboard-plugs/bluetooth/default.nix | 3 +- .../switchboard-plugs/datetime/default.nix | 3 +- .../switchboard-plugs/display/default.nix | 3 +- .../switchboard-plugs/keyboard/default.nix | 3 +- .../mouse-touchpad/default.nix | 3 +- .../switchboard-plugs/network/default.nix | 3 +- .../notifications/default.nix | 3 +- .../onlineaccounts/default.nix | 3 +- .../pantheon-shell/default.nix | 4 +- .../apps/switchboard-plugs/power/default.nix | 3 +- .../switchboard-plugs/printers/default.nix | 3 +- .../security-privacy/default.nix | 3 +- .../switchboard-plugs/sharing/default.nix | 3 +- .../apps/switchboard-plugs/sound/default.nix | 3 +- .../pantheon/apps/switchboard/default.nix | 3 +- .../artwork/elementary-gtk-theme/default.nix | 3 +- .../artwork/elementary-icon-theme/default.nix | 3 +- .../elementary-sound-theme/default.nix | 3 +- .../artwork/elementary-wallpapers/default.nix | 3 +- pkgs/desktops/pantheon/default.nix | 4 - .../elementary-default-settings/default.nix | 3 +- .../desktop/elementary-greeter/default.nix | 3 +- .../desktop/elementary-onboarding/default.nix | 3 +- .../desktop/elementary-print-shim/default.nix | 3 +- .../elementary-session-settings/default.nix | 3 +- .../elementary-shortcut-overlay/default.nix | 3 +- .../pantheon/desktop/gala/default.nix | 3 +- .../applications-menu/default.nix | 3 +- .../bluetooth/default.nix | 3 +- .../wingpanel-indicators/datetime/default.nix | 3 +- .../wingpanel-indicators/keyboard/default.nix | 3 +- .../wingpanel-indicators/network/default.nix | 3 +- .../nightlight/default.nix | 3 +- .../notifications/default.nix | 3 +- .../wingpanel-indicators/power/default.nix | 3 +- .../wingpanel-indicators/session/default.nix | 3 +- .../wingpanel-indicators/sound/default.nix | 3 +- .../pantheon/desktop/wingpanel/default.nix | 3 +- pkgs/desktops/pantheon/granite/default.nix | 3 +- .../pantheon/nixpkgs_github_update/.envrc | 1 - .../nixpkgs_github_update/.formatter.exs | 4 - .../pantheon/nixpkgs_github_update/.gitignore | 32 ------- .../nixpkgs_github_update/default.nix | 53 ------------ .../lib/nixpkgs_github_update/cli.ex | 71 ---------------- .../github_latest_version.ex | 42 --------- .../lib/nixpkgs_github_update/nix.ex | 85 ------------------- .../pantheon/nixpkgs_github_update/mix.exs | 28 ------ .../pantheon/nixpkgs_github_update/shell.nix | 19 ----- .../nixpkgs_github_update/test/nix_test.exs | 49 ----------- .../test/test_helper.exs | 1 - .../pantheon/services/contractor/default.nix | 3 +- .../elementary-capnet-assist/default.nix | 3 +- .../elementary-dpms-helper/default.nix | 3 +- .../pantheon-agent-geoclue2/default.nix | 3 +- .../pantheon-agent-polkit/default.nix | 3 +- pkgs/desktops/pantheon/update.nix | 6 +- .../libraries/graphene/default.nix | 5 ++ .../libraries/libsignon-glib/default.nix | 8 +- .../libraries/qgnomeplatform/default.nix | 3 +- .../screensavers/light-locker/default.nix | 3 +- pkgs/tools/misc/hashit/default.nix | 4 +- pkgs/tools/text/snippetpixie/default.nix | 3 +- pkgs/top-level/all-packages.nix | 4 +- 114 files changed, 272 insertions(+), 494 deletions(-) create mode 100644 pkgs/common-updater/nix-update.nix delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/.envrc delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/default.nix delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs delete mode 100644 pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index fc4d211e3987..f325185920d7 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,6 @@ { lib , fetchgit +, nix-update-script , meson , ninja , pkgconfig @@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 6ef992ffff67..b519003a9ec9 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , cmake , ninja , vala @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 1a65ebd33577..19ebedf1ea33 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , substituteAll , plymouth , pam @@ -127,6 +128,13 @@ stdenv.mkDerivation rec { rm -rf $out/etc/apparmor.d $out/etc/init $out/etc/pam.d ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = { homepage = "https://github.com/CanonicalLtd/lightdm"; description = "A cross-desktop display manager"; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 8fa85ab75570..c5062ab725a8 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, vala +{ stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , libgee, discount, wrapGAppsHook }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index cd0ee8e662b9..e80fbee1b71e 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , vala , pkgconfig @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 4bf414cf8dd5..9ae7ae2cb8ce 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , vala , pkgconfig @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 38b51efa240e..ab58f9237647 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , vala , meson , ninja @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index eef05fe91d20..630519ff2bff 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index b0224c052c4e..85a70812cad1 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 3498ef278675..d5d6aea49461 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, pantheon +{ stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index b3b2857df52c..4358de03b5b1 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , vala , meson @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 6f43774a128a..d19621761407 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, nix-update-script , vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 904782f3e1f8..9c6008b79349 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , vala , meson @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index a9713ffed38a..81e273dd39d8 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, nix-update-script , python3Packages , gdk-pixbuf , glib @@ -103,6 +104,13 @@ python3Packages.buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}") ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "A fast application launcher for Linux, written in Python, using GTK"; homepage = "https://ulauncher.io/"; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index cfccacf1ae08..ca868a080774 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig +{ stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook }: @@ -57,6 +57,13 @@ python3.pkgs.buildPythonApplication rec { patchPythonScript "$out/libexec/eolie-sp" ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "A new GNOME web browser"; homepage = "https://wiki.gnome.org/Apps/Eolie"; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 69e8179489cf..550076787788 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , desktop-file-utils , vala , gettext @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index df266e18c23c..d050b75ac30a 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 +{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index b6c8a534545b..c629a8a07cd8 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, vala +{ stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 05767d1a9cd6..a516c0a251d1 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, nix-update-script , fetchpatch , meson , ninja @@ -78,6 +79,12 @@ rustPlatform.buildRustPackage rec { checkPhase = null; installPhase = null; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index e432818bec75..d62e3b3b5a3f 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , cmake , pkgconfig , vala_0_40 @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index ed63a72f2109..8e4125ac72aa 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 9887e34d7354..c0591f24c96d 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 -, json-glib, libsoup, webkitgtk, geocode-glib +, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 4f8c115600af..0e76c101545b 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, vala, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3 +{ stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index f7028ad67659..32cb2988ae30 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 2a2f55a27a40..450b52bc0ca1 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , meson , ninja @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 1962528f6b68..b5cb94cda9b2 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 055b3a41d091..6936387fb3cc 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , vala_0_46 @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes"; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index fed00000af3a..0cf7e8c53f14 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , cmake , gdk-pixbuf @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index 1f1d44e74948..838b1724ee86 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , glib , gtk3 , vala @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 637f20a0eb35..30ae9e51e9eb 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 208cbb7f4e6a..80a30852daee 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , python3 @@ -49,6 +50,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Simple GTK frontend for the mpv video player"; longDescription = '' diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 24c44c248f58..6ca5c5bed212 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , gettext @@ -68,6 +69,13 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]}) ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix new file mode 100644 index 000000000000..13b85bf52fff --- /dev/null +++ b/pkgs/common-updater/nix-update.nix @@ -0,0 +1,5 @@ +{ nix-update }: + +{ attrPath }: + +[ "${nix-update}/bin/nix-update" attrPath ] diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index c5c9bbbe37f0..ace93fa44950 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase, pantheon }: +{ mkDerivation, lib, fetchFromGitHub, nix-update-script, cmake, ninja, qtbase, pantheon }: mkDerivation rec { pname = "adwaita-qt"; @@ -27,7 +27,7 @@ mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix index 0c1d98b2fae0..4bf4b7508176 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , gnome3 }: @@ -23,6 +24,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = "gnomeExtensions.${pname}"; + }; + }; + + meta = with stdenv.lib; { description = "A simple MPRIS indicator button for GNOME Shell"; license = licenses.gpl3; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 21e06a7fa6b4..243238938386 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -1,4 +1,5 @@ { stdenv +, nix-update-script , appstream , appstream-glib , dbus @@ -30,17 +31,17 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "04q2gp9yyqsg4jd53rivcmikw52psxijrzfy2vxzjsx8fccd48ra"; + sha256 = "1bwkjxl4k49hvy88llif82hdancda9692vjwkw4bxy2cbz8444zx"; }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index f2f6faedc5ad..058148e07c82 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index adaec2498b86..cdb5e860650c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 712f2bec8d5e..9874d87eae9f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 086e0cf7a57b..635b5cfc7352 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index e54841275f6f..3b257b0812f0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 6ada1a340d17..f6215e5025b2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 85739a6ec2ec..8849965eddec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 5c6d34a55a51..252791df1d5f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 078d496bf0db..611e683491fc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index f9f81c37a4b9..c7c1c8780ed6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , pkgconfig @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 8079d4e7887a..03b730cecac5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 379eede979f6..05f0f40db4a7 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -1,5 +1,6 @@ { stdenv , desktop-file-utils +, nix-update-script , elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 6348f7c93a30..d7a50fc7e5cc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,6 +1,7 @@ { stdenv , substituteAll , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 770121736568..3c810a5f4f32 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , substituteAll , meson @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 9cd92d0a5ed8..e5f423bea8a7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index a353dee27e58..425d27858783 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 60762b13e019..ee714e1962e5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index c1017e2dbddd..568d9bd24c8d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 10468cdc553b..5f55edb77c7d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , fetchpatch , substituteAll @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index c2b973f76160..27c7db368da0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 4a4874e3a326..f6a22af75d7f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 30df180eeb76..09c61e1625da 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 902703bc75e5..cbe65e68a611 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index a70fee63094f..af65327fb82a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib +{ stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop , gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 7357a790b360..1405fb698d13 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , substituteAll , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 8280ba483b86..fcb1f26eb966 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index e2732f3bd039..df62a0b34b6a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , python3 @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 55ed654f75fa..515660739d39 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , meson @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 671c7d4544af..6f89331593c3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 4c8e30bdbe8c..990187900535 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 9deee9c9abe1..78267e1bdd4a 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index febec3144a96..39d23c05b745 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , python3 @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index f95e68153058..2abe677d748a 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 82f45c95d611..2d54580d3e65 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index edcda8877544..8bae6f8fefe5 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -23,10 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - nixpkgs-github-update = callPackage ./nixpkgs_github_update { }; - - updateScript = callPackage ./update.nix { }; - maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; mutter = pkgs.gnome3.mutter334; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 91755b5a2266..81cb4b51dc48 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index da18ab26e083..42eb8fb37715 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , linkFarm , substituteAll , elementary-greeter @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 44766c7202b9..2bfa1c220886 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , fetchpatch , pkgconfig @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index e8ea57b8bb9a..0d6de8a77d50 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 304009aa9b84..dba3c8895087 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , substituteAll , desktop-file-utils , pkg-config @@ -120,7 +121,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 9578c4e025fb..798757ba726e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 4519a2287f7f..eb865d695e29 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , pkgconfig @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index deb6a958a22b..45141dc1d3d9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , substituteAll , meson @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 979d6af8f0cc..310f908d35d8 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 494af85ecf3a..1d2d94ad01aa 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 120cf8260a9f..838c592c989f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 652648b6884c..76d6368fcebc 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 9ec593afe4a8..30456eee461a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index d8d5f44b82bc..bf206868f944 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , fetchpatch @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 907b31d930a6..ac9f07232f12 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index e93135258210..410acc373302 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , fetchpatch , pantheon , pkgconfig @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index cd387a9fca48..eb1d4807325f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 99cd7b69c1cc..0c456b13111e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , wrapGAppsHook , pkgconfig @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 431c33661052..69b53c78ed2e 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , python3 , meson , ninja @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc b/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc deleted file mode 100644 index 1d953f4bd735..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs deleted file mode 100644 index d2cda26eddc9..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs +++ /dev/null @@ -1,4 +0,0 @@ -# Used by "mix format" -[ - inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] -] diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore b/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore deleted file mode 100644 index 877c95f1f63b..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# The directory Mix will write compiled artifacts to. -_build/ - -# If you run "mix test --cover", coverage assets end up here. -cover/ - -# The directory Mix downloads your dependencies sources to. -deps/ - -# Where third-party dependencies like ExDoc output generated docs. -doc/ - -# Ignore .fetch files in case you like to edit your project deps locally. -.fetch - -# If the VM crashes, it generates a dump, let's ignore it too. -erl_crash.dump - -# Also ignore archive artifacts (built via "mix archive.build"). -*.ez - -# Ignore package tarball (built via "mix hex.build"). -nixpkgs_github_update-*.tar - -# Ignore elixir_ls -.elixir_ls - -# mix escript.build result -nixpkgs_github_update - -# lockfile. only because this is nixpkgs. -mix.lock diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix deleted file mode 100644 index 834291222cf0..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, beamPackages -, makeWrapper -, common-updater-scripts -}: - -let - - poison_4 = beamPackages.buildMix { - name = "poison"; - version = "4.0.1"; - - src = beamPackages.fetchHex { - pkg = "poison"; - version = "4.0.1"; - sha256 = "098gdz7xzfmnjzgnnv80nl4h3zl8l9czqqd132vlnfabxbz3d25s"; - }; - }; - - -in - -beamPackages.buildMix { - name = "nixpkgs-github-update"; - version = "0.1.0"; - - src = lib.cleanSource ./.; - - nativeBuildInputs = [ - makeWrapper - ]; - - beamDeps = with beamPackages; [ erlang poison_4 ]; - - buildPhase = '' - export HEX_OFFLINE=1 - export HEX_HOME=`pwd` - export MIX_ENV=prod - export MIX_NO_DEPS=1 - - mix escript.build --no-deps-check - ''; - - installPhase = '' - mkdir -p $out/bin - cp nixpkgs_github_update $out/bin - ''; - - postFixup = '' - wrapProgram $out/bin/nixpkgs_github_update \ - --prefix PATH : "${lib.makeBinPath [ common-updater-scripts ]}" - ''; -} diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex deleted file mode 100644 index e735c4285169..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex +++ /dev/null @@ -1,71 +0,0 @@ -defmodule NixpkgsGitHubUpdate.CLI do - @moduledoc """ - Run updates on Nix Expressions that use fetchFromGitHub. - - Arguments the script accepts: - --attribute - - Example usage: - ``` - ./nixpkgs_github_update --attribute "notes-up" - ``` - """ - alias NixpkgsGitHubUpdate.{Nix, GitHubLatestVersion} - - def help do - IO.puts(""" - Run updates on Nix Expressions that use fetchFromGitHub. - - Arguments the script accepts: - --attribute - - Example usage: - ./nixpkgs_github_update --attribute "notes-up" - """) - end - - def main([]) do - help() - end - - def main(args) do - opts = parse_args(args) - - attribute = opts[:attribute] - - case Nix.attribute_exists?(attribute) do - true -> update(attribute) - _ -> exit("Requested attribute doesn't exist.") - end - end - - def parse_args(args) do - {options, _, _} = - args - |> OptionParser.parse(strict: [attribute: :string]) - - options - end - - def update(attribute) do - version = - Nix.get_owner_repo(attribute) - |> GitHubLatestVersion.fetch() - |> decode_response() - |> construct_version() - - Nix.update_source_version(attribute, version) - end - - def decode_response({:ok, response}), do: response - - def decode_response({:error, error}) do - IO.puts("Error getting latest release from GitHub: #{error["message"]}") - System.halt(2) - end - - def construct_version(response) do - Map.get(response, "tag_name") - |> String.trim_leading("v") - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex deleted file mode 100644 index 5333ad154f5b..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex +++ /dev/null @@ -1,42 +0,0 @@ -defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do - @user_agent 'httpc' - - def fetch({owner, repo}) do - endpoint = releases_endpoint(owner, repo) - headers = construct_headers() - - :httpc.request(:get, {endpoint, headers}, [], []) - |> handle_response - end - - def releases_endpoint(owner, repo) do - 'https://api.github.com/repos/#{owner}/#{repo}/releases/latest' - end - - def construct_headers do - headers = %{'User-Agent' => @user_agent} - - put_token(headers, get_token()) - |> Map.to_list - end - - defp get_token do - System.get_env("OAUTH_TOKEN") - end - - defp put_token(headers, token) when token != nil do - Map.put_new(headers, 'Authorization', 'token #{String.to_charlist(token)}') - end - - defp put_token(headers, _), do: headers - - def handle_response({_, {{_httpv, status_code, _}, _headers, response}}) do - { - status_code |> check_for_error(), - response |> Poison.Parser.parse!(%{}) - } - end - - defp check_for_error(200), do: :ok - defp check_for_error(_), do: :error -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex deleted file mode 100644 index d5d9af84a6ba..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex +++ /dev/null @@ -1,85 +0,0 @@ -defmodule NixpkgsGitHubUpdate.Nix do - def executable do - nix = System.find_executable("nix") - - if nix == nil do - raise RuntimeError, message: "missing executable for 'nix'" - end - - nix - end - - def eval!(attribute) do - System.cmd( - executable(), - [ - "eval", - "--json", - attribute - ], - stderr_to_stdout: true - ) - |> handle_eval - end - - defp handle_eval({eval_result, 0}) do - case eval_result do - "" -> eval_result - _ -> Poison.Parser.parse!(eval_result, %{}) - end - end - - defp handle_eval({eval_result, _}) do - raise RuntimeError, message: "Error running nix eval: #{eval_result}" - end - - def attribute_exists?(attribute) do - attr_exist_expression = """ - with import {}; - - let - attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." "#{attribute}") null pkgs; - in - if attrSet == null then false - else true - """ - - eval!("(#{attr_exist_expression})") - end - - def update_source_version(attribute, version) do - System.cmd("update-source-version", [ - attribute, - version - ]) - end - - def get_url_attr(attribute) do - case attribute_exists?("#{attribute}.src.fetchSubmodules") do - true -> "url" - false -> "urls" - end - end - - def get_owner_repo(attribute) do - url_attr = get_url_attr(attribute) - - eval!("nixpkgs.#{attribute}.src.#{url_attr}") - |> case do - # It's fetchFromGitHub if we got a list - [url | _] -> - URI.parse(url).path - |> String.split("/archive", trim: true) - |> List.first() - |> String.split("/", trim: true) - - # It's fetchgit if we got a plain string - url -> - URI.parse(url).path - |> String.split(".git", trim: true) - |> List.first() - |> String.split("/", trim: true) - end - |> List.to_tuple() - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs deleted file mode 100644 index 3498c7066a43..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs +++ /dev/null @@ -1,28 +0,0 @@ -defmodule NixpkgsGitHubUpdate.MixProject do - use Mix.Project - - def project do - [ - app: :nixpkgs_github_update, - version: "0.1.0", - elixir: "~> 1.9", - escript: [main_module: NixpkgsGitHubUpdate.CLI], - start_permanent: Mix.env() == :prod, - deps: deps() - ] - end - - # Run "mix help compile.app" to learn about applications. - def application do - [ - extra_applications: [:logger, :inets, :ssl] - ] - end - - # Run "mix help deps" to learn about dependencies. - defp deps do - [ - {:poison, "~> 4.0.1"} - ] - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix deleted file mode 100644 index 0bb4e58a6a12..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix +++ /dev/null @@ -1,19 +0,0 @@ -with import {}; - -let - inherit (lib) optional; -in - -mkShell rec { - name = "nixpkgs-github-update-shell"; - - buildInputs = [ - elixir - erlang - common-updater-scripts - ] - ++ optional stdenv.isLinux libnotify # For ExUnit Notifier on Linux. - ++ optional stdenv.isLinux inotify-tools # For file_system on Linux. - ; - -} diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs deleted file mode 100644 index c5a57698fed6..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs +++ /dev/null @@ -1,49 +0,0 @@ -defmodule NixTest do - @fake_package "asanotehhhuh" - @fetchgit_package "polybar" - @fetchgithub_package "notes-up" - - use ExUnit.Case - - import NixpkgsGitHubUpdate.Nix - - def check_for_nix(_context) do - try do - executable() - rescue - RuntimeError -> - IO.puts("You need Nix installed to run these tests.") - System.halt(127) - end - - :ok - end - - setup_all :check_for_nix - - describe "evaluation tests" do - test "evaluation handling" do - exists_attr = "nixpkgs.#{@fetchgithub_package}" - - assert is_binary(eval!(exists_attr)) == true - catch_error(eval!(@fake_package) == 1) - end - - # This should always be true or false - test "package exists?" do - assert attribute_exists?(@fetchgithub_package) == true - assert attribute_exists?(@fake_package) == false - end - end - - test "owner repo" do - assert get_url_attr(@fetchgit_package) == "url" - assert get_url_attr(@fetchgithub_package) == "urls" - - assert get_owner_repo(@fetchgit_package) == - {@fetchgit_package, @fetchgit_package} - - assert get_owner_repo(@fetchgithub_package) == - {"Philip-Scott", String.capitalize(@fetchgithub_package)} - end -end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs deleted file mode 100644 index 869559e709ea..000000000000 --- a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs +++ /dev/null @@ -1 +0,0 @@ -ExUnit.start() diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 68532bdd8120..11152defc654 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , python3 @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 7f17fb5d5a9d..2f7bfaa155bb 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 7eeb156e0281..b8c87cfd546e 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , meson , ninja @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 905e2cc9aadf..4b9be31015a2 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 341d166f6877..61679320505c 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pantheon , pkgconfig , meson @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 1137c5330169..e169dce4be46 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -1,6 +1,8 @@ -{ nixpkgs-github-update }: +{ nix-update }: { attrPath }: -[ "${nixpkgs-github-update}/bin/nixpkgs_github_update" "--attribute" attrPath ] +# We're using nix-update https://github.com/Mic92/nix-update which can technically +# update way more than just pantheon. +[ "${nix-update}/bin/nix-update" attrPath ] diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 3fc0094f104f..ee147d82afdb 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , pkgconfig , meson , ninja @@ -62,6 +63,10 @@ stdenv.mkDerivation rec { tests = { installedTests = nixosTests.installed-tests.graphene; }; + + updateScript = nix-update-script { + attrPath = pname; + }; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 77a43872d4ea..1f453dc291e4 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: +{ stdenv, fetchgit, nix-update-script, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobject-introspection }: stdenv.mkDerivation rec { pname = "libsignon-glib"; @@ -42,6 +42,12 @@ stdenv.mkDerivation rec { patchShebangs build-aux/gen-error-map.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index a82d048b32b2..3ff642bbfb98 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchFromGitHub +, nix-update-script , pkgconfig , gtk3 , glib @@ -52,7 +53,7 @@ mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 4d257650338c..c4915bec8959 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , pkgconfig @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 5793382838b9..e33201c706ba 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 991b496777c2..002615077467 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4871dc63da0..ec10503b4657 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -94,6 +94,8 @@ in genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + nix-update-script = callPackage ../common-updater/nix-update.nix { }; + ### Push NixOS tests inside the fixed point nixosTests = import ../../nixos/tests/all-tests.nix { @@ -7344,7 +7346,7 @@ in uget = callPackage ../tools/networking/uget { }; uget-integrator = callPackage ../tools/networking/uget-integrator { }; - + ugrep = callPackage ../tools/text/ugrep { }; uif2iso = callPackage ../tools/cd-dvd/uif2iso { };