public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 20:21:58 +07:00
parent a9bb54359e
commit badf51221d
977 changed files with 2613 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix
View File

@@ -5,14 +5,14 @@ stdenv.mkDerivation rec {
version = "0.6.13";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn";
};
outputs = [ "out" "dev" ];
outputBin = "dev";
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxml2 glib ];

4
pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, runCommand
, nixos-artwork
, glib
@@ -36,7 +36,7 @@ let
in
with stdenv.lib;
with lib;
# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
runCommand "cinnamon-gsettings-overrides" {}

8
pkgs/desktops/enlightenment/econnman/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }:
{ lib, stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }:
stdenv.mkDerivation rec {
pname = "econnman";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A user interface for the connman network connection manager";
homepage = "https://enlightenment.org/";
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
license = lib.licenses.lgpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
};
}

4
pkgs/desktops/enlightenment/enlightenment/default.nix
View File

@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
xkeyboard_config
udisks2 # for removable storage mounting/unmounting
]
++ stdenv.lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
++ stdenv.lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
;
patches = [

8
pkgs/desktops/enlightenment/ephoto/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
{ lib, stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
stdenv.mkDerivation rec {
pname = "ephoto";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
homepage = "https://smhouston.us/projects/ephoto/";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.romildo ];
};
}

8
pkgs/desktops/enlightenment/rage/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }:
{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "rage";
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Video + Audio player along the lines of mplayer";
homepage = "https://enlightenment.org/";
maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
maintainers = with lib.maintainers; [ matejc ftrvxmtrx romildo ];
platforms = lib.platforms.linux;
license = lib.licenses.bsd2;
};
}

8
pkgs/desktops/enlightenment/terminology/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }:
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }:
stdenv.mkDerivation rec {
pname = "terminology";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Powerful terminal emulator based on EFL";
homepage = "https://www.enlightenment.org/about-terminology";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
};
}

2
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }:
with stdenv.lib;
with lib;
let
inherit (python2.pkgs) python pygobject2 pygtk dbus-python;

4
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
View File

@@ -1,8 +1,8 @@
{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
, gnome-common, gtk2, pango
, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "gtksourceview";

14
pkgs/desktops/gnome-2/desktop/vte/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
{ lib, stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
, pythonSupport ? false, python27Packages}:
let
@@ -30,13 +30,13 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib gtk2 ncurses ] ++
stdenv.lib.optionals pythonSupport [python pygtk];
lib.optionals pythonSupport [python pygtk];
configureFlags = [
(stdenv.lib.enableFeature pythonSupport "python")
(lib.enableFeature pythonSupport "python")
];
postInstall = stdenv.lib.optionalString pythonSupport ''
postInstall = lib.optionalString pythonSupport ''
cd $(toPythonPath $out)/gtk-2.0
for n in *; do
ln -s "gtk-2.0/$n" "../$n"
@@ -54,8 +54,8 @@ in stdenv.mkDerivation rec {
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = stdenv.lib.licenses.lgpl2;
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.lgpl2;
maintainers = with lib.maintainers; [ astsmtl ];
platforms = with lib.platforms; linux;
};
}

6
pkgs/desktops/gnome-2/platform/GConf/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.2.6";
src = fetchurl {
url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz";
url = "mirror://gnome/sources/GConf/${lib.versions.majorMinor version}/GConf-${version}.tar.xz";
sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
};
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ORBit2 libxml2 python3 ]
# polkit requires pam, which requires shadow.h, which is not available on
# darwin
++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
++ lib.optional (!stdenv.isDarwin) polkit;
propagatedBuildInputs = [ glib dbus-glib ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
configureFlags =
# fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
lib.optional stdenv.isDarwin [ "--enable-static" ];
postPatch = ''
2to3 --write --nobackup gsettings/gsettings-schema-convert

4
pkgs/desktops/gnome-2/platform/libglade/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
{ lib, stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
assert withLibgladeConvert -> python2 != null;
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 gettext ]
++ stdenv.lib.optional withLibgladeConvert python2;
++ lib.optional withLibgladeConvert python2;
NIX_LDFLAGS = "-lgmodule-2.0";

2
pkgs/desktops/gnome-3/apps/accerciser/default.nix
View File

@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5";
};

2
pkgs/desktops/gnome-3/apps/cheese/default.nix
View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8";
};

2
pkgs/desktops/gnome-3/apps/evolution/default.nix
View File

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx";
};

2
pkgs/desktops/gnome-3/apps/file-roller/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj";
};

2
pkgs/desktops/gnome-3/apps/gedit/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0";
};

2
pkgs/desktops/gnome-3/apps/ghex/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2";
};

2
pkgs/desktops/gnome-3/apps/gnome-books/default.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya";
};

4
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View File

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl";
};
@@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}")
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}")
'';
postPatch = ''

2
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0=";
};

2
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql";
};

2
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr";
};

2
pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/connections/${stdenv.lib.versions.majorMinor version}/connections-${version}.tar.xz";
url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz";
hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA=";
};

2
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-documents/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq";
};

2
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw";
};

2
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
version = "3.36.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4";
};

2
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1";
};

2
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View File

@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am";
};

2
pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.8.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
};

2
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis=";
};

2
pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
View File

@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g";
};

2
pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk=";
};

2
pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
version = "3.28.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7";
};

2
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.36.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8";
};

2
pkgs/desktops/gnome-3/apps/polari/default.nix
View File

@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s";
};

2
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
version = "3.38.0.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI=";
};

2
pkgs/desktops/gnome-3/apps/vinagre/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.0";
src = fetchurl {
url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};

2
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6";
};

2
pkgs/desktops/gnome-3/core/baobab/default.nix
View File

@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104";
};

2
pkgs/desktops/gnome-3/core/caribou/default.nix
View File

@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
};

2
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
View File

@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd";
};

2
pkgs/desktops/gnome-3/core/empathy/default.nix
View File

@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
version = "3.25.90";
src = fetchurl {
url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
};

2
pkgs/desktops/gnome-3/core/eog/default.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp";
};

2
pkgs/desktops/gnome-3/core/epiphany/default.nix
View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb";
};

8
pkgs/desktops/gnome-3/core/evince/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0j0ry0y9qi1mlm7dcjwrmrw45s1225ri8sv0s9vb8ibm85x8kpr6";
};
@@ -94,8 +94,8 @@ stdenv.mkDerivation rec {
poppler
t1lib
texlive.bin.core # kpathsea for DVI support
] ++ stdenv.lib.optional supportXPS libgxps
++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [
] ++ lib.optional supportXPS libgxps
++ lib.optionals supportMultimedia (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
mesonFlags = [
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
on the GNOME Desktop with a single simple application.
'';
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = teams.gnome.members;
};

2
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z";
};

4
pkgs/desktops/gnome-3/core/gdm/default.nix
View File

@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo=";
};
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
# Upstream checks some common paths to find an `X` binary. We already know it.
echo #!/bin/sh > build-aux/find-x-server.sh
echo "echo ${stdenv.lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
echo "echo ${lib.getBin xorg.xorgserver}/bin/X" >> build-aux/find-x-server.sh
patchShebangs build-aux/find-x-server.sh
'';

2
pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp";
};

2
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
View File

@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha";
};

2
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc";
};

2
pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
version = "3.32.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
};

2
pkgs/desktops/gnome-3/core/gnome-common/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.18.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
};

2
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9";
};

2
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View File

@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
};
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html

2
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9";
};

2
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
};

2
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k=";
};

2
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa";
};

2
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g=";
};

2
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.36.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52";
};

2
pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44";
};

2
pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
version = "0.1.9";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8=";
};

2
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View File

@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5";
};

2
pkgs/desktops/gnome-3/core/gnome-session/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
outputs = ["out" "sessions"];
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v";
};

2
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
View File

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2";
};

2
pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p";
};

2
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k";
};

6
pkgs/desktops/gnome-3/core/gnome-software/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7";
};
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas gnome-desktop
gspell json-glib libsecret ostree
polkit flatpak libxmlb gnome-online-accounts libsysprof-capture
] ++ stdenv.lib.optionals withFwupd [
] ++ lib.optionals withFwupd [
fwupd
];
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
"-Dgudev=false"
# FIXME: package malcontent parental controls
"-Dmalcontent=false"
] ++ stdenv.lib.optionals (!withFwupd) [
] ++ lib.optionals (!withFwupd) [
"-Dfwupd=false"
];

2
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk";
};

2
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lgkvla0fadg76j898p2x2fipqf8kkqbbmmsfkfpz11q9y1d966r";
};

2
pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
View File

@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw";
};

2
pkgs/desktops/gnome-3/core/gnome-tour/default.nix
View File

@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng=";
};

2
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x";
};

6
pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }:
{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }:
let
pname = "libgnome-keyring";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
};
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Framework for managing passwords and other secrets";
homepage = "https://wiki.gnome.org/Projects/GnomeKeyring";
license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
inherit (glib.meta) platforms maintainers;
longDescription = ''

2
pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY=";
};

2
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@@ -47,7 +47,7 @@ let self = stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr";
};

2
pkgs/desktops/gnome-3/core/nautilus/default.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h";
};

2
pkgs/desktops/gnome-3/core/rygel/default.nix
View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn";
};

2
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy";
};

2
pkgs/desktops/gnome-3/core/sushi/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0vlqqk916dymv4asbyvalp1m096a5hh99nx23i4xavzvgygh4h2h";
};

2
pkgs/desktops/gnome-3/core/totem/default.nix
View File

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
version = "3.38.0";
src = fetchurl {
url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8";
};

2
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk";
};

2
pkgs/desktops/gnome-3/core/yelp/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl";
};

2
pkgs/desktops/gnome-3/core/zenity/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
version = "3.32.0";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
};

2
pkgs/desktops/gnome-3/devtools/anjuta/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/anjuta/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2";
};

2
pkgs/desktops/gnome-3/devtools/devhelp/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d";
};

2
pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n";
};

4
pkgs/desktops/gnome-3/extensions/clock-override/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchzip, gnome3, gettext, glib }:
{ lib, stdenv, fetchzip, gnome3, gettext, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-clock-override";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell";
license = licenses.mit;
maintainers = with maintainers; [ rhoriguchi ];

2
pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
View File

@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ eperuffo ];
homepage = "https://github.com/phocean/TopIcons-plus";
# Unmaintained and no longer working with GNOME Shell 3.34+
broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32";
broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32";
};
}

4
pkgs/desktops/gnome-3/extensions/unite-shell/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite-shell";
version = "44";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell";
license = licenses.gpl3Only;
maintainers = with maintainers; [ rhoriguchi ];

2
pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
View File

@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
homepage = "https://github.com/medenagan/window-corner-preview";
broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
};
}

2
pkgs/desktops/gnome-3/games/atomix/default.nix
View File

@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00";
};

2
pkgs/desktops/gnome-3/games/five-or-more/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii";
};

2
pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1";
};

2
pkgs/desktops/gnome-3/games/gnome-chess/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l";
};

2
pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
View File

@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv";
};

2
pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj";
};

2
pkgs/desktops/gnome-3/games/gnome-mines/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.36.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i";
};

2
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5";
};

Some files were not shown because too many files have changed in this diff Show More