mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Frederik Rietdijk
GitHub
commit
993e2b4ec2
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
<para>
|
||||
To manually configure the network on the graphical installer, first disable
|
||||
network-manager with <command>systemctl stop network-manager</command>.
|
||||
network-manager with <command>systemctl stop NetworkManager</command>.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -110,6 +110,13 @@
|
|||
DynamicUser mechanism</link> which obviates these options.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The NetworkManager systemd unit was renamed back from network-manager.service to
|
||||
NetworkManager.service for better compatibility with other applications expecting this name.
|
||||
The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
requiredPackages = map lib.lowPrio
|
||||
requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
|
||||
[ config.nix.package
|
||||
pkgs.acl
|
||||
pkgs.attr
|
||||
|
|
|
|||
|
|
@ -265,6 +265,7 @@
|
|||
./services/desktops/pipewire.nix
|
||||
./services/desktops/gnome3/at-spi2-core.nix
|
||||
./services/desktops/gnome3/chrome-gnome-shell.nix
|
||||
./services/desktops/gnome3/evince.nix
|
||||
./services/desktops/gnome3/evolution-data-server.nix
|
||||
./services/desktops/gnome3/file-roller.nix
|
||||
./services/desktops/gnome3/gnome-disks.nix
|
||||
|
|
|
|||
35
nixos/modules/services/desktops/gnome3/evince.nix
Normal file
35
nixos/modules/services/desktops/gnome3/evince.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
# Evince.
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.gnome3.evince = {
|
||||
|
||||
enable = mkEnableOption
|
||||
"systemd and dbus services for Evince, the GNOME document viewer";
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.gnome3.evince.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.evince ];
|
||||
|
||||
services.dbus.packages = [ pkgs.evince ];
|
||||
|
||||
systemd.packages = [ pkgs.evince ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -466,7 +466,7 @@ in {
|
|||
|
||||
systemd.packages = cfg.packages;
|
||||
|
||||
systemd.services."network-manager" = {
|
||||
systemd.services."NetworkManager" = {
|
||||
wantedBy = [ "network.target" ];
|
||||
restartTriggers = [ configFile ];
|
||||
|
||||
|
|
@ -478,9 +478,9 @@ in {
|
|||
};
|
||||
|
||||
systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
|
||||
wantedBy = [ "network-manager.service" ];
|
||||
before = [ "network-manager.service" ];
|
||||
partOf = [ "network-manager.service" ];
|
||||
wantedBy = [ "NetworkManager.service" ];
|
||||
before = [ "NetworkManager.service" ];
|
||||
partOf = [ "NetworkManager.service" ];
|
||||
script = concatStrings (mapAttrsToList (n: d: ''
|
||||
mkdir -p "/run/NetworkManager/hostsdirs/${n}"
|
||||
chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ in {
|
|||
services.dleyna-renderer.enable = mkDefault true;
|
||||
services.dleyna-server.enable = mkDefault true;
|
||||
services.gnome3.at-spi2-core.enable = true;
|
||||
services.gnome3.evince.enable = mkDefault true;
|
||||
services.gnome3.evolution-data-server.enable = true;
|
||||
services.gnome3.file-roller.enable = mkDefault true;
|
||||
services.gnome3.gnome-disks.enable = mkDefault true;
|
||||
|
|
@ -160,7 +161,11 @@ in {
|
|||
# If gnome3 is installed, build vim for gtk3 too.
|
||||
nixpkgs.config.vim.gui = "gtk3";
|
||||
|
||||
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
|
||||
fonts.fonts = [
|
||||
pkgs.dejavu_fonts pkgs.cantarell-fonts
|
||||
pkgs.source-sans-pro
|
||||
pkgs.source-code-pro # Default monospace font in 3.32
|
||||
];
|
||||
|
||||
services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
|
||||
++ map
|
||||
|
|
|
|||
|
|
@ -122,6 +122,7 @@ in
|
|||
# pantheon has pantheon-agent-geoclue2
|
||||
services.geoclue2.enableDemoAgent = false;
|
||||
services.gnome3.at-spi2-core.enable = true;
|
||||
services.gnome3.evince.enable = mkDefault true;
|
||||
services.gnome3.evolution-data-server.enable = true;
|
||||
services.gnome3.file-roller.enable = mkDefault true;
|
||||
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
|
||||
|
|
@ -168,7 +169,6 @@ in
|
|||
gnome3.geary
|
||||
gnome3.epiphany
|
||||
gnome3.gnome-font-viewer
|
||||
evince
|
||||
] ++ pantheon.apps) config.environment.pantheon.excludePackages)
|
||||
++ (with pkgs;
|
||||
[
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ let
|
|||
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
|
||||
};
|
||||
"2" = {
|
||||
fluidsynthVersion = "2.0.3";
|
||||
sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78";
|
||||
fluidsynthVersion = "2.0.4";
|
||||
sha256 = "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -17,24 +17,15 @@
|
|||
}:
|
||||
let
|
||||
pname = "rhythmbox";
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2";
|
||||
sha256 = "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706
|
||||
(fetchurl {
|
||||
name = "fmradio-Fix-build-with-GStreamer-master.patch";
|
||||
url = https://bugzilla.gnome.org/attachment.cgi?id=361178;
|
||||
sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
intltool perl perlPackages.XMLParser
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv
|
||||
{ gcc8Stdenv
|
||||
, ctags
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_43
|
||||
, fetchurl
|
||||
, flatpak
|
||||
, glibcLocales
|
||||
, gnome3
|
||||
, libgit2-glib
|
||||
, gobject-introspection
|
||||
|
|
@ -31,28 +31,33 @@
|
|||
, vte
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
, dbus
|
||||
, xvfb_run
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.30.3";
|
||||
# Does not build with GCC 7
|
||||
# https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
|
||||
stdenv = gcc8Stdenv;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-builder";
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "11h6apjyah91djf77m8xkl5rvdz7mwpp3bjc4yzzs9lm3pag764r";
|
||||
sha256 = "00l7sshpndk995aw98mjmsc3mxhxzynlp7il551iwwjjdbc70qp4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
#appstream-glib # tests fail if these tools are available
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_43
|
||||
glibcLocales # for Meson's gtkdochelper
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
hicolor-icon-theme
|
||||
meson
|
||||
(meson.override ({ inherit stdenv; }))
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
|
|
@ -64,6 +69,7 @@ in stdenv.mkDerivation {
|
|||
ctags
|
||||
flatpak
|
||||
gnome3.devhelp
|
||||
gnome3.glade
|
||||
libgit2-glib
|
||||
libpeas
|
||||
vte
|
||||
|
|
@ -83,6 +89,11 @@ in stdenv.mkDerivation {
|
|||
webkitgtk
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dbus
|
||||
xvfb_run
|
||||
];
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
prePatch = ''
|
||||
|
|
@ -91,19 +102,25 @@ in stdenv.mkDerivation {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dpython_libprefix=${python3.libPrefix}"
|
||||
"-Dwith_docs=true"
|
||||
"-Ddocs=true"
|
||||
|
||||
# Making the build system correctly detect clang header and library paths
|
||||
# is difficult. Somebody should look into fixing this.
|
||||
"-Dwith_clang=false"
|
||||
"-Dplugin_clang=false"
|
||||
|
||||
# Do not try to check if appstream images exist
|
||||
"-Dnetwork_tests=false"
|
||||
];
|
||||
|
||||
# Some tests fail due to being unable to find the Vte typelib, and I don't
|
||||
# understand why. Somebody should look into fixing this.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
preInstall = ''
|
||||
export LC_ALL="en_US.utf-8"
|
||||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
|
||||
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
|
||||
let
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
pname = "gnome-latex";
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0fn3vy6w714wy0bz3y11zpdprpwxbv5xfiyyxjwp2nix9mbvv2sm";
|
||||
sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=OFF"
|
||||
"-DPYTHON_EXECUTABLE=${python}/bin/python"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation {
|
|||
"-DBUILD_BIOMESH3D=1"
|
||||
"-DWITH_TETGEN=1"
|
||||
"-DBUILD_TYPE=Release"
|
||||
"-DBUILD_TESTING=0"
|
||||
"-DWITH_WXWIDGETS=ON"
|
||||
"-DITK_DIR=${itk}/lib/InsightToolkit"
|
||||
"-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"
|
||||
|
|
|
|||
|
|
@ -1,31 +1,89 @@
|
|||
{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
|
||||
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr
|
||||
, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
|
||||
, gobject-introspection, itstool, libgdata, python3 }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gtk3
|
||||
, libexif
|
||||
, libgphoto2
|
||||
, libwebp
|
||||
, libsoup
|
||||
, libxml2
|
||||
, vala
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
, pkgconfig
|
||||
, gnome3
|
||||
, gst_all_1
|
||||
, libgudev
|
||||
, libraw
|
||||
, glib
|
||||
, json-glib
|
||||
, gcr
|
||||
, libgee
|
||||
, gexiv2
|
||||
, librest
|
||||
, gettext
|
||||
, desktop-file-utils
|
||||
, gdk_pixbuf
|
||||
, librsvg
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, itstool
|
||||
, libgdata
|
||||
, libchamplain
|
||||
, python3
|
||||
}:
|
||||
|
||||
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shotwell";
|
||||
version = "0.30.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
pkgconfig
|
||||
itstool
|
||||
gettext
|
||||
desktop-file-utils
|
||||
python3
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
|
||||
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
|
||||
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
|
||||
gcr gnome3.adwaita-icon-theme libgdata
|
||||
gtk3
|
||||
libexif
|
||||
libgphoto2
|
||||
libwebp
|
||||
libsoup
|
||||
libxml2
|
||||
sqlite
|
||||
webkitgtk
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
libgee
|
||||
libgudev
|
||||
gexiv2
|
||||
gnome3.gsettings-desktop-schemas
|
||||
libraw
|
||||
json-glib
|
||||
glib
|
||||
gdk_pixbuf
|
||||
librsvg
|
||||
librest
|
||||
gcr
|
||||
gnome3.adwaita-icon-theme
|
||||
libgdata
|
||||
libchamplain
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
|
||||
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
|
||||
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "font-manager";
|
||||
version = "0.7.4.3";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FontManager";
|
||||
repo = "master";
|
||||
rev = version;
|
||||
sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5";
|
||||
rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3";
|
||||
sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
|
|||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
patches = [ ./correct-post-install.patch ];
|
||||
patches = [
|
||||
./correct-post-install.patch
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddisable_pycompile=true"
|
||||
|
|
|
|||
|
|
@ -1,21 +1,47 @@
|
|||
{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext
|
||||
, libxml2, desktop-file-utils, wrapGAppsHook
|
||||
, glib, gtk3, libgtop, gnome3 }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, vala
|
||||
, gettext
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, libgtop
|
||||
, libdazzle
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-usage";
|
||||
version = "3.30.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0f1vccw916az8hzsqmx6f57jvl68s3sbd3qk4rpwn42ks1v7nmsh";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ];
|
||||
buildInputs = [
|
||||
glib
|
||||
gnome3.adwaita-icon-theme
|
||||
gtk3
|
||||
libdazzle
|
||||
libgtop
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.sh
|
||||
|
|
@ -29,7 +55,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "";
|
||||
description = "A nice way to view information about use of system resources, like memory and disk space";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = gnome3.maintainers;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
|
||||
sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
|
||||
, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection
|
||||
, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig gettext vala_0_38
|
||||
pkgconfig gettext vala
|
||||
# For setup hook
|
||||
gobject-introspection
|
||||
];
|
||||
|
|
|
|||
|
|
@ -25,13 +25,14 @@ let
|
|||
'';
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "w3m-0.5.3+git20180125";
|
||||
pname = "w3m";
|
||||
version = "0.5.3+git20190105";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tats";
|
||||
repo = "w3m";
|
||||
rev = "v0.5.3+git20180125";
|
||||
sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
broken = true;
|
||||
description = "An extensible Twitter client";
|
||||
homepage = https://mikutter.hachune.net;
|
||||
platforms = ruby.meta.platforms;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1sc8c0w2dbvcdv16idw02y35x0jx5ff6ddzij09pmqjx55zgsjf7";
|
||||
|
||||
buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoBuildFlags = [ "--all" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [ itk vtk ];
|
||||
|
||||
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE"
|
||||
# as cmake otherwise tries to download test data:
|
||||
"-DBUILD_TESTING=FALSE" ];
|
||||
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libminc ];
|
||||
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
|
||||
|
||||
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ];
|
||||
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
|
||||
# testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -33,4 +33,3 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.free;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
|
|||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.19.2";
|
||||
version = "2.21.0";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
in
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
|
||||
sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@ and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
|
|||
node names).
|
||||
|
||||
diff --git a/Documentation/Makefile b/Documentation/Makefile
|
||||
index 26a2342bea..ceccd67ebb 100644
|
||||
--- a/Documentation/Makefile
|
||||
+++ b/Documentation/Makefile
|
||||
@@ -122,7 +122,7 @@
|
||||
@@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs
|
||||
|
||||
MAKEINFO = makeinfo
|
||||
INSTALL_INFO = install-info
|
||||
|
|
@ -14,7 +15,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
|
|||
DBLATEX = dblatex
|
||||
ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
|
||||
DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
|
||||
@@ -240,7 +240,7 @@
|
||||
@@ -250,7 +250,7 @@ man1: $(DOC_MAN1)
|
||||
man5: $(DOC_MAN5)
|
||||
man7: $(DOC_MAN7)
|
||||
|
||||
|
|
@ -23,7 +24,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
|
|||
|
||||
pdf: user-manual.pdf
|
||||
|
||||
@@ -256,10 +256,9 @@
|
||||
@@ -266,10 +266,9 @@ install-man: man
|
||||
|
||||
install-info: info
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
|
||||
index 1afe9fc858..05dd7c3a90 100644
|
||||
--- a/Documentation/git-send-email.txt
|
||||
+++ b/Documentation/git-send-email.txt
|
||||
@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
|
||||
@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'.
|
||||
specify a full pathname of a sendmail-like program instead;
|
||||
the program must support the `-i` option. Default value can
|
||||
be specified by the `sendemail.smtpServer` configuration
|
||||
|
|
@ -9,14 +10,15 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
|
|||
- `/usr/sbin`, `/usr/lib` and $PATH if such program is
|
||||
+ option; the built-in default is to search in $PATH if such program is
|
||||
available, falling back to `localhost` otherwise.
|
||||
|
||||
|
||||
--smtp-server-port=<port>::
|
||||
diff --git a/git-send-email.perl b/git-send-email.perl
|
||||
index 8eb63b5a2f..74a61d8213 100755
|
||||
--- a/git-send-email.perl
|
||||
+++ b/git-send-email.perl
|
||||
@@ -944,8 +944,7 @@ if (defined $reply_to) {
|
||||
@@ -956,8 +956,7 @@ sub expand_one_alias {
|
||||
}
|
||||
|
||||
|
||||
if (!defined $smtp_server) {
|
||||
- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
|
||||
- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
|
||||
|
|
|
|||
|
|
@ -1,94 +1,23 @@
|
|||
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
|
||||
index e1d917fd27..e90f8e1414 100644
|
||||
--- a/git-sh-i18n.sh
|
||||
+++ b/git-sh-i18n.sh
|
||||
@@ -15,87 +15,11 @@
|
||||
fi
|
||||
export TEXTDOMAINDIR
|
||||
|
||||
-# First decide what scheme to use...
|
||||
-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
|
||||
-if test -n "$GIT_GETTEXT_POISON"
|
||||
-then
|
||||
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
|
||||
-elif test -n "@@USE_GETTEXT_SCHEME@@"
|
||||
-then
|
||||
- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
|
||||
-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
|
||||
-then
|
||||
- : no probing necessary
|
||||
@@ -26,7 +26,7 @@ then
|
||||
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
|
||||
then
|
||||
: no probing necessary
|
||||
-elif type gettext.sh >/dev/null 2>&1
|
||||
-then
|
||||
- # GNU libintl's gettext.sh
|
||||
- GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
|
||||
-elif test "$(gettext -h 2>&1)" = "-h"
|
||||
-then
|
||||
- # gettext binary exists but no gettext.sh. likely to be a gettext
|
||||
- # binary on a Solaris or something that is not GNU libintl and
|
||||
- # lack eval_gettext.
|
||||
- GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
|
||||
-fi
|
||||
-export GIT_INTERNAL_GETTEXT_SH_SCHEME
|
||||
-
|
||||
-# ... and then follow that decision.
|
||||
-case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
|
||||
-gnu)
|
||||
- # Use libintl's gettext.sh, or fall back to English if we can't.
|
||||
+elif type @gettext@/bin/gettext.sh >/dev/null 2>&1
|
||||
then
|
||||
# GNU libintl's gettext.sh
|
||||
GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
|
||||
@@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME
|
||||
case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
|
||||
gnu)
|
||||
# Use libintl's gettext.sh, or fall back to English if we can't.
|
||||
- . gettext.sh
|
||||
- ;;
|
||||
-gettext_without_eval_gettext)
|
||||
- # Solaris has a gettext(1) but no eval_gettext(1)
|
||||
- eval_gettext () {
|
||||
- gettext "$1" | (
|
||||
- export PATH $(git sh-i18n--envsubst --variables "$1");
|
||||
- git sh-i18n--envsubst "$1"
|
||||
- )
|
||||
- }
|
||||
-
|
||||
- eval_ngettext () {
|
||||
- ngettext "$1" "$2" "$3" | (
|
||||
- export PATH $(git sh-i18n--envsubst --variables "$2");
|
||||
- git sh-i18n--envsubst "$2"
|
||||
- )
|
||||
- }
|
||||
- ;;
|
||||
-poison)
|
||||
- # Emit garbage so that tests that incorrectly rely on translatable
|
||||
- # strings will fail.
|
||||
- gettext () {
|
||||
- printf "%s" "# GETTEXT POISON #"
|
||||
- }
|
||||
-
|
||||
- eval_gettext () {
|
||||
- printf "%s" "# GETTEXT POISON #"
|
||||
- }
|
||||
-
|
||||
- eval_ngettext () {
|
||||
- printf "%s" "# GETTEXT POISON #"
|
||||
- }
|
||||
- ;;
|
||||
-*)
|
||||
- gettext () {
|
||||
- printf "%s" "$1"
|
||||
- }
|
||||
-
|
||||
- eval_gettext () {
|
||||
- printf "%s" "$1" | (
|
||||
- export PATH $(git sh-i18n--envsubst --variables "$1");
|
||||
- git sh-i18n--envsubst "$1"
|
||||
- )
|
||||
- }
|
||||
+# GNU gettext
|
||||
+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
|
||||
+export PATH=@gettext@/bin:$PATH
|
||||
|
||||
- eval_ngettext () {
|
||||
- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
|
||||
- export PATH $(git sh-i18n--envsubst --variables "$2");
|
||||
- git sh-i18n--envsubst "$2"
|
||||
- )
|
||||
- }
|
||||
- ;;
|
||||
-esac
|
||||
+. @gettext@/bin/gettext.sh
|
||||
|
||||
# Git-specific wrapper functions
|
||||
gettextln () {
|
||||
+ . @gettext@/bin/gettext.sh
|
||||
+ export PATH=@gettext@/bin:$PATH
|
||||
;;
|
||||
gettext_without_eval_gettext)
|
||||
# Solaris has a gettext(1) but no eval_gettext(1)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
diff --git a/t/test-lib.sh b/t/test-lib.sh
|
||||
index 8665b0a9b6..8bb892b1af 100644
|
||||
--- a/t/test-lib.sh
|
||||
+++ b/t/test-lib.sh
|
||||
@@ -923,7 +923,7 @@
|
||||
@@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED"
|
||||
then
|
||||
GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
|
||||
error "Cannot run git from $GIT_TEST_INSTALLED."
|
||||
- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
|
||||
- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
|
||||
+ PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
|
||||
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
|
||||
else # normal case, use ../bin-wrappers only unless $with_dashes:
|
||||
git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
|
||||
if test -n "$no_bin_wrappers"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
diff --git a/connect.c b/connect.c
|
||||
index c3a014c5b..fbca3262b 100644
|
||||
index 4813f005ab..b3f12f3268 100644
|
||||
--- a/connect.c
|
||||
+++ b/connect.c
|
||||
@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
|
||||
|
||||
@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
|
||||
|
||||
ssh = getenv("GIT_SSH");
|
||||
if (!ssh)
|
||||
- ssh = "ssh";
|
||||
+ ssh = "@ssh@";
|
||||
variant = determine_ssh_variant(ssh, 0);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
|
||||
index 480a6b30d..781720424 100644
|
||||
index 480a6b30d0..7817204241 100644
|
||||
--- a/git-gui/lib/remote_add.tcl
|
||||
+++ b/git-gui/lib/remote_add.tcl
|
||||
@@ -139,7 +139,7 @@ method _add {} {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
{ stdenv, fetchurl, itstool, python3, intltool, wrapGAppsHook
|
||||
, libxml2, gobject-introspection, gtk3, gtksourceview, gnome3
|
||||
, dbus, xvfb_run
|
||||
, gsettings-desktop-schemas, dbus, xvfb_run
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meld";
|
||||
version = "3.20.0";
|
||||
version = "3.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b";
|
||||
sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool itstool libxml2 gobject-introspection wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
gtk3 gtksourceview gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
|
||||
];
|
||||
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
# Codecs, audio
|
||||
libopus, lame, libvorbis, a52dec, speex, libsamplerate,
|
||||
# Text processing
|
||||
libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2,
|
||||
libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz,
|
||||
# Optical media
|
||||
libdvdread, libdvdnav, libdvdcss, libbluray,
|
||||
useGtk ? true, wrapGAppsHook ? null,
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
ffmpeg-full libogg libtheora x264 x265 libvpx
|
||||
libopus lame libvorbis a52dec speex libsamplerate
|
||||
libiconv fribidi fontconfig freetype libass jansson libxml2
|
||||
libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
|
||||
libdvdread libdvdnav libdvdcss libbluray
|
||||
] ++ lib.optionals useGtk [
|
||||
glib gtk3 libappindicator-gtk3 libnotify
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
|
||||
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
|
||||
, freefont_ttf, freetype, libass, libpthreadstubs, mujs
|
||||
, lua, libuchardet, libiconv ? null, darwin
|
||||
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
|
||||
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, wayland ? null
|
||||
|
|
@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
ffmpeg_4 freetype libass libpthreadstubs
|
||||
luaEnv libuchardet mujs
|
||||
luaEnv libuchardet mujs nv-codec-headers
|
||||
] ++ optional alsaSupport alsaLib
|
||||
++ optional archiveSupport libarchive
|
||||
++ optional bluraySupport libbluray
|
||||
|
|
|
|||
|
|
@ -329,6 +329,7 @@ stdenv.mkDerivation {
|
|||
{ description =
|
||||
stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
|
||||
+ " (wrapper script)";
|
||||
priority = 10;
|
||||
} // optionalAttrs useMacosReexportHack {
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }:
|
||||
{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3, buildPackages }:
|
||||
|
||||
{ name ? "${args.pname}-${args.version}"
|
||||
, cargoSha256 ? "unset"
|
||||
|
|
@ -9,14 +9,17 @@
|
|||
, sourceRoot ? null
|
||||
, logLevel ? ""
|
||||
, buildInputs ? []
|
||||
, nativeBuildInputs ? []
|
||||
, cargoUpdateHook ? ""
|
||||
, cargoDepsHook ? ""
|
||||
, cargoBuildFlags ? []
|
||||
, buildType ? "release"
|
||||
|
||||
, cargoVendorDir ? null
|
||||
, ... } @ args:
|
||||
|
||||
assert cargoVendorDir == null -> cargoSha256 != "unset";
|
||||
assert buildType == "release" || buildType == "debug";
|
||||
|
||||
let
|
||||
cargoDeps = if cargoVendorDir == null
|
||||
|
|
@ -37,20 +40,24 @@ let
|
|||
cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
|
||||
'';
|
||||
|
||||
ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
|
||||
cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
|
||||
ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
|
||||
cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
|
||||
releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}";
|
||||
|
||||
in stdenv.mkDerivation (args // {
|
||||
inherit cargoDeps;
|
||||
|
||||
patchRegistryDeps = ./patch-registry-deps;
|
||||
|
||||
buildInputs = [ cacert git cargo rustc ] ++ buildInputs;
|
||||
nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs;
|
||||
inherit buildInputs;
|
||||
|
||||
patches = cargoPatches ++ patches;
|
||||
|
||||
configurePhase = args.configurePhase or ''
|
||||
runHook preConfigure
|
||||
# noop
|
||||
runHook postConfigure
|
||||
'';
|
||||
PKG_CONFIG_ALLOW_CROSS =
|
||||
if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
|
||||
|
||||
postUnpack = ''
|
||||
eval "$cargoDepsHook"
|
||||
|
|
@ -63,17 +70,51 @@ in stdenv.mkDerivation (args // {
|
|||
config=${./fetchcargo-default-config.toml};
|
||||
fi;
|
||||
substitute $config .cargo/config \
|
||||
--subst-var-by vendor "$(pwd)/$cargoDepsCopy"
|
||||
--subst-var-by vendor "$(pwd)/$cargoDepsCopy"
|
||||
|
||||
unset cargoDepsCopy
|
||||
|
||||
export RUST_LOG=${logLevel}
|
||||
'' + (args.postUnpack or "");
|
||||
|
||||
configurePhase = args.configurePhase or ''
|
||||
runHook preConfigure
|
||||
mkdir -p .cargo
|
||||
cat >> .cargo/config <<'EOF'
|
||||
[target."${stdenv.buildPlatform.config}"]
|
||||
"linker" = "${ccForBuild}"
|
||||
${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
|
||||
[target."${stdenv.hostPlatform.config}"]
|
||||
"linker" = "${ccForHost}"
|
||||
''}
|
||||
EOF
|
||||
cat .cargo/config
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = with builtins; args.buildPhase or ''
|
||||
runHook preBuild
|
||||
echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}"
|
||||
cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags}
|
||||
|
||||
(
|
||||
set -x
|
||||
env \
|
||||
"CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \
|
||||
"CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \
|
||||
"CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
|
||||
"CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
|
||||
cargo build \
|
||||
--${buildType} \
|
||||
--target ${stdenv.hostPlatform.config} \
|
||||
--frozen ${concatStringsSep " " cargoBuildFlags}
|
||||
)
|
||||
|
||||
# rename the output dir to a architecture independent one
|
||||
mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
|
||||
for target in "''${targets[@]}"; do
|
||||
rm -rf "$target/../../${buildType}"
|
||||
ln -srf "$target" "$target/../../"
|
||||
done
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
|
@ -86,11 +127,21 @@ in stdenv.mkDerivation (args // {
|
|||
|
||||
doCheck = args.doCheck or true;
|
||||
|
||||
inherit releaseDir;
|
||||
|
||||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/lib
|
||||
find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
|
||||
find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
|
||||
|
||||
find $releaseDir \
|
||||
-maxdepth 1 \
|
||||
-type f \
|
||||
-executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \
|
||||
-print0 | xargs -r -0 cp -t $out/bin
|
||||
find $releaseDir \
|
||||
-maxdepth 1 \
|
||||
-regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \
|
||||
-print0 | xargs -r -0 cp -t $out/lib
|
||||
rmdir --ignore-fail-on-non-empty $out/lib $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ callPackage }:
|
||||
{ rustc, cargo, ... }: {
|
||||
rust = {
|
||||
inherit rustc cargo;
|
||||
};
|
||||
|
||||
buildRustPackage = callPackage ./default.nix {
|
||||
inherit rustc cargo;
|
||||
|
||||
fetchcargo = callPackage ./fetchcargo.nix {
|
||||
inherit cargo;
|
||||
};
|
||||
};
|
||||
|
||||
rustcSrc = callPackage ../../development/compilers/rust/rust-src.nix {
|
||||
inherit rustc;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,6 +30,10 @@ wrapGAppsHook() {
|
|||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
|
||||
fi
|
||||
|
||||
if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
|
||||
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
|
||||
fi
|
||||
|
||||
for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
|
||||
eval local dummy="\$$v"
|
||||
gappsWrapperArgs+=(--prefix $v : "$dummy")
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
|
||||
, libxml2, glib}:
|
||||
|
||||
let version = "1.10"; in
|
||||
let version = "1.12"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shared-mime-info-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
|
||||
sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
|
||||
url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz";
|
||||
sha256 = "0gj0pp36qpsr9w6v4nywnjpcisadwkndapqsjn0ny3gd0zzg1chq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, makeScope, libsForQt5, go_1_11 }:
|
||||
{ pkgs, makeScope, libsForQt5 }:
|
||||
|
||||
let
|
||||
packages = self: with self; {
|
||||
|
|
@ -7,15 +7,9 @@ let
|
|||
updateScript = callPackage ./update.nix { };
|
||||
|
||||
dbus-factory = callPackage ./dbus-factory { };
|
||||
dde-api = callPackage ./dde-api {
|
||||
# XXX: the build is finding references to Go when compiled with go v1.12
|
||||
go = go_1_11;
|
||||
};
|
||||
dde-api = callPackage ./dde-api { };
|
||||
dde-calendar = callPackage ./dde-calendar { };
|
||||
dde-daemon = callPackage ./dde-daemon {
|
||||
# XXX: the build is finding references to Go when compiled with go v1.12
|
||||
go = go_1_11;
|
||||
};
|
||||
dde-daemon = callPackage ./dde-daemon { };
|
||||
dde-polkit-agent = callPackage ./dde-polkit-agent { };
|
||||
dde-network-utils = callPackage ./dde-network-utils { };
|
||||
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection
|
||||
, itstool, libxml2, python3Packages, at-spi2-core
|
||||
, dbus, intltool, libwnck3 }:
|
||||
, dbus, gettext, libwnck3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accerciser-${version}";
|
||||
version = "3.22.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
|
||||
sha256 = "1j7wlks6j77kfjrw6lx1g0apsy2wwca63jsm5994av5l6xs8xd5m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig wrapGAppsHook itstool intltool
|
||||
pkgconfig wrapGAppsHook itstool gettext
|
||||
gobject-introspection # For setup hook
|
||||
];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cheese-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr";
|
||||
sha256 = "0ahkfs6v9qraz607k2sr4qw9a59lg2m8kiw5nxhc65qql110sjsl";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
|
||||
|
||||
let
|
||||
version = "3.30.5";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "evolution-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
|
||||
sha256 = "1skwhg3fbyg3acivknnpm7hs5xy0zwlvnyf5cxs59kxh1l41xmnc";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ evolution-data-server ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "file-roller-${version}";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1";
|
||||
sha256 = "1id7f6qbgdxfixxyqjypgwy04mf1w1rbczklqmgpqx5ry4kk0a03";
|
||||
};
|
||||
|
||||
LANG = "en_US.UTF-8"; # postinstall.py
|
||||
|
|
|
|||
|
|
@ -1,28 +1,43 @@
|
|||
{ stdenv, intltool, fetchurl
|
||||
{ stdenv, meson, fetchurl, python3
|
||||
, pkgconfig, gtk3, glib, adwaita-icon-theme
|
||||
, libpeas, gtksourceview, gsettings-desktop-schemas
|
||||
, wrapGAppsHook, itstool, libsoup, libxml2
|
||||
, gnome3, gspell }:
|
||||
, libpeas, gtksourceview4, gsettings-desktop-schemas
|
||||
, wrapGAppsHook, ninja, libsoup, libxml2
|
||||
, gnome3, gspell, perl, itstool, desktop-file-utils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gedit-${version}";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza";
|
||||
sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig wrapGAppsHook meson ninja libxml2
|
||||
python3 perl itstool desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib
|
||||
adwaita-icon-theme libsoup
|
||||
libpeas gtksourceview
|
||||
libpeas gtksourceview4
|
||||
gsettings-desktop-schemas gspell
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/post_install.py
|
||||
chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype=plain" # don't require git
|
||||
];
|
||||
|
||||
# Reliably fails to generate gedit-file-browser-enum-types.h in time
|
||||
enableParallelBuilding = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
|
|
|
|||
52
pkgs/desktops/gnome-3/apps/gnome-books/default.nix
Normal file
52
pkgs/desktops/gnome-3/apps/gnome-books/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
|
||||
, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt
|
||||
, webkitgtk, gnome-desktop, libgepub, gnome3, gdk_pixbuf
|
||||
, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl
|
||||
, docbook_xml_dtd_42, desktop-file-utils, python3
|
||||
, gobject-introspection, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-books";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype=plain"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext libxslt desktop-file-utils
|
||||
docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib gsettings-desktop-schemas
|
||||
gdk_pixbuf adwaita-icon-theme evince
|
||||
webkitgtk gjs gobject-introspection tracker
|
||||
tracker-miners gnome-desktop libgepub
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "gnome-books";
|
||||
attrPath = "gnome3.gnome-books";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Books;
|
||||
description = "An e-book manager application for GNOME";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,19 +3,19 @@
|
|||
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
|
||||
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
|
||||
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
|
||||
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk
|
||||
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
|
||||
}:
|
||||
|
||||
# TODO: ovirt (optional)
|
||||
|
||||
let
|
||||
version = "3.30.3";
|
||||
version = "3.32.0.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gnome-boxes-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0a9ljwhkanszzyzl0bhad8vmzk7v4wafl9b1zn09pf57znyymf3s";
|
||||
sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
|
|||
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
|
||||
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
|
||||
gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
|
||||
libcap_ng numactl xen libapparmor
|
||||
libcap_ng numactl xen libapparmor vte
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-calendar";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s";
|
||||
sha256 = "0fyy1slcvc32nz37clps7lz3w40i30fj93fc5m0rqk664w682ys4";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-characters-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp";
|
||||
sha256 = "1cwazk9x9fs4lf89jqxdian15dk8zfsnpypgl1kknnw8r9mv0bzd";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-clocks-${version}";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc";
|
||||
sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -8,16 +8,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-documents-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6";
|
||||
sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
mesonFlags = [ "-Dgetting-started=true" ];
|
||||
mesonFlags = [
|
||||
"-Dgetting-started=true"
|
||||
"--buildtype=plain"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
|
||||
|
|
@ -31,14 +34,6 @@ stdenv.mkDerivation rec {
|
|||
gnome-desktop libzapojit libgepub
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix RPATH to libgd
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch";
|
||||
sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-getting-started-docs-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "10vihv6n8703rapf915waz1vzr7axk43bjlhmm3hb7kwm32rc61k";
|
||||
sha256 = "1nzba7l33dgijwvfs777kcyy29xp7bmyrjk9nrwvm5zww4l35gai";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-logs-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1rsk2whps7rwl01mmjmhwwww4iv09fsszils9zmgqd79y7l3fmyh";
|
||||
sha256 = "1cn0ms24y9sg1kvhmk4mj7v9fi0n6ylyf11jjh4k81wfjsaah7w4";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-maps";
|
||||
version = "3.30.3";
|
||||
version = "3.32.1";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq";
|
||||
sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d";
|
||||
sha256 = "075q8y4i66nh6wjga6vwdcivsm1dfbwv54hfvk4q8mbws7zfzky7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
, gnome3, libxml2 }:
|
||||
|
||||
let
|
||||
version = "3.30.3";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gnome-notes-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
|
||||
sha256 = "1mkpi2i9nqpip5l15ihjcscyiri113s0705sjgh6b89164ahyn5k";
|
||||
sha256 = "09l98yvgrfjw427wn271ap5v6hbwdf9liyrkp34bl0k3hv2d6dv3";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -4,22 +4,25 @@
|
|||
, grilo, gnome-online-accounts
|
||||
, desktop-file-utils, wrapGAppsHook
|
||||
, gnome3, gdk_pixbuf, gexiv2, geocode-glib
|
||||
, dleyna-renderer }:
|
||||
, dleyna-renderer, dbus, meson, ninja, python3 }:
|
||||
|
||||
let
|
||||
pname = "gnome-photos";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1mf1887x0pk46h6l51rfkpn29fwp3yvmqkk99kr1iwpz0lakyx6f";
|
||||
sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj";
|
||||
};
|
||||
|
||||
# doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig gettext itstool meson ninja libxml2
|
||||
desktop-file-utils wrapGAppsHook python3
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3 glib gegl babl libgdata libdazzle
|
||||
gnome3.gsettings-desktop-schemas
|
||||
|
|
@ -28,8 +31,17 @@ in stdenv.mkDerivation rec {
|
|||
gnome-online-accounts tracker
|
||||
gexiv2 geocode-glib dleyna-renderer
|
||||
tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
|
||||
dbus
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype=plain" # don't do any git commands
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-power-manager";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0m15x6i279wrfimz9ma2gfjv7jlkca2qbl2wcnxgx1pb3hzrwggm";
|
||||
sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,25 +1,26 @@
|
|||
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }:
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
|
||||
, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sound-recorder";
|
||||
version = "3.28.2";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1k63xr3d16qbzi88md913ndaf2mzwmhmi6hipj0123sm7nsz1p94";
|
||||
sha256 = "0rchzap5mg9ach3jcf4sci5v2h5pgpdjafjfllfd09w9yg3brspp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix crash when trying to play recordings
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/gnome-sound-recorder/commit/2b311ef67909bc20d0e87f334fe37bf5c4e9f29f.patch;
|
||||
sha256 = "0hqmk846bxma0p66cqp94zd02zc1if836ywjq3sv5dsfwnz7jv3f";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
pkgconfig gettext meson ninja gobject-introspection
|
||||
wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ];
|
||||
buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
# TODO: fix this in gstreamer
|
||||
# TODO: make stdenv.lib.getBin respect outputBin
|
||||
PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin";
|
||||
|
|
|
|||
|
|
@ -1,28 +1,67 @@
|
|||
{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
|
||||
, gettext, gnome3, glib, gtk3, libpeas
|
||||
, gnome-online-accounts, gsettings-desktop-schemas
|
||||
, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gettext
|
||||
, gnome3
|
||||
, glib
|
||||
, gtk3
|
||||
, libpeas
|
||||
, gnome-online-accounts
|
||||
, gsettings-desktop-schemas
|
||||
, adwaita-icon-theme
|
||||
, evolution-data-server
|
||||
, libxml2
|
||||
, libsoup
|
||||
, libical
|
||||
, librest
|
||||
, json-glib
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-todo";
|
||||
version = "3.28.1";
|
||||
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}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext python3 wrapGAppsHook
|
||||
patches = [
|
||||
# fix build with e-d-s 3.32
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch;
|
||||
sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
gettext
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib gtk3 libpeas gnome-online-accounts
|
||||
gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
glib
|
||||
gtk3
|
||||
libpeas
|
||||
gnome-online-accounts
|
||||
gsettings-desktop-schemas
|
||||
gnome3.adwaita-icon-theme
|
||||
# Plug-ins
|
||||
evolution-data-server libxml2 libsoup libical
|
||||
librest json-glib
|
||||
evolution-data-server
|
||||
libxml2
|
||||
libsoup
|
||||
libical
|
||||
librest
|
||||
json-glib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,29 +1,32 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
|
||||
, libgweather, intltool, itstool, geoclue2, gnome-desktop }:
|
||||
, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-weather-${version}";
|
||||
version = "3.26.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
|
||||
sha256 = "0b7cqd3wfrgm0hps0cb8vhjz0bpjw955hbc4r82l626g8l3hf86w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
|
||||
nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
|
||||
buildInputs = [
|
||||
gtk3 gjs gobject-introspection gnome-desktop
|
||||
libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
# The .service file isn't wrapped with the correct environment
|
||||
# so misses GIR files when started. By re-pointing from the gjs
|
||||
# entry point to the wrapped binary we get back to a wrapped
|
||||
# binary.
|
||||
preConfigure = ''
|
||||
substituteInPlace "data/org.gnome.Weather.Application.service.in" \
|
||||
--replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \
|
||||
postPatch = ''
|
||||
# The .service file is not wrapped with the correct environment
|
||||
# so misses GIR files when started. By re-pointing from the gjs
|
||||
# entry point to the wrapped binary we get back to a wrapped
|
||||
# binary.
|
||||
substituteInPlace "data/org.gnome.Weather.service.in" \
|
||||
--replace "Exec=@DATA_DIR@/@APP_ID@" \
|
||||
"Exec=$out/bin/gnome-weather"
|
||||
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
let
|
||||
pname = "polari";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "02wxkdq5s5ami9wj9vpqhs6n8qxr299bpmvpvd89mn49x73lq2w2";
|
||||
sha256 = "1jq1xvk9a05x37g9w349f5q069cvg5lfbhxj88gpbnf4fyndnr70";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, vala, meson, ninja
|
||||
{ stdenv, fetchurl, vala, meson, ninja, libpwquality
|
||||
, pkgconfig, gtk3, glib, gobject-introspection
|
||||
, wrapGAppsHook, itstool, gnupg, libsoup
|
||||
, gnome3, gpgme, python3, openldap, gcr
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seahorse";
|
||||
version = "3.30.1.1";
|
||||
version = "3.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy";
|
||||
sha256 = "1wxcxq6ahlwab8dr83gqml67y95mnk56hsgw19d4h0xjvyz2ym52";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
gnome3.gsettings-desktop-schemas gnupg
|
||||
gnome3.adwaita-icon-theme gpgme
|
||||
libsecret avahi libsoup p11-kit
|
||||
openssh openldap
|
||||
openssh openldap libpwquality
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "adwaita-icon-theme-${version}";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd";
|
||||
sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
|
||||
};
|
||||
|
||||
# For convenience, we can specify adwaita-icon-theme only in packages
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
let
|
||||
pname = "baobab";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay";
|
||||
sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,22 @@
|
|||
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
|
||||
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
|
||||
, libxml2, gettext, docbook_xsl, hicolor-icon-theme, wrapGAppsHook, gobject-introspection }:
|
||||
|
||||
let
|
||||
pname = "dconf-editor";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia";
|
||||
sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ];
|
||||
nativeBuildInputs = [
|
||||
meson ninja vala libxslt pkgconfig wrapGAppsHook
|
||||
gettext docbook_xsl libxml2 gobject-introspection python3
|
||||
hicolor-icon-theme # for setup-hook
|
||||
];
|
||||
|
||||
buildInputs = [ glib gtk3 gnome3.dconf ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "0.30.1";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
|
||||
sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
chmod +x meson_post_install.py tests/test-dconf.py
|
||||
patchShebangs meson_post_install.py
|
||||
patchShebangs tests/test-dconf.py
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" ];
|
||||
|
|
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
let
|
||||
pname = "eog";
|
||||
version = "3.28.4";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55";
|
||||
sha256 = "005cjq0i4281yw9wa6dyp5ymbx1yiprx1k5lgvfdd37qpbkk017z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
|
||||
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
|
||||
, sqlite, gcr, isocodes, desktop-file-utils, python3
|
||||
, gdk_pixbuf, gst_all_1, json-glib, libdazzle }:
|
||||
, gdk_pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "epiphany-${version}";
|
||||
version = "3.30.3";
|
||||
version = "3.32.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "05qdzx18ld1m3xiajpz6y6snfj56bgyjsgm7f4rqrnpjdbdvikbn";
|
||||
sha256 = "1gi6g519i0dldwa8bmp047j9mdf8k0asr3ja2m593dy8pfwlya58";
|
||||
};
|
||||
|
||||
# Tests need an X display
|
||||
mesonFlags = [ "-Dunit_tests=false" ];
|
||||
mesonFlags = [ "-Dunit_tests=disabled" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
|
||||
sqlite isocodes p11-kit icu
|
||||
sqlite isocodes p11-kit icu libhandy
|
||||
gdk_pixbuf gnome3.adwaita-icon-theme gcr
|
||||
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
|
||||
|
|
|
|||
|
|
@ -1,56 +1,116 @@
|
|||
{ fetchurl, stdenv, pkgconfig, intltool, libxml2
|
||||
, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
|
||||
, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
|
||||
, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas
|
||||
{ fetchFromGitLab
|
||||
, stdenv
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, gettext
|
||||
, libxml2
|
||||
, appstream
|
||||
, glib
|
||||
, gtk3
|
||||
, pango
|
||||
, atk
|
||||
, gdk_pixbuf
|
||||
, shared-mime-info
|
||||
, itstool
|
||||
, gnome3
|
||||
, poppler
|
||||
, ghostscriptX
|
||||
, djvulibre
|
||||
, libspectre
|
||||
, libarchive
|
||||
, libsecret
|
||||
, wrapGAppsHook
|
||||
, librsvg
|
||||
, gobject-introspection
|
||||
, yelp-tools
|
||||
, gspell
|
||||
, adwaita-icon-theme
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, python3
|
||||
, texlive
|
||||
, t1lib
|
||||
, gst_all_1
|
||||
, supportMultimedia ? true # PDF multimedia
|
||||
, libgxps
|
||||
, recentListSize ? null # 5 is not enough, allow passing a different number
|
||||
, supportXPS ? false # Open XML Paper Specification via libgxps
|
||||
, autoreconfHook, pruneLibtoolFiles
|
||||
, supportXPS ? true # Open XML Paper Specification via libgxps
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evince-${version}";
|
||||
version = "3.30.2";
|
||||
pname = "evince";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "evince"; };
|
||||
};
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
gobject-introspection
|
||||
gettext
|
||||
itstool
|
||||
yelp-tools
|
||||
appstream
|
||||
wrapGAppsHook
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib gtk3 pango atk gdk_pixbuf libxml2
|
||||
glib
|
||||
gtk3
|
||||
pango
|
||||
atk
|
||||
gdk_pixbuf
|
||||
libxml2
|
||||
gsettings-desktop-schemas
|
||||
poppler ghostscriptX djvulibre libspectre libarchive
|
||||
libsecret librsvg adwaita-icon-theme gspell
|
||||
] ++ stdenv.lib.optional supportXPS libgxps;
|
||||
poppler
|
||||
ghostscriptX
|
||||
djvulibre
|
||||
libspectre
|
||||
libarchive
|
||||
libsecret
|
||||
librsvg
|
||||
adwaita-icon-theme
|
||||
gspell
|
||||
gnome-desktop
|
||||
dbus # only needed to find the service directory
|
||||
texlive.bin.core # kpathsea for DVI support
|
||||
t1lib
|
||||
] ++ stdenv.lib.optional supportXPS libgxps
|
||||
++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
|
||||
|
||||
configureFlags = [
|
||||
"--disable-nautilus" # Do not build nautilus plugin
|
||||
"--enable-ps"
|
||||
"--enable-introspection"
|
||||
(if supportXPS then "--enable-xps" else "--disable-xps")
|
||||
mesonFlags = [
|
||||
"-Dauto_features=enabled"
|
||||
"-Dnautilus=false"
|
||||
"-Dps=enabled"
|
||||
"-Dgtk_doc=false"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (recentListSize != null) ''
|
||||
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
|
||||
sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Evince;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evolution-data-server-${version}";
|
||||
version = "3.30.5";
|
||||
version = "3.32.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli";
|
||||
sha256 = "1pnxf0jcbmh86ahkjgn3l2521yvgypgmfz590wp350z4fi4vh44f";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gdm-${version}";
|
||||
version = "3.30.3";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak";
|
||||
sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
|
||||
};
|
||||
|
||||
# Only needed to make it build
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gjs-${version}";
|
||||
version = "1.54.3";
|
||||
version = "1.56.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1cd65d4nq5xxlyjz1b83hm5zklyry6lillzf782nr0z97k60vcvn";
|
||||
sha256 = "06pcfpscpdv9nir0hrcfglbkq0whlv7sncmlmdgi1c5daiasv9v4";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-backgrounds-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc";
|
||||
sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@ let
|
|||
pname = "gnome-bluetooth";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.28.2";
|
||||
version = "3.32.1";
|
||||
|
||||
# TODO: split out "lib"
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z";
|
||||
sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
|
||||
, gtk3, glib, gtksourceview3, wrapGAppsHook, gobject-introspection, python3
|
||||
, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
|
||||
, gnome3, mpfr, gmp, libsoup, libmpc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-calculator-${version}";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc";
|
||||
sha256 = "0m4g7ml6ch9cc4wdchlyspakz3a9ak1rka26j08nvhhvllkdkqlw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib libxml2 gtksourceview3 mpfr gmp
|
||||
gtk3 glib libxml2 gtksourceview4 mpfr gmp
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.gsettings-desktop-schemas libsoup libmpc
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-color-manager";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "105bqqq3yvdn5lx94mkl0d450f0l8lmwfjjcwyls1pycmj0vifwh";
|
||||
sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
|
||||
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
|
||||
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
|
||||
, vala, meson, ninja }:
|
||||
, vala, meson, ninja, libhandy }:
|
||||
|
||||
let
|
||||
version = "3.30.2";
|
||||
version = "3.32";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gnome-contacts-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h";
|
||||
sha256 = "12vr75d5akhs0fzmjg6j21jrrlr8njdrf9dwhw94k8p73y1gjjgw";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ evolution-data-server ];
|
||||
|
|
@ -22,14 +22,18 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
|
||||
folks gnome-desktop telepathy-glib
|
||||
folks gnome-desktop telepathy-glib libhandy
|
||||
libxml2 gnome-online-accounts cheese
|
||||
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtelepathy=true"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
# In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0:
|
||||
|
|
|
|||
|
|
@ -1,28 +1,27 @@
|
|||
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
|
||||
, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
|
||||
, gdk_pixbuf, librsvg, libnotify, libgudev, libsecret, gnome-color-manager
|
||||
, gdk_pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
|
||||
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
|
||||
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
|
||||
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
|
||||
, libkrb5, networkmanagerapplet, networkmanager, glibc
|
||||
, libwacom, samba, shared-mime-info, tzdata, libgnomekbd
|
||||
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
|
||||
, fontconfig, sound-theme-freedesktop, grilo, python3
|
||||
, gtk3, glib, glib-networking, gsettings-desktop-schemas
|
||||
, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
|
||||
, vino, gnome-bluetooth, tracker, adwaita-icon-theme }:
|
||||
, vino, gnome-bluetooth, tracker, adwaita-icon-theme
|
||||
, udisks2, gsound, libhandy, cups }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "3.30.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl
|
||||
meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xsl
|
||||
shared-mime-info python3
|
||||
];
|
||||
|
||||
|
|
@ -30,10 +29,11 @@ in stdenv.mkDerivation rec {
|
|||
ibus gtk3 glib glib-networking upower gsettings-desktop-schemas
|
||||
libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
|
||||
gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
|
||||
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
|
||||
grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
|
||||
accountsservice libkrb5 networkmanagerapplet libwacom samba
|
||||
grilo libpwquality vino libcanberra-gtk3 libgudev libsecret
|
||||
gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
|
||||
networkmanager modemmanager gnome-bluetooth tracker
|
||||
udisks2 gsound libhandy
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
|
|||
src = ./paths.patch;
|
||||
gcm = gnome-color-manager;
|
||||
inherit glibc libgnomekbd tzdata;
|
||||
inherit cups networkmanagerapplet;
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
|
||||
index 49ca35220..adefb87b9 100644
|
||||
--- a/panels/color/cc-color-panel.c
|
||||
+++ b/panels/color/cc-color-panel.c
|
||||
@@ -599,7 +599,7 @@
|
||||
@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
|
||||
|
||||
/* run with modal set */
|
||||
argv = g_ptr_array_new_with_free_func (g_free);
|
||||
|
|
@ -9,7 +11,7 @@
|
|||
g_ptr_array_add (argv, g_strdup ("--device"));
|
||||
g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
|
||||
g_ptr_array_add (argv, g_strdup ("--parent-window"));
|
||||
@@ -1038,7 +1038,7 @@
|
||||
@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
|
||||
|
||||
/* open up gcm-viewer as a info pane */
|
||||
argv = g_ptr_array_new_with_free_func (g_free);
|
||||
|
|
@ -18,7 +20,7 @@
|
|||
g_ptr_array_add (argv, g_strdup ("--profile"));
|
||||
g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
|
||||
g_ptr_array_add (argv, g_strdup ("--parent-window"));
|
||||
@@ -1288,15 +1288,12 @@
|
||||
@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
|
||||
static void
|
||||
gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
|
||||
{
|
||||
|
|
@ -35,6 +37,8 @@
|
|||
gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);
|
||||
else
|
||||
gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
|
||||
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
|
||||
index 96b25140c..1ad704d4a 100644
|
||||
--- a/panels/datetime/tz.h
|
||||
+++ b/panels/datetime/tz.h
|
||||
@@ -27,11 +27,7 @@
|
||||
|
|
@ -50,24 +54,96 @@
|
|||
|
||||
typedef struct _TzDB TzDB;
|
||||
typedef struct _TzLocation TzLocation;
|
||||
--- a/panels/region/cc-region-panel.c
|
||||
+++ b/panels/region/cc-region-panel.c
|
||||
@@ -1265,10 +1265,10 @@
|
||||
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
|
||||
index 9390a3308..d30b4a68e 100644
|
||||
--- a/panels/network/connection-editor/net-connection-editor.c
|
||||
+++ b/panels/network/connection-editor/net-connection-editor.c
|
||||
@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ
|
||||
GError *error = NULL;
|
||||
|
||||
if (editor->is_new_connection) {
|
||||
- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
|
||||
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
|
||||
} else {
|
||||
- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
|
||||
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'",
|
||||
nm_connection_get_uuid (editor->connection));
|
||||
}
|
||||
|
||||
if (variant && variant[0])
|
||||
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
|
||||
index 360fbfc72..870157a11 100644
|
||||
--- a/panels/network/net-device-wifi.c
|
||||
+++ b/panels/network/net-device-wifi.c
|
||||
@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object)
|
||||
return;
|
||||
}
|
||||
uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
|
||||
- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
|
||||
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
|
||||
g_debug ("Launching '%s'\n", cmdline);
|
||||
if (!g_spawn_command_line_async (cmdline, &error)) {
|
||||
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
|
||||
diff --git a/panels/network/net-device.c b/panels/network/net-device.c
|
||||
index d73b537b9..e2ee54294 100644
|
||||
--- a/panels/network/net-device.c
|
||||
+++ b/panels/network/net-device.c
|
||||
@@ -197,7 +197,7 @@ net_device_edit (NetObject *object)
|
||||
|
||||
connection = net_device_get_find_connection (device);
|
||||
uuid = nm_connection_get_uuid (connection);
|
||||
- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
|
||||
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
|
||||
g_debug ("Launching '%s'\n", cmdline);
|
||||
if (!g_spawn_command_line_async (cmdline, &error)) {
|
||||
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
|
||||
diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
|
||||
index f53ba217e..d24bcaeb9 100644
|
||||
--- a/panels/printers/pp-host.c
|
||||
+++ b/panels/printers/pp-host.c
|
||||
@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task,
|
||||
devices = g_new0 (PpDevicesList, 1);
|
||||
|
||||
argv = g_new0 (gchar *, 3);
|
||||
- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
|
||||
+ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp");
|
||||
argv[1] = g_strdup (priv->hostname);
|
||||
|
||||
/* Use SNMP to get printer's informations */
|
||||
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
|
||||
index 35859526d..21486c917 100644
|
||||
--- a/panels/region/cc-region-panel.c
|
||||
+++ b/panels/region/cc-region-panel.c
|
||||
@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
|
||||
layout_variant = cc_input_source_get_layout_variant (source);
|
||||
|
||||
if (layout_variant && layout_variant[0])
|
||||
- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
|
||||
+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
|
||||
layout, variant);
|
||||
layout, layout_variant);
|
||||
else
|
||||
- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
|
||||
+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
|
||||
layout);
|
||||
|
||||
g_spawn_command_line_async (commandline, NULL);
|
||||
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
|
||||
index 00239ce0f..617c98870 100644
|
||||
--- a/panels/user-accounts/run-passwd.c
|
||||
+++ b/panels/user-accounts/run-passwd.c
|
||||
@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
|
||||
gchar **envp;
|
||||
gint my_stdin, my_stdout, my_stderr;
|
||||
|
||||
- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
|
||||
+ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
|
||||
argv[1] = NULL;
|
||||
|
||||
envp = g_get_environ ();
|
||||
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
|
||||
index 9cb92007a..84d2f0fa3 100644
|
||||
--- a/tests/datetime/test-endianess.c
|
||||
+++ b/tests/datetime/test-endianess.c
|
||||
@@ -26,7 +26,7 @@
|
||||
@@ -26,7 +26,7 @@ test_endianess (void)
|
||||
g_autoptr(GDir) dir = NULL;
|
||||
const char *name;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
|
||||
, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch
|
||||
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
|
||||
, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch
|
||||
, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-desktop-${version}";
|
||||
version = "3.30.2.1";
|
||||
version = "3.32.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
|
||||
sha256 = "0m3vs3rhhykr4xnwzi18h4bb1l05l8ykpiw4mi90dz19zk2ksfd6";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig which itstool gettext libxslt libxml2 gobject-introspection
|
||||
pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection
|
||||
gtk-doc docbook_xsl
|
||||
];
|
||||
buildInputs = [
|
||||
|
|
@ -32,15 +32,11 @@ stdenv.mkDerivation rec {
|
|||
bubblewrap_bin = "${bubblewrap}/bin/bwrap";
|
||||
inherit (builtins) storeDir;
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-missing-font-cache";
|
||||
url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch;
|
||||
sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-gtk-doc"
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
"-Ddesktop_docs=false"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-disk-utility-${version}";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi";
|
||||
sha256 = "1prnmfxll1hskqqbhd8lyz2zafbrj2dv04fn817rn3266dr94kpq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ stdenv, meson, ninja, gettext, fetchurl
|
||||
, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme
|
||||
, wrapGAppsHook, gnome3 }:
|
||||
, wrapGAppsHook, gnome3, harfbuzz }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-font-viewer-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
|
||||
sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
|
||||
buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ];
|
||||
buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ];
|
||||
|
||||
# Do not run meson-postinstall.sh
|
||||
preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-keyring-${version}";
|
||||
version = "3.28.2";
|
||||
version = "3.31.91";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
|
||||
sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
|
||||
, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
|
||||
, gettext, icu, glib-networking
|
||||
, gettext, icu, glib-networking, hicolor-icon-theme
|
||||
, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5";
|
||||
sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "dev" "devdoc" ];
|
||||
|
|
@ -31,6 +31,7 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
pkgconfig gobject-introspection vala gettext wrapGAppsHook
|
||||
libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
|
||||
hicolor-icon-theme # for setup-hook
|
||||
];
|
||||
buildInputs = [
|
||||
glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-screenshot";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8";
|
||||
sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-session-${version}";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa";
|
||||
sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,15 +1,48 @@
|
|||
{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst
|
||||
, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas
|
||||
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
|
||||
, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
|
||||
{ stdenv
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, gnome3
|
||||
, perl
|
||||
, gettext
|
||||
, gtk3
|
||||
, glib
|
||||
, libnotify
|
||||
, libgnomekbd
|
||||
, lcms2
|
||||
, libpulseaudio
|
||||
, alsaLib
|
||||
, libcanberra-gtk3
|
||||
, upower
|
||||
, colord
|
||||
, libgweather
|
||||
, polkit
|
||||
, gsettings-desktop-schemas
|
||||
, geoclue2
|
||||
, systemd
|
||||
, libgudev
|
||||
, libwacom
|
||||
, libxslt
|
||||
, libxml2
|
||||
, networkmanager
|
||||
, gnome-desktop
|
||||
, geocode-glib
|
||||
, docbook_xsl
|
||||
, wrapGAppsHook
|
||||
, python3
|
||||
, tzdata
|
||||
, nss
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-settings-daemon-${version}";
|
||||
version = "3.30.2";
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -19,13 +52,41 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
perl
|
||||
gettext
|
||||
libxml2
|
||||
libxslt
|
||||
docbook_xsl
|
||||
wrapGAppsHook
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ibus gtk3 glib gsettings-desktop-schemas networkmanager
|
||||
libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
|
||||
libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
|
||||
polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
|
||||
gtk3
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
networkmanager
|
||||
libnotify
|
||||
libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
|
||||
gnome-desktop
|
||||
lcms2
|
||||
libpulseaudio
|
||||
alsaLib
|
||||
libcanberra-gtk3
|
||||
upower
|
||||
colord
|
||||
libgweather
|
||||
nss
|
||||
polkit
|
||||
geocode-glib
|
||||
geoclue2
|
||||
systemd
|
||||
libgudev
|
||||
libwacom
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -41,8 +102,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "gnome-settings-daemon";
|
||||
attrPath = "gnome3.gnome-settings-daemon";
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-extensions-${version}";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p";
|
||||
sha256 = "0wzrivhp6vs4754yldza38gkhkhah35rdncb3c3hxhhyv9fr3pl5";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,11 @@
|
|||
From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
|
||||
Date: Tue, 3 Apr 2018 14:13:12 +0200
|
||||
Subject: [PATCH] Fix gmenu typelib path
|
||||
|
||||
---
|
||||
extensions/apps-menu/extension.js | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
|
||||
index 5b38213..d706f64 100644
|
||||
--- a/extensions/apps-menu/extension.js
|
||||
+++ b/extensions/apps-menu/extension.js
|
||||
@@ -1,5 +1,7 @@
|
||||
@@ -1,6 +1,8 @@
|
||||
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||
/* exported init enable disable */
|
||||
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@');
|
||||
+
|
||||
const Atk = imports.gi.Atk;
|
||||
const DND = imports.ui.dnd;
|
||||
const GMenu = imports.gi.GMenu;
|
||||
--
|
||||
2.16.2
|
||||
|
||||
const {
|
||||
Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
|
||||
} = imports.gi;
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-${version}";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2";
|
||||
sha256 = "1djkswsv3fhb3lf2w77bbl6z2kvji29cfxbwh5gqvyykwwx87y92";
|
||||
};
|
||||
|
||||
LANG = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
null);
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -1019,7 +1019,7 @@
|
||||
@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button {
|
||||
let description = xkbLayout;
|
||||
if (xkbVariant.length > 0)
|
||||
description = description + '\t' + xkbVariant;
|
||||
|
||||
- Util.spawn(['gkbd-keyboard-display', '-l', description]);
|
||||
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
|
||||
},
|
||||
|
||||
_containerGetPreferredWidth: function(container, for_height, alloc) {
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
|
||||
, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
|
||||
, gtk3, gsettings-desktop-schemas, gnome-desktop
|
||||
, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme
|
||||
, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-software-${version}";
|
||||
version = "3.30.6";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl";
|
||||
sha256 = "19hrvkyavrfrhs19ii4ky5bpzsijiyq2vcxb5s4xk13xv8ys2151";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43
|
||||
valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection
|
||||
hicolor-icon-theme # for setup-hook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||
gsettings-desktop-schemas gnome-desktop
|
||||
gspell json-glib libsecret ostree
|
||||
polkit flatpak fwupd
|
||||
libxmlb gnome-online-accounts
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-system-monitor-${version}";
|
||||
version = "3.30.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888";
|
||||
sha256 = "1qvpibyhdcmscyja5a5i5nc206vmqw8xp3p8mgcignyi5njc805g";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-terminal-${version}";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb";
|
||||
sha256 = "1p4m2k63caprxmwf8d5ycpzkv3yj7146hhvnbjnr9dkl95bl41r4";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-user-docs-${version}";
|
||||
version = "3.30.2";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1pgsrvd79rqxa183wsmzh422y2zsg7fl5hskgc0s87jsc8b57fkg";
|
||||
sha256 = "0lqbhhihxkflwckm3b8dgq62rjljkzdghcc4k4ym7n2hyc304vxy";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,25 +1,30 @@
|
|||
{ stdenv, intltool, fetchurl, apacheHttpd, nautilus
|
||||
, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme
|
||||
, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
|
||||
, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
|
||||
{ stdenv
|
||||
, gettext
|
||||
, fetchurl
|
||||
, apacheHttpd
|
||||
, nautilus
|
||||
, pkgconfig
|
||||
, gtk3
|
||||
, glib
|
||||
, libxml2
|
||||
, systemd
|
||||
, wrapGAppsHook
|
||||
, itstool
|
||||
, libnotify
|
||||
, mod_dnssd
|
||||
, gnome3
|
||||
, libcanberra-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-user-share-${version}";
|
||||
version = "3.28.0";
|
||||
pname = "gnome-user-share";
|
||||
version = "3.32.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09";
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; };
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
|
||||
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
|
||||
|
|
@ -29,22 +34,35 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--with-httpd=${apacheHttpd.out}/bin/httpd"
|
||||
"--with-modules-path=${apacheHttpd.dev}/modules"
|
||||
"--with-systemduserunitdir=$(out)/etc/systemd/user"
|
||||
"--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0"
|
||||
"--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
|
||||
"--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
gettext
|
||||
itstool
|
||||
libxml2
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
gtk3 glib intltool itstool libxml2 libtool
|
||||
wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg
|
||||
nautilus libnotify libcanberra-gtk3 systemd
|
||||
gtk3
|
||||
glib
|
||||
nautilus
|
||||
libnotify
|
||||
libcanberra-gtk3
|
||||
systemd
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/gsettings-schemas/$name
|
||||
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
|
||||
glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas"
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome3.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://help.gnome.org/users/gnome-user-share/3.8;
|
||||
|
|
|
|||
|
|
@ -1,23 +1,29 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
# just for passthru
|
||||
, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gsettings-desktop-schemas-${version}";
|
||||
version = "3.28.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq";
|
||||
sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; };
|
||||
};
|
||||
|
||||
# meson installs the schemas to share/glib-2.0/schemas
|
||||
# We add the override file there too so it will be compiled and later moved by
|
||||
# glib's setup hook.
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas
|
||||
cat - > $out/share/gsettings-schemas/${name}/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF
|
||||
mkdir -p $out/share/glib-2.0/schemas
|
||||
cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF
|
||||
[org.gnome.desktop.background]
|
||||
picture-uri='''
|
||||
|
||||
|
|
@ -26,9 +32,14 @@ stdenv.mkDerivation rec {
|
|||
EOF
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/post-install.py
|
||||
patchShebangs build-aux/meson/post-install.py
|
||||
'';
|
||||
|
||||
buildInputs = [ glib gobject-introspection ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig python3 meson ninja ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = gnome3.maintainers;
|
||||
|
|
|
|||
|
|
@ -7,17 +7,17 @@
|
|||
let
|
||||
unicode-data = callPackage ./unicode-data.nix {};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gucharmap-${version}";
|
||||
version = "11.0.3";
|
||||
pname = "gucharmap";
|
||||
version = "12.0.1";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gucharmap";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1a590nxy8jdf6zxh6jdsyvhxyaz94ixx3aa1pj7gicf1aqp26vnh";
|
||||
sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "gucharmap";
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
{ fetchurl, stdenv, gnome3 }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unicode-data-${version}";
|
||||
version = "11.0.0";
|
||||
version = "12.0.0";
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt";
|
||||
sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b";
|
||||
sha256 = "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt";
|
||||
sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb";
|
||||
sha256 = "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt";
|
||||
sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8";
|
||||
sha256 = "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt";
|
||||
sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9";
|
||||
sha256 = "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt";
|
||||
sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9";
|
||||
sha256 = "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip";
|
||||
sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj";
|
||||
sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf";
|
||||
})
|
||||
];
|
||||
phases = "installPhase";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue