alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xfce: remove archiveUpdater and use httpTwoLevelsUpdater for some packages

Browse source
This commit is contained in:
José Romildo 2022-09-27 18:46:24 -03:00
parent 4d62007aa7
commit 3a36ccc075
14 changed files with 65 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix
View file

@ -1,15 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, httpTwoLevelsUpdater }:
let
category = "art";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xfce4-icon-theme"; pname = "xfce4-icon-theme";
version = "4.4.3"; version = "4.4.3";
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/art/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-1HhmktVrilY/ZqXyYPHxOt4R6Gx4y8slqfml/EfPZvo="; sha256 = "sha256-1HhmktVrilY/ZqXyYPHxOt4R6Gx4y8slqfml/EfPZvo=";
}; };
@ -28,7 +24,9 @@ stdenv.mkDerivation rec {
dontDropIconThemeCache = true; dontDropIconThemeCache = true;
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = httpTwoLevelsUpdater {
url = "https://archive.xfce.org/src/art/${pname}";
};
meta = with lib; { meta = with lib; {
homepage = "https://www.xfce.org/"; homepage = "https://www.xfce.org/";

12
pkgs/desktops/xfce/art/xfwm4-themes/default.nix
View file

@ -1,19 +1,17 @@
{ lib, stdenv, fetchurl, xfce }: { lib, stdenv, fetchurl, httpTwoLevelsUpdater }:
let
category = "art";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xfwm4-themes"; pname = "xfwm4-themes";
version = "4.10.0"; version = "4.10.0";
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/art/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU="; sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU=";
}; };
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = httpTwoLevelsUpdater {
url = "https://archive.xfce.org/src/art/${pname}";
};
meta = with lib; { meta = with lib; {
homepage = "https://www.xfce.org/"; homepage = "https://www.xfce.org/";

7
pkgs/desktops/xfce/default.nix
View file

@ -5,13 +5,6 @@ lib.makeScope pkgs.newScope (self: with self; {
genericUpdater = pkgs.genericUpdater; genericUpdater = pkgs.genericUpdater;
archiveUpdater = { category, pname, version }:
pkgs.httpTwoLevelsUpdater {
inherit pname version;
attrPath = "xfce.${pname}";
url = "https://archive.xfce.org/src/${category}/${pname}";
};
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;

7
pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix
View file

@ -7,7 +7,7 @@
, xfce4-panel , xfce4-panel
, libxfce4ui , libxfce4ui
, gtk2 , gtk2
, xfce , gitUpdater
}: }:
let let
@ -33,7 +33,10 @@ in stdenv.mkDerivation rec {
gtk2 gtk2
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib;{ meta = with lib;{
homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix
View file

@ -8,7 +8,7 @@
, libxfce4ui , libxfce4ui
, xfconf , xfconf
, gtk3 , gtk3
, xfce , gitUpdater
}: }:
let let
@ -35,7 +35,10 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix
View file

@ -8,7 +8,7 @@
, libxfce4ui , libxfce4ui
, xfconf , xfconf
, gtk3 , gtk3
, xfce , gitUpdater
}: }:
let let
@ -35,7 +35,10 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
View file

@ -7,7 +7,7 @@
, xfce4-panel , xfce4-panel
, libxfce4ui , libxfce4ui
, gtk3 , gtk3
, xfce , gitUpdater
}: }:
let let
@ -33,7 +33,10 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, xfce4-panel, libxfce4ui, { lib, stdenv, fetchurl, pkg-config, intltool, xfce4-panel, libxfce4ui,
exo, gnutls, libgcrypt, xfce }: exo, gnutls, libgcrypt, gitUpdater }:
let let
category = "panel-plugins"; category = "panel-plugins";
@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
libgcrypt libgcrypt
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, { lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel,
libxfce4ui, gtk3, exo, xfce }: libxfce4ui, gtk3, exo, gitUpdater }:
let let
category = "panel-plugins"; category = "panel-plugins";
@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
exo exo
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
View file

@ -6,7 +6,7 @@
, xfce4-panel , xfce4-panel
, libxfce4ui , libxfce4ui
, xfconf , xfconf
, xfce , gitUpdater
}: }:
let let
@ -31,7 +31,10 @@ in stdenv.mkDerivation rec {
xfconf xfconf
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui, { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui,
libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, gitUpdater
}: }:
let let
@ -38,7 +38,10 @@ stdenv.mkDerivation rec {
"--with-pathnetcat=${netcat-gnu}/bin/netcat" "--with-pathnetcat=${netcat-gnu}/bin/netcat"
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
View file

@ -6,7 +6,7 @@
, xfce4-panel , xfce4-panel
, libxfce4ui , libxfce4ui
, xfconf , xfconf
, xfce , gitUpdater
}: }:
let let
@ -31,7 +31,10 @@ in stdenv.mkDerivation rec {
xfconf xfconf
]; ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: { lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, gitUpdater }:
let let
category = "panel-plugins"; category = "panel-plugins";
@ -28,7 +28,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin";

7
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower, { lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower,
libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, xfce }: libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, gitUpdater }:
let let
category = "panel-plugins"; category = "panel-plugins";
@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; passthru.updateScript = gitUpdater {
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
rev-prefix = "${pname}-";
};
meta = with lib; { meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin";