Merge branch 'staging'

There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.

Changed files
+1092 -1044
doc
nixos
modules
services
desktops
x11
desktop-managers
pkgs
applications
editors
misc
deepin-terminal
video
omxplayer
build-support
desktops
gnome-2
bindings
libglademm
gnome-3
apps
bijiben
cheese
evolution
file-roller
glade
gnome-boxes
gnome-calendar
gnome-characters
gnome-clocks
gnome-documents
gnome-getting-started-docs
gnome-logs
gnome-maps
gnome-music
gnome-photos
gnome-weather
polari
seahorse
core
adwaita-icon-theme
baobab
caribou
dconf-editor
eog
epiphany
evince
evolution-data-server
folks
gcr
gdm
gjs
gnome-backgrounds
gnome-bluetooth
gnome-calculator
gnome-contacts
gnome-control-center
gnome-desktop
gnome-dictionary
gnome-disk-utility
gnome-font-viewer
gnome-keyring
gnome-online-accounts
gnome-online-miners
gnome-screenshot
gnome-session
gnome-settings-daemon
gnome-shell
gnome-shell-extensions
gnome-software
gnome-system-monitor
gnome-terminal
gnome-user-docs
gsettings-desktop-schemas
gsound
libgee
libgepub
libgnomekbd
libgweather
mutter
nautilus
simple-scan
totem
totem-pl-parser
tracker
tracker-miners
vte
yelp
zenity
devtools
anjuta
devhelp
gdl
gnome-devel-docs
extensions
dash-to-dock
topicons-plus
games
five-or-more
gnome-chess
gnome-klotski
gnome-mines
gnome-sudoku
gnome-taquin
hitori
iagno
lightsoff
swell-foop
misc
pantheon
apps
pantheon-terminal
development
compilers
libraries
boost
ffmpeg
ffmpeg-full
giflib
glib
gnutls
granite
gtk+
gvfs
harfbuzz
libav
libdrm
libsecret
libsoup
libxmlxx
mesa
nettle
newt
pango
pcre2
qt-4.x
zeitgeist
zlib
tools
build-managers
documentation
misc
binutils
misc
uboot
os-specific
darwin
binutils
cctools
linux
busybox
kernel
klibc
mdadm
systemd
windows
servers
tools
misc
networking
htpdate
top-level
+1 -1
doc/multiple-output.xml
···
<varlistentry><term><varname>
$outputDevdoc</varname></term><listitem><para>
-
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
+
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
</para></listitem></varlistentry>
<varlistentry><term><varname>
+1
nixos/modules/module-list.nix
···
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
+
./services/desktops/gnome3/tracker-miners.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/telepathy.nix
./services/development/hoogle.nix
+41
nixos/modules/services/desktops/gnome3/tracker-miners.nix
···
+
# Tracker Miners daemons.
+
+
{ config, pkgs, lib, ... }:
+
+
with lib;
+
+
{
+
+
###### interface
+
+
options = {
+
+
services.gnome3.tracker-miners = {
+
+
enable = mkOption {
+
type = types.bool;
+
default = false;
+
description = ''
+
Whether to enable Tracker miners, indexing services for Tracker
+
search engine and metadata storage system.
+
'';
+
};
+
+
};
+
+
};
+
+
+
###### implementation
+
+
config = mkIf config.services.gnome3.tracker-miners.enable {
+
+
environment.systemPackages = [ pkgs.gnome3.tracker-miners ];
+
+
services.dbus.packages = [ pkgs.gnome3.tracker-miners ];
+
+
systemd.packages = [ pkgs.gnome3.tracker-miners ];
+
+
};
+
+
}
+2 -1
nixos/modules/services/x11/desktop-managers/gnome3.nix
···
services.gnome3.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true;
+
services.gnome3.tracker-miners.enable = mkDefault true;
hardware.pulseaudio.enable = mkDefault true;
services.telepathy.enable = mkDefault true;
networking.networkmanager.enable = mkDefault true;
···
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
# Override gsettings-desktop-schema
-
export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+
export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
# Let nautilus find extensions
export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
+2 -2
pkgs/applications/editors/ed/default.nix
···
installFlags = [ "DESTDIR=$(out)" ];
configureFlags = [
-
"--exec-prefix=${stdenv.cc.prefix}"
-
"CC=${stdenv.cc.prefix}cc"
+
"--exec-prefix=${stdenv.cc.targetPrefix}"
+
"CC=${stdenv.cc.targetPrefix}cc"
];
meta = {
+6 -5
pkgs/applications/misc/deepin-terminal/default.nix
···
-
{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }:
+
{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }:
stdenv.mkDerivation rec {
name = "deepin-terminal-${version}";
-
version = "2.3.3";
+
version = "2.6.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
-
sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h";
+
sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b";
};
patchPhase = ''
substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
'';
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ];
+
+
nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ];
+
buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ];
meta = {
description = "The default terminal emulation for Deepin";
+1 -1
pkgs/applications/video/omxplayer/default.nix
···
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
-
"--cross-prefix=${stdenv.cc.prefix}"
+
"--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${hostPlatform.arch}"
-108
pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash
···
-
#! @shell@
-
-
set -eu -o pipefail
-
-
path_backup="$PATH"
-
if [ -n "@coreutils_bin@" ]; then
-
PATH="@coreutils_bin@/bin"
-
fi
-
-
declare -r recurThreshold=300
-
-
declare overflowCount=0
-
for ((n=0; n < $#; ++n)); do
-
case "${!n}" in
-
-l*) let overflowCount+=1 ;;
-
-reexport-l*) let overflowCount+=1 ;;
-
*) ;;
-
esac
-
done
-
-
declare -a allArgs=()
-
-
if (( "$overflowCount" <= "$recurThreshold" )); then
-
allArgs=("$@")
-
else
-
declare -a childrenLookup=() childrenLink=()
-
-
while (( $# )); do
-
case "$1" in
-
-L/*)
-
childrenLookup+=("$1")
-
allArgs+=("$1")
-
;;
-
-L)
-
echo "cctools LD does not support '-L foo' or '-l foo'" >&2
-
exit 1
-
;;
-
-l)
-
echo "cctools LD does not support '-L foo' or '-l foo'" >&2
-
exit 1
-
;;
-
-lazy_library | -lazy_framework | -lto_library)
-
# We aren't linking any "azy_library", "to_library", etc.
-
allArgs+=("$1")
-
;;
-
-lazy-l | -weak-l) allArgs+=("$1") ;;
-
# We can't so easily prevent header issues from these.
-
-lSystem) allArgs+=("$1") ;;
-
# Special case as indirection seems like a bad idea for something
-
# so fundamental. Can be removed for simplicity.
-
-l?* | -reexport-l?*) childrenLink+=("$1") ;;
-
*) allArgs+=("$1") ;;
-
esac
-
-
shift
-
done
-
-
declare n=0
-
while (( $n < "${#childrenLink[@]}" )); do
-
if [[ "${childrenLink[n]}" = -l* ]]; then
-
childrenLink[n]="-reexport${childrenLink[n]}"
-
fi
-
let ++n
-
done
-
unset n
-
-
declare -r outputNameLibless=$(basename $( \
-
if [[ -z "${outputName:+isUndefined}" ]]; then
-
echo unnamed
-
elif [[ "${outputName:0:3}" = lib ]]; then
-
echo "${outputName:3}"
-
else
-
echo "${outputName}"
-
fi))
-
declare -ra children=("$outputNameLibless-reexport-delegate-0" \
-
"$outputNameLibless-reexport-delegate-1")
-
-
mkdir -p "$out/lib"
-
-
PATH="$PATH:@out@/bin"
-
-
symbolBloatObject=$outputNameLibless-symbol-hack.o
-
if [[ ! -e $symbolBloatObject ]]; then
-
# `-Q` means use GNU Assembler rather than Clang, avoiding an awkward
-
# dependency cycle.
-
printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
-
| @binPrefix@as -Q -- -o $symbolBloatObject
-
fi
-
-
# first half of libs
-
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
-
-o "$out/lib/lib${children[0]}.dylib" \
-
-install_name "$out/lib/lib${children[0]}.dylib" \
-
"${childrenLookup[@]}" "$symbolBloatObject" \
-
"${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
-
-
# second half of libs
-
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
-
-o "$out/lib/lib${children[1]}.dylib" \
-
-install_name "$out/lib/lib${children[1]}.dylib" \
-
"${childrenLookup[@]}" "$symbolBloatObject" \
-
"${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
-
-
allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")
-
fi
-
-
PATH="$path_backup"
-
exec @prog@ "${allArgs[@]}"
+44 -46
pkgs/build-support/cc-wrapper/default.nix
···
#
# TODO(@Ericson2314) Make unconditional, or optional but always true by
# default.
-
prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
-
(targetPlatform.config + "-");
+
targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
+
(targetPlatform.config + "-");
ccVersion = (builtins.parseDrvName cc.name).version;
ccName = (builtins.parseDrvName cc.name).name;
···
in
stdenv.mkDerivation {
-
name = prefix
+
name = targetPrefix
+ (if name != "" then name else "${ccName}-wrapper")
+ (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}");
···
shell = getBin shell + shell.shellPath or "";
gnugrep_bin = if nativeTools then "" else gnugrep;
-
binPrefix = prefix;
-
inherit infixSalt;
+
inherit targetPrefix infixSalt;
outputs = [ "out" "man" ];
···
# Binutils, and Apple's "cctools"; "binutils" as an attempt to find an
# unused middle-ground name that evokes both.
bintools = binutils_bin;
-
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
-
prefix;
+
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
emacsBufferSetup = pkgs: ''
; We should handle propagation here too
···
+ optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
# Solaris needs an additional ld wrapper.
ldPath="${nativePrefix}/bin"
-
exec="$ldPath/${prefix}ld"
+
exec="$ldPath/${targetPrefix}ld"
wrap ld-solaris ${./ld-solaris-wrapper.sh}
'')
···
# Create a symlink to as (the assembler). This is useful when a
# cc-wrapper is installed in a user environment, as it ensures that
# the right assembler is called.
-
if [ -e $ldPath/${prefix}as ]; then
-
ln -s $ldPath/${prefix}as $out/bin/${prefix}as
+
if [ -e $ldPath/${targetPrefix}as ]; then
+
ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as
fi
'' + (if !useMacosReexportHack then ''
-
wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
+
wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}
'' else ''
-
ldInner="${prefix}ld-reexport-delegate"
-
wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld}
-
wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner"
+
ldInner="${targetPrefix}ld-reexport-delegate"
+
wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld}
+
wrap "${targetPrefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner"
unset ldInner
'') + ''
-
if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
-
wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
+
if [ -e ${binutils_bin}/bin/${targetPrefix}ld.gold ]; then
+
wrap ${targetPrefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${targetPrefix}ld.gold
fi
if [ -e ${binutils_bin}/bin/ld.bfd ]; then
-
wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
+
wrap ${targetPrefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${targetPrefix}ld.bfd
fi
# We export environment variables pointing to the wrapped nonstandard
# cmds, lest some lousy configure script use those to guess compiler
# version.
-
export named_cc=${prefix}cc
-
export named_cxx=${prefix}c++
+
export named_cc=${targetPrefix}cc
+
export named_cxx=${targetPrefix}c++
export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
-
if [ -e $ccPath/${prefix}gcc ]; then
-
wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc
-
ln -s ${prefix}gcc $out/bin/${prefix}cc
-
export named_cc=${prefix}gcc
-
export named_cxx=${prefix}g++
+
if [ -e $ccPath/${targetPrefix}gcc ]; then
+
wrap ${targetPrefix}gcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcc
+
ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc
+
export named_cc=${targetPrefix}gcc
+
export named_cxx=${targetPrefix}g++
elif [ -e $ccPath/clang ]; then
-
wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang
-
ln -s ${prefix}clang $out/bin/${prefix}cc
-
export named_cc=${prefix}clang
-
export named_cxx=${prefix}clang++
+
wrap ${targetPrefix}clang ${./cc-wrapper.sh} $ccPath/clang
+
ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc
+
export named_cc=${targetPrefix}clang
+
export named_cxx=${targetPrefix}clang++
fi
-
if [ -e $ccPath/${prefix}g++ ]; then
-
wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++
-
ln -s ${prefix}g++ $out/bin/${prefix}c++
+
if [ -e $ccPath/${targetPrefix}g++ ]; then
+
wrap ${targetPrefix}g++ ${./cc-wrapper.sh} $ccPath/${targetPrefix}g++
+
ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++
elif [ -e $ccPath/clang++ ]; then
-
wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++
-
ln -s ${prefix}clang++ $out/bin/${prefix}c++
+
wrap ${targetPrefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++
+
ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++
fi
if [ -e $ccPath/cpp ]; then
-
wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp
+
wrap ${targetPrefix}cpp ${./cc-wrapper.sh} $ccPath/cpp
fi
''
+ optionalString cc.langFortran or false ''
-
wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran
-
ln -sv ${prefix}gfortran $out/bin/${prefix}g77
-
ln -sv ${prefix}gfortran $out/bin/${prefix}f77
+
wrap ${targetPrefix}gfortran ${./cc-wrapper.sh} $ccPath/${targetPrefix}gfortran
+
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
+
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
''
+ optionalString cc.langJava or false ''
-
wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj
+
wrap ${targetPrefix}gcj ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcj
''
+ optionalString cc.langGo or false ''
-
wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo
+
wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo
''
+ optionalString cc.langAda or false ''
-
wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc
-
wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake
-
wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind
-
wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink
+
wrap ${targetPrefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gnatgcc
+
wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake
+
wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind
+
wrap ${targetPrefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${targetPrefix}gnatlink
''
+ optionalString cc.langVhdl or false ''
-
ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
+
ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl
'';
propagatedBuildInputs = extraPackages;
···
# some linkers on some platforms don't support specific -z flags
export hardening_unsupported_flags=""
-
if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
+
if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
hardening_unsupported_flags+=" bindnow"
fi
-
if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
+
if [[ "$($ldPath/${targetPrefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
hardening_unsupported_flags+=" relro"
fi
''
+3 -3
pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
···
symbolBloatObject=$outputNameLibless-symbol-hack.o
if [[ ! -e $symbolBloatObject ]]; then
printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
-
| @binPrefix@as -- -o $symbolBloatObject
+
| @targetPrefix@as -- -o $symbolBloatObject
fi
# first half of libs
-
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
+
@targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
-o "$out/lib/lib${children[0]}.dylib" \
-install_name "$out/lib/lib${children[0]}.dylib" \
"${childrenLookup[@]}" "$symbolBloatObject" \
"${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
# second half of libs
-
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
+
@targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
-o "$out/lib/lib${children[1]}.dylib" \
-install_name "$out/lib/lib${children[1]}.dylib" \
"${childrenLookup[@]}" "$symbolBloatObject" \
+2 -2
pkgs/build-support/cc-wrapper/setup-hook.sh
···
ar as nm objcopy ranlib strip strings size ld windres
do
if
-
PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null
+
PATH=$_PATH type -p "@targetPrefix@$CMD" > /dev/null
then
-
export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}";
+
export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@targetPrefix@${CMD}";
fi
done
+1
pkgs/build-support/setup-hooks/multiple-outputs.sh
···
moveToOutput share/info "${!outputInfo}"
moveToOutput share/doc "${!outputDoc}"
moveToOutput share/gtk-doc "${!outputDevdoc}"
+
moveToOutput share/devhelp/books "${!outputDevdoc}"
# the default outputMan is in $bin
moveToOutput share/man "${!outputMan}"
+3 -1
pkgs/desktops/gnome-2/bindings/libglademm/default.nix
···
url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
};
-
+
+
outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool ];
+19 -13
pkgs/desktops/gnome-3/apps/bijiben/default.nix
···
-
{ stdenv, intltool, fetchurl, pkgconfig, glib
+
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib
, evolution_data_server, evolution, sqlite
-
, makeWrapper, itstool, desktop_file_utils
+
, wrapGAppsHook, itstool, desktop_file_utils
, clutter_gtk, libuuid, webkitgtk, zeitgeist
, gnome3, librsvg, gdk_pixbuf, libxml2 }:
···
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
+
checkPhase = "meson test";
+
+
patches = [
+
./no-update-icon-cache.patch
+
];
+
+
postPatch = ''
+
chmod +x meson_post_install.py
+
patchShebangs meson_post_install.py
+
'';
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ glib intltool itstool libxml2
-
clutter_gtk libuuid webkitgtk gnome3.tracker
-
gnome3.gnome_online_accounts zeitgeist desktop_file_utils
-
gnome3.gsettings_desktop_schemas makeWrapper
+
nativeBuildInputs = [
+
meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook
+
];
+
buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker
+
gnome3.gnome_online_accounts zeitgeist
+
gnome3.gsettings_desktop_schemas
gdk_pixbuf gnome3.defaultIconTheme librsvg
evolution_data_server evolution sqlite ];
enableParallelBuilding = true;
-
preFixup = ''
-
wrapProgram "$out/bin/bijiben" \
-
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
'';
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Bijiben;
description = "Note editor designed to remain simple to use";
+
broken = true;
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.linux;
+22
pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch
···
+
--- a/meson_post_install.py
+
+++ b/meson_post_install.py
+
@@ -7,10 +7,6 @@
+
if not os.environ.get('DESTDIR'):
+
datadir = sys.argv[1]
+
+
- icondir = os.path.join(datadir, 'icons', 'hicolor')
+
- print('Update icon cache...')
+
- subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
+
-
+
schemadir = os.path.join(datadir, 'glib-2.0', 'schemas')
+
print('Compile gsettings schemas...')
+
subprocess.call(['glib-compile-schemas', schemadir])
+
@@ -18,8 +14,3 @@
+
desktop_file = os.path.join(datadir, 'applications', 'org.gnome.bijiben.desktop')
+
print('Validate desktop file...')
+
subprocess.call(['desktop-file-validate', desktop_file])
+
-
+
- if sys.argv[2] == 'update-mimedb':
+
- mimedir = os.path.join(datadir, 'mime')
+
- print('Update mime database...')
+
- subprocess.call(['update-mime-database', mimedir])
+3 -3
pkgs/desktops/gnome-3/apps/bijiben/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "bijiben-3.24.1";
+
name = "bijiben-3.27.1";
src = fetchurl {
-
url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz;
-
sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741";
+
url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz;
+
sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64";
};
}
-2
pkgs/desktops/gnome-3/apps/cheese/default.nix
···
enableParallelBuilding = true;
-
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Cheese;
description = "Take photos and videos with your webcam, with fun graphical effects";
+3 -3
pkgs/desktops/gnome-3/apps/cheese/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "cheese-3.24.0";
+
name = "cheese-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz;
-
sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372";
+
url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz;
+
sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605";
};
}
+5 -10
pkgs/desktops/gnome-3/apps/evolution/default.nix
···
-
{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
+
{ stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight
, pkgconfig, gtk3, glib, libnotify, gtkspell3
, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
-
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap
-
, cmake}:
+
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
+
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }:
let
majVer = gnome3.version;
···
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
gnome3.evolution_data_server ];
-
propagatedBuildInputs = [ gnome3.gtkhtml ];
-
-
buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
-
gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
+
buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
gnome3.evolution_data_server libsecret libical gcr
webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
···
nss nspr libnotify procps highlight gnome3.libgweather
gnome3.gsettings_desktop_schemas
gnome3.libgnome_keyring gnome3.glib_networking openldap
-
cmake
];
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ];
configureFlags = [ "--disable-pst-import" "--disable-autoar"
+3 -3
pkgs/desktops/gnome-3/apps/evolution/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "evolution-3.24.5";
+
name = "evolution-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz;
-
sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189";
+
url = mirror://gnome/sources/evolution/3.26/evolution-3.26.2.tar.xz;
+
sha256 = "2d9299b8414903021faa03cbb885814de454f5260398eb2c2a03600224479137";
};
}
+3 -3
pkgs/desktops/gnome-3/apps/file-roller/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "file-roller-3.24.1";
+
name = "file-roller-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz;
-
sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a";
+
url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz;
+
sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5";
};
}
+5 -5
pkgs/desktops/gnome-3/apps/glade/default.nix
···
{ stdenv, intltool, fetchurl, python, autoreconfHook
-
, pkgconfig, gtk3, glib
-
, makeWrapper, itstool, libxml2, docbook_xsl
-
, gnome3, librsvg, gdk_pixbuf, libxslt }:
+
, pkgconfig, gtk3, glib, gobjectIntrospection
+
, wrapGAppsHook, itstool, libxml2, docbook_xsl
+
, gnome3, gdk_pixbuf, libxslt }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [
-
pkgconfig intltool itstool makeWrapper docbook_xsl libxslt
+
pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection
# reconfiguration
autoreconfHook gnome3.gnome_common gnome3.yelp_tools
];
buildInputs = [ gtk3 glib libxml2 python
gnome3.gsettings_desktop_schemas
-
gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+
gdk_pixbuf gnome3.defaultIconTheme ];
enableParallelBuilding = true;
+5 -5
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
···
-
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
+
{ stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
+
, 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
···
doCheck = true;
nativeBuildInputs = [
-
makeWrapper pkgconfig intltool
+
makeWrapper pkgconfig gettext
];
buildInputs = [
itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
-
libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
-
tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
+
libvirt spice_gtk spice_protocol libsoup libosinfo systemd
+
tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive
gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret
libcap_ng numactl xen libapparmor
];
+3 -3
pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-boxes-3.24.0";
+
name = "gnome-boxes-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz;
-
sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49";
+
url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz;
+
sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210";
};
}
+10 -6
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-
, intltool, evolution_data_server, sqlite, libxml2, libsoup
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
+
, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup
, glib, gnome_online_accounts, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
···
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
nativeBuildInputs = [ pkgconfig ];
+
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
buildInputs = [
-
gtk3 wrapGAppsHook intltool evolution_data_server
-
sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts
-
gsettings_desktop_schemas
+
gtk evolution_data_server libsoup glib gnome_online_accounts
+
gsettings_desktop_schemas gnome3.defaultIconTheme
];
+
+
postPatch = ''
+
chmod +x meson_post_install.py # patchShebangs requires executable file
+
patchShebangs meson_post_install.py
+
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Calendar;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-calendar-3.24.3";
+
name = "gnome-calendar-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz;
-
sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec";
+
url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz;
+
sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e";
};
}
+3 -3
pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-characters-3.24.0";
+
name = "gnome-characters-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz;
-
sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596";
+
url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz;
+
sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b";
};
}
+13 -10
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
···
-
{ stdenv, intltool, fetchurl, libgweather, libnotify
-
, pkgconfig, gtk3, glib, gsound
-
, makeWrapper, itstool, libcanberra_gtk3, libtool
-
, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
+
{ stdenv, fetchurl
+
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils
+
, vala, gtk3, glib, gsound, libcanberra_gtk3
+
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3
-
gnome3.gsettings_desktop_schemas makeWrapper
-
gdk_pixbuf gnome3.defaultIconTheme librsvg
+
nativeBuildInputs = [ vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils ];
+
buildInputs = [ gtk3 glib libcanberra_gtk3
+
gnome3.gsettings_desktop_schemas
+
gdk_pixbuf gnome3.defaultIconTheme
gnome3.gnome_desktop gnome3.geocode_glib geoclue2
-
libgweather libnotify libtool gsound
-
wrapGAppsHook ];
+
libgweather gsound ];
enableParallelBuilding = true;
+
+
prePatch = "patchShebangs build-aux/";
+
+
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Clocks;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-clocks-3.24.0";
+
name = "gnome-clocks-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz;
-
sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36";
+
url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz;
+
sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7";
};
}
+8 -11
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
···
-
{ stdenv, intltool, fetchurl, evince, gjs
-
, pkgconfig, gtk3, glib
-
, makeWrapper, itstool, libxslt, webkitgtk
+
{ stdenv, gettext, fetchurl, evince, gjs
+
, pkgconfig, gtk3, glib, tracker, tracker-miners
+
, itstool, libxslt, webkitgtk
, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
, gobjectIntrospection, json_glib, inkscape, poppler_utils
, gmp, desktop_file_utils, wrapGAppsHook }:
···
configureFlags = [ "--enable-getting-started" ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool libxslt
-
docbook_xsl desktop_file_utils inkscape poppler_utils
-
gnome3.gsettings_desktop_schemas makeWrapper gmp
+
nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ];
+
buildInputs = [ gtk3 glib inkscape poppler_utils
+
gnome3.gsettings_desktop_schemas gmp
gdk_pixbuf gnome3.defaultIconTheme librsvg evince
libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-
gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
-
gnome3.gnome_desktop gnome3.libzapojit json_glib
-
wrapGAppsHook ]
-
++ (with gnome3; [ libgepub ]);
+
tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts
+
gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ];
enableParallelBuilding = true;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-documents-3.24.3";
+
name = "gnome-documents-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz;
-
sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0";
+
url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz;
+
sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9";
};
}
+3 -3
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-getting-started-docs-3.24.1";
+
name = "gnome-getting-started-docs-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz;
-
sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97";
+
url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz;
+
sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775";
};
}
+3 -3
pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-logs-3.24.2";
+
name = "gnome-logs-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz;
-
sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4";
+
url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz;
+
sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c";
};
}
+3 -3
pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-maps-3.24.3";
+
name = "gnome-maps-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz;
-
sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6";
+
url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz;
+
sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050";
};
}
+2 -2
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
···
-
{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
+
{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners
, libxml2, python3Packages, libnotify, wrapGAppsHook
, pkgconfig, gtk3, glib, cairo
, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
···
python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
-
gnome3.gsettings_desktop_schemas makeWrapper tracker ];
+
gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ];
wrapPrefixVariables = [ "PYTHONPATH" ];
+3 -3
pkgs/desktops/gnome-3/apps/gnome-music/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-music-3.24.2";
+
name = "gnome-music-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz;
-
sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c";
+
url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz;
+
sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3";
};
}
+2 -2
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
···
{ stdenv, intltool, fetchurl, exempi, libxml2
-
, pkgconfig, gtk3, glib
+
, pkgconfig, gtk3, glib, tracker, tracker-miners
, makeWrapper, itstool, gegl, babl, lcms2
, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib
···
gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
gnome3.gnome_online_accounts gnome3.gnome_desktop
-
lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
+
lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils
wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ];
enableParallelBuilding = true;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-photos-3.24.3";
+
name = "gnome-photos-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz;
-
sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288";
+
url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.2.tar.xz;
+
sha256 = "9001ed2794da44522a1d700c7b5aff40ede92f80ba17031f0dfa7f54d6d05657";
};
}
+3 -3
pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-weather-3.24.0";
+
name = "gnome-weather-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz;
-
sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574";
+
url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz;
+
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
};
}
+14 -6
pkgs/desktops/gnome-3/apps/polari/default.nix
···
-
{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
-
, telepathy_glib, gjs, itstool, telepathy_idle, libxml2
-
, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
+
{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme
+
, telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils
+
, pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
, gnome3, wrapGAppsHook, telepathy_logger, gspell }:
stdenv.mkDerivation rec {
···
propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
-
telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
+
nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2
+
desktop_file_utils gobjectIntrospection appstream-glib ];
+
buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas
+
telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ];
+
+
patches = [
+
(fetchpatch {
+
url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff;
+
sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9";
+
})
+
];
enableParallelBuilding = true;
+3 -3
pkgs/desktops/gnome-3/apps/polari/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "polari-3.24.2";
+
name = "polari-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz;
-
sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42";
+
url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz;
+
sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190";
};
}
+2 -2
pkgs/desktops/gnome-3/apps/seahorse/default.nix
···
-
{ stdenv, intltool, fetchurl, vala_0_32
+
{ stdenv, intltool, fetchurl, vala
, pkgconfig, gtk3, glib
, wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, librsvg, gdk_pixbuf, gpgme
···
buildInputs = [ gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-
libsecret avahi libsoup p11_kit vala_0_32
+
libsecret avahi libsoup p11_kit vala
openssh ];
preFixup = ''
+3 -3
pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "adwaita-icon-theme-3.24.0";
+
name = "adwaita-icon-theme-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz;
-
sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a";
+
url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.0.tar.xz;
+
sha256 = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212";
};
}
+3 -3
pkgs/desktops/gnome-3/core/baobab/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "baobab-3.24.0";
+
name = "baobab-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz;
-
sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f";
+
url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz;
+
sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e";
};
}
+7 -5
pkgs/desktops/gnome-3/core/caribou/default.nix
···
-
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
-
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }:
+
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2
+
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook
+
, wrapGAppsHook }:
let
majorVersion = "0.4";
+
pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
in
stdenv.mkDerivation rec {
name = "caribou-${majorVersion}.21";
···
sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
};
-
nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ];
buildInputs = with gnome3;
-
[ glib gtk clutter at_spi2_core dbus pythonPackages.python
-
pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
+
[ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3
+
libXtst gtk2 ];
propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+2 -2
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
···
-
{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
+
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
stdenv.mkDerivation rec {
···
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
+
buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas
intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
+3 -3
pkgs/desktops/gnome-3/core/dconf-editor/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "dconf-editor-3.22.0";
+
name = "dconf-editor-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz;
-
sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f";
+
url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz;
+
sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1";
};
}
+3 -3
pkgs/desktops/gnome-3/core/eog/default.nix
···
-
{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
+
{ fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3
, shared_mime_info, wrapGAppsHook, librsvg, libexif }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
buildInputs = with gnome3;
-
[ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg
+
[ libxml2 libjpeg gtk glib libpeas librsvg
gsettings_desktop_schemas shared_mime_info adwaita-icon-theme
gnome_desktop libexif dconf ];
+3 -3
pkgs/desktops/gnome-3/core/eog/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "eog-3.24.1";
+
name = "eog-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz;
-
sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7";
+
url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz;
+
sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad";
};
}
+22 -14
pkgs/desktops/gnome-3/core/epiphany/default.nix
···
-
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-
, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
+
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
+
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
-
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-
, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:
+
, sqlite, gcr, isocodes, desktop_file_utils, file
+
, gdk_pixbuf, gnome_common, gst_all_1, json_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# Tests need an X display
-
configureFlags = [ "--disable-static --disable-tests" ];
+
mesonFlags = [ "-Dunit_tests=false" ];
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
+
nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ];
-
buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file
-
webkitgtk libsoup libsecret gnome_desktop libnotify libtool
-
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
-
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
-
gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
+
buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify
+
sqlite isocodes p11_kit icu gnome3.yelp_tools
+
gdk_pixbuf gnome3.defaultIconTheme gnome_common 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
gst_all_1.gst-libav json_glib ];
-
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
+
enableParallelBuilding = true;
-
enableParallelBuilding = true;
+
postPatch = ''
+
chmod +x post_install.py # patchShebangs requires executable file
+
patchShebangs post_install.py
+
'';
+
+
postFixup = ''
+
# Patched meson does not add internal libraries to rpath
+
for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do
+
patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f"
+
done
+
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Epiphany;
+3 -3
pkgs/desktops/gnome-3/core/epiphany/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "epiphany-3.24.3";
+
name = "epiphany-3.26.3";
src = fetchurl {
-
url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz;
-
sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154";
+
url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.3.tar.xz;
+
sha256 = "cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5";
};
}
+3 -3
pkgs/desktops/gnome-3/core/evince/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "evince-3.24.1";
+
name = "evince-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz;
-
sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37";
+
url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz;
+
sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8";
};
}
+8 -7
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
···
{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf
, intltool, libsoup, libxml2, libsecret, icu, sqlite
-
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,
-
vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:
+
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true
+
, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+
nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ];
buildInputs = with gnome3;
-
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
-
(stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper
-
icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk
-
libaccounts-glib ]
-
++ stdenv.lib.optional valaSupport vala_0_32;
+
[ glib libsoup libxml2 gtk gnome_online_accounts
+
(stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata
+
icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk
+
libaccounts-glib json_glib ]
+
++ stdenv.lib.optional valaSupport vala;
propagatedBuildInputs = [ libsecret nss nspr libical db ];
+3 -3
pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "evolution-data-server-3.24.5";
+
name = "evolution-data-server-3.26.2.1";
src = fetchurl {
-
url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz;
-
sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1";
+
url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.2.1.tar.xz;
+
sha256 = "09fb1c4ce20c62309e8ea2d80649f590492e88c1deb89118e715e155296baefd";
};
}
+2 -2
pkgs/desktops/gnome-3/core/folks/default.nix
···
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-
, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
+
, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
, telepathy_glib, evolution_data_server, libsecret, db }:
# TODO: enable more folks backends
···
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
# dbus_daemon needed for tests
buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-
vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ];
+
vala libsecret libxml2 libsoup nspr nss intltool db ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-fatal-warnings";
+3 -4
pkgs/desktops/gnome-3/core/gcr/default.nix
···
{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-
, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }:
+
, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
outputs = [ "out" "dev" ];
-
nativeBuildInputs = [ pkgconfig ];
+
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection libxslt makeWrapper vala ];
buildInputs = let
gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
in [
-
intltool gpg gobjectIntrospection libxslt
-
libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32
+
gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk
];
propagatedBuildInputs = [ glib gtk p11_kit ];
+14 -5
pkgs/desktops/gnome-3/core/gdm/default.nix
···
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth
-
, librsvg }:
+
, librsvg, coreutils }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
'';
+
postPatch = ''
+
substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth"
+
substituteInPlace data/gdm.service.in --replace "/bin/kill" "${coreutils}/bin/kill"
+
'';
+
configureFlags = [ "--sysconfdir=/etc"
"--localstatedir=/var"
"--with-plymouth=yes"
"--with-initial-vt=7"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
buildInputs = [ glib itstool libxml2 intltool
-
accountsservice gnome3.dconf systemd
+
nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];
+
buildInputs = [ glib accountsservice systemd
gobjectIntrospection libX11 gtk
-
libcanberra_gtk3 pam libtool plymouth librsvg ];
+
libcanberra_gtk3 pam plymouth librsvg ];
enableParallelBuilding = true;
···
./gdm-x-session_extra_args.patch
./gdm-session-worker_xserver-path.patch
];
+
+
postInstall = ''
+
# Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary”
+
rm $out/share/gdm/greeter/autostart/orca-autostart.desktop
+
'';
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
-19
pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
···
-
diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c
-
index d835b34..86f0d47 100644
-
--- a/daemon/gdm-x-session.c.orig
-
+++ b/daemon/gdm-x-session.c
-
@@ -240,7 +240,13 @@ spawn_x_server (State *state,
-
-
display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
-
-
- g_ptr_array_add (arguments, X_SERVER);
-
+ if (g_getenv ("GDM_X_SERVER") != NULL) {
-
+ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER"));
-
+ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER"));
-
+ } else {
-
+ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER);
-
+ g_ptr_array_add (arguments, X_SERVER);
-
+ }
-
-
if (vt_string != NULL) {
-
g_ptr_array_add (arguments, vt_string);
+3 -3
pkgs/desktops/gnome-3/core/gdm/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gdm-3.24.2";
+
name = "gdm-3.26.2.1";
src = fetchurl {
-
url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz;
-
sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8";
+
url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz;
+
sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
};
}
+2 -7
pkgs/desktops/gnome-3/core/gjs/default.nix
···
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-
, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
+
, spidermonkey_52, pango, readline, glib, libxml2, dbus }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
-
propagatedBuildInputs = [ spidermonkey_38 ];
-
-
# GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
-
preConfigure = ''
-
sed -i s/mozjs-38/js/ configure
-
'';
+
propagatedBuildInputs = [ spidermonkey_52 ];
postInstall = ''
sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
+3 -3
pkgs/desktops/gnome-3/core/gjs/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gjs-1.48.6";
+
name = "gjs-1.50.2";
src = fetchurl {
-
url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
-
sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
+
url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz;
+
sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-backgrounds-3.24.0";
+
name = "gnome-backgrounds-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz;
-
sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca";
+
url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz;
+
sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f";
};
}
+8 -9
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
···
-
{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib
-
, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }:
+
{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
+
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
-
makeWrapper gnome3.gsettings_desktop_schemas itstool
-
libnotify libcanberra_gtk3 ];
+
nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ];
+
buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3
+
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ];
-
preFixup = ''
-
wrapProgram "$out/bin/bluetooth-sendto" \
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
postPatch = ''
+
chmod +x meson_post_install.py # patchShebangs requires executable file
+
patchShebangs meson_post_install.py
'';
meta = with stdenv.lib; {
+3 -3
pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-bluetooth-3.20.1";
+
name = "gnome-bluetooth-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz;
-
sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a";
+
url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz;
+
sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-calculator-3.24.0";
+
name = "gnome-calculator-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz;
-
sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10";
+
url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz;
+
sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7";
};
}
+4 -7
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
···
, libchamplain, clutter_gtk, geocode_glib
, bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-
, libsoup, vala_0_32, dbus_glib, automake, autoconf }:
+
, libsoup, vala, dbus_glib, automake, autoconf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
touch src/*.vala
'';
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool evolution_data_server
-
gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
+
nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ];
+
buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify
folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-
gdk_pixbuf gnome3.defaultIconTheme librsvg
-
libchamplain clutter_gtk geocode_glib
-
vala_0_32 automake autoconf db ];
+
gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ];
preFixup = ''
gappsWrapperArgs+=(
+3 -3
pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-contacts-3.22.1";
+
name = "gnome-contacts-3.26";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz;
-
sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b";
+
url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz;
+
sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-control-center/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-control-center-3.24.3";
+
name = "gnome-control-center-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz;
-
sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2";
+
url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz;
+
sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5";
};
}
+2 -2
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
···
{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-
, gobjectIntrospection }:
+
, libseccomp, gobjectIntrospection }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
buildInputs = [ python libxml2Python libxslt which libX11
xkeyboard_config isocodes itstool wayland
gtk3 glib intltool gnome_doc_utils libxkbfile
-
gobjectIntrospection ];
+
libseccomp gobjectIntrospection ];
propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
+3 -3
pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-desktop-3.24.2";
+
name = "gnome-desktop-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz;
-
sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e";
+
url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz;
+
sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a";
};
}
+8 -15
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
···
-
{ stdenv, intltool, fetchurl
-
, pkgconfig, gtk3, glib
-
, bash, makeWrapper, itstool, libxml2
-
, gnome3, librsvg, gdk_pixbuf, file }:
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt
+
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
+
, gnome3, gtk, glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+
propagatedBuildInputs = [ gnome3.defaultIconTheme ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool libxml2 file
-
gnome3.gsettings_desktop_schemas makeWrapper ];
+
nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
+
desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];
+
buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ];
-
preFixup = ''
-
wrapProgram "$out/bin/gnome-dictionary" \
-
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
'';
+
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Dictionary;
+3 -3
pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-dictionary-3.24.0";
+
name = "gnome-dictionary-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz;
-
sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2";
+
url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz;
+
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
};
}
+14 -15
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
···
-
{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-
, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
-
, itstool, gnome3, gdk_pixbuf, libxml2, python
-
, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
+
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
+
, meson, ninja, gtk, glib, wrapGAppsHook, libnotify
+
, itstool, gnome3, gdk_pixbuf, libxml2
+
, libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
doCheck = true;
+
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl
+
wrapGAppsHook libxml2 ];
+
buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3
+
gdk_pixbuf udisks2 gnome3.defaultIconTheme
+
gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ];
-
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ bash gtk3 glib intltool itstool
-
libxslt libtool libsecret libpwquality cracklib
-
libnotify libdvdread libcanberra_gtk3 docbook_xsl
-
gdk_pixbuf gnome3.defaultIconTheme
-
udisks2 gnome3.gnome_settings_daemon
-
gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
+
postPatch = ''
+
chmod +x meson_post_install.py # patchShebangs requires executable file
+
patchShebangs meson_post_install.py
+
'';
meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
+3 -3
pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-disk-utility-3.24.1";
+
name = "gnome-disk-utility-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
-
sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
+
url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz;
+
sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2";
};
}
+8 -16
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
···
-
{ stdenv, intltool, fetchurl
-
, pkgconfig, gtk3, glib
-
, bash, wrapGAppsHook, itstool
-
, gnome3, librsvg, gdk_pixbuf }:
+
{ stdenv, meson, ninja, gettext, fetchurl
+
, pkgconfig, gtk3, glib, libxml2
+
, wrapGAppsHook, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
checkPhase = "meson test";
-
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop
-
gdk_pixbuf gnome3.defaultIconTheme librsvg
-
gnome3.gsettings_desktop_schemas wrapGAppsHook ];
+
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
+
buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ];
-
preFixup = ''
-
gappsWrapperArgs+=(
-
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
-
)
-
'';
+
# Do not run meson-postinstall.sh
+
preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
meta = with stdenv.lib; {
description = "Program that can preview fonts and create thumbnails for fonts";
+3 -3
pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-font-viewer-3.24.0";
+
name = "gnome-font-viewer-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz;
-
sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76";
+
url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz;
+
sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-keyring-3.20.0";
+
name = "gnome-keyring-3.20.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz;
-
sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99";
+
url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz;
+
sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-online-accounts-3.24.2";
+
name = "gnome-online-accounts-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz;
-
sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba";
+
url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.1.tar.xz;
+
sha256 = "603c110405cb89a01497a69967f10e3f3f36add3dc175b062ec4c5ed4485621b";
};
}
+3 -10
pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
···
{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-
, libsoup, json_glib, gmp, openssl, dleyna-server, makeWrapper }:
+
, libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig ];
+
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-
gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
+
gnome3.gnome_online_accounts gnome3.libmediaart
gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest
dleyna-server ];
enableParallelBuilding = true;
-
-
preFixup = ''
-
for f in $out/libexec/*; do
-
wrapProgram "$f" \
-
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}"
-
done
-
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+3 -3
pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-online-miners-3.24.0";
+
name = "gnome-online-miners-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz;
-
sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab";
+
url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz;
+
sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e";
};
}
+16 -12
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
···
-
{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-
, bash, gtk3, glib, wrapGAppsHook
-
, itstool, gnome3, librsvg, gdk_pixbuf }:
+
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3
+
, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib
+
, gnome3, librsvg, gdk_pixbuf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
checkPhase = "meson test";
+
+
+
postPatch = ''
+
chmod +x build-aux/postinstall.py # patchShebangs requires executable file
+
patchShebangs build-aux/postinstall.py
+
'';
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3
-
gnome3.gsettings_desktop_schemas wrapGAppsHook ];
+
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ];
+
buildInputs = [ bash gtk3 glib libcanberra_gtk3
+
gnome3.gsettings_desktop_schemas ];
-
preFixup = ''
-
gappsWrapperArgs+=(
-
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"
-
)
-
'';
+
patches = [
+
./prevent-cache-updates.patch
+
];
meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;
+21
pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch
···
+
--- a/build-aux/postinstall.py
+
+++ b/build-aux/postinstall.py
+
@@ -8,18 +8,6 @@
+
+
# Packaging tools define DESTDIR and this isn't needed for them
+
if 'DESTDIR' not in os.environ:
+
- print('Updating icon cache...')
+
- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
+
- if not os.path.exists(icon_cache_dir):
+
- os.makedirs(icon_cache_dir)
+
- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
+
-
+
- print('Updating desktop database...')
+
- desktop_database_dir = os.path.join(datadir, 'applications')
+
- if not os.path.exists(desktop_database_dir):
+
- os.makedirs(desktop_database_dir)
+
- subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
+
-
+
print('Compiling GSettings schemas...')
+
schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas')
+
if not os.path.exists(schemas_dir):
+3 -3
pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-screenshot-3.22.0";
+
name = "gnome-screenshot-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz;
-
sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230";
+
url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz;
+
sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-session/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-session-3.24.1";
+
name = "gnome-session-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz;
-
sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee";
+
url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz;
+
sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-settings-daemon-3.24.3";
+
name = "gnome-settings-daemon-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz;
-
sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593";
+
url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz;
+
sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-shell-extensions-3.24.3";
+
name = "gnome-shell-extensions-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz;
-
sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79";
+
url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz;
+
sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6";
};
}
+35 -29
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
···
-
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
+
{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
-
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-
, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2
-
, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
+
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales
+
, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
+
, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
+
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
+
, gst_all_1 }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
···
inherit (import ./src.nix fetchurl) name src;
# Needed to find /etc/NetworkManager/VPN
-
configureFlags = [ "--sysconfdir=/etc" ];
+
mesonFlags = [ "--sysconfdir=/etc" ];
+
+
LANG = "en_US.UTF-8";
+
nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
buildInputs = with gnome3;
[ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-
libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf
+
libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf
(librsvg.override { enableIntrospection = true; })
-
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
+
clutter networkmanager libstartup_notification telepathy_glib
libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
-
libical libtool nss gtk gstreamer makeWrapper gdm
+
libical nss gtk gstreamer gdm
libcanberra_gtk3 gnome_control_center geoclue2
defaultIconTheme sqlite gnome3.gnome-bluetooth
libgweather # not declared at build time, but typelib is needed at runtime
gnome3.gnome-clocks # schemas needed
at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
+
gst_all_1.gst-plugins-good # recording
gobjectIntrospection (stdenv.lib.getLib dconf) ];
+
propagatedUserEnvPkgs = [
+
# Needed to support on-screen keyboard used with touch screen devices
+
# see https://github.com/NixOS/nixpkgs/issues/25968
+
gnome3.caribou
+
];
-
installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
+
patches = [
+
(fetchpatch {
+
name = "0001-build-Add-missing-dependency-to-run-js-test.patch";
+
url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016;
+
sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm";
+
})
+
./fix-paths.patch
+
];
-
preBuild = ''
+
postPatch = ''
patchShebangs src/data-to-c.pl
-
substituteInPlace data/Makefile --replace " install-keysDATA" ""
substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
+
substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip"
'';
-
-
preFixup = with gnome3; ''
-
wrapProgram "$out/bin/gnome-shell" \
-
--prefix PATH : "${unzip}/bin" \
-
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
-
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
-
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-
-
wrapProgram "$out/bin/gnome-shell-extension-prefs" \
-
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
-
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
postInstall = ''
+
glib-compile-schemas $out/share/glib-2.0/schemas
+
'';
-
echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
+
postFixup = ''
+
# Patched meson does not add internal libraries to rpath
+
patchelf --set-rpath "$out/lib/gnome-shell:$(patchelf --print-rpath $out/bin/.gnome-shell-wrapped)" $out/bin/.gnome-shell-wrapped
'';
enableParallelBuilding = true;
+18
pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
···
+
diff --git a/meson.build b/meson.build
+
index 4c1f5c63b..a9edb8795 100644
+
--- a/meson.build
+
+++ b/meson.build
+
@@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services')
+
+
plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir)
+
+
-keybindings_dep = dependency('gnome-keybindings', required: false)
+
-if keybindings_dep.found()
+
- keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
+
-else
+
- keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
+
-endif
+
+keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
+
+
atk_bridge_dep = dependency('atk-bridge-2.0')
+
canberra_dep = dependency('libcanberra')
+3 -3
pkgs/desktops/gnome-3/core/gnome-shell/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-shell-3.24.3";
+
name = "gnome-shell-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz;
-
sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8";
+
url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz;
+
sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c";
};
}
+23 -7
pkgs/desktops/gnome-3/core/gnome-software/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
-
, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
-
, json_glib, libsecret, valgrind-light }:
+
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
+
, glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt
+
, json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
-
buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
+
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42
+
valgrind-light docbook_xsl gtk_doc desktop_file_utils ];
+
buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-
gtkspell3 json_glib libsecret
-
polkit attr acl libyaml valgrind-light ];
+
gtkspell3 json_glib libsecret ostree
+
polkit attr acl libyaml ];
propagatedBuildInputs = [ isocodes ];
+
+
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+
postPatch = ''
+
patchShebangs meson_post_install.sh
+
'';
+
+
mesonFlags = [
+
"-Denable-flatpak=false"
+
"-Denable-rpm=false"
+
"-Denable-fwupd=false"
+
"-Denable-oauth=false"
+
"-Denable-ubuntu-reviews=false"
+
"-Denable-gudev=false"
+
];
postInstall = ''
mkdir -p $out/share/xml/
+3 -3
pkgs/desktops/gnome-3/core/gnome-software/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-software-3.24.3";
+
name = "gnome-software-3.26.3";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz;
-
sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3";
+
url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz;
+
sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-system-monitor-3.24.0";
+
name = "gnome-system-monitor-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz;
-
sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4";
+
url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz;
+
sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3";
};
}
+4 -4
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-
, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32
+
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3
+
, gnome_doc_utils, intltool, which, libuuid, vala
, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-
gnome3.dconf itstool gnome3.nautilus vala_0_32 ];
+
gnome3.dconf itstool gnome3.nautilus ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
-
desktop_file_utils wrapGAppsHook ];
+
vala desktop_file_utils wrapGAppsHook ];
# Silly ./configure, it looks for dbus file from gnome-shell in the
# installation tree of the package it is configuring.
+3 -3
pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-terminal-3.24.2";
+
name = "gnome-terminal-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz;
-
sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f";
+
url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz;
+
sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0";
};
}
+3 -3
pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-user-docs-3.24.2";
+
name = "gnome-user-docs-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz;
-
sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f";
+
url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.tar.xz;
+
sha256 = "e7d7f0434624ef6f21803c798d8672331f065485bdf59d44ac5b6b5f14fa1b78";
};
}
+9 -5
pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
postPatch = ''
-
for file in "background" "screensaver"; do
-
substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
-
--replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
-
done
+
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
+
[org.gnome.desktop.background]
+
picture-uri='''
+
+
[org.gnome.desktop.screensaver]
+
picture-uri='''
+
EOF
'';
buildInputs = [ glib gobjectIntrospection ];
+4 -4
pkgs/desktops/gnome-3/core/gsound/default.nix
···
let
majVer = "1.0";
in stdenv.mkDerivation rec {
-
name = "gsound-${majVer}.1";
+
name = "gsound-${majVer}.2";
src = fetchurl {
url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
-
sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
+
sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
};
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ];
+
nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ];
+
buildInputs = [ glib libcanberra_gtk2 ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GSound;
+1 -1
pkgs/desktops/gnome-3/core/libgee/default.nix
···
patches = [ ./fix_introspection_paths.patch ];
-
nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ];
+
nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
buildInputs = [ glib ];
meta = with stdenv.lib; {
+8 -7
pkgs/desktops/gnome-3/core/libgepub/default.nix
···
-
{ stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3
, webkitgtk, libsoup, libxml2, libarchive }:
stdenv.mkDerivation rec {
-
name = "libgepub-${version}";
-
version = "0.4";
+
name = "libgepub-${version}.2";
+
version = "0.5";
src = fetchurl {
url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz";
-
sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4";
+
sha256 = "0f1bczy3b00kj7mhm80xgpcgibh8h0pgcr46l4wifi45jacji0w4";
};
doCheck = true;
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup
-
libxml2 libarchive ];
+
checkPhase = "meson test";
+
+
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+
buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];
meta = with stdenv.lib; {
description = "GObject based library for handling and rendering epub documents";
+3 -3
pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "libgnomekbd-3.22.0.1";
+
name = "libgnomekbd-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz;
-
sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de";
+
url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz;
+
sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
};
}
+7 -2
pkgs/desktops/gnome-3/core/libgweather/default.nix
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
+
configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ];
propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
-
nativeBuildInputs = [ pkgconfig intltool ];
+
nativeBuildInputs = [ pkgconfig intltool gnome3.vala ];
+
+
# Prevent building vapi into ${vala} derivation directory
+
prePatch = ''
+
substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
+
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
+3 -3
pkgs/desktops/gnome-3/core/libgweather/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "libgweather-3.24.1";
+
name = "libgweather-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz;
-
sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c";
+
url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz;
+
sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e";
};
}
+1 -10
pkgs/desktops/gnome-3/core/mutter/default.nix
···
-
{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
, libgudev, libwacom, xwayland, autoreconfHook }:
···
gnome3.geocode_glib libudev libinput libgudev libwacom
libcanberra_gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon ];
-
-
patches = [
-
# https://bugzilla.gnome.org/show_bug.cgi?id=760670
-
(fetchpatch {
-
name = "libgudev-232.patch";
-
url = https://bugzilla.gnome.org/attachment.cgi?id=358904;
-
sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix";
-
})
-
];
preFixup = ''
wrapProgram "$out/bin/mutter" \
+3 -3
pkgs/desktops/gnome-3/core/mutter/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "mutter-3.24.4";
+
name = "mutter-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz;
-
sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea";
+
url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz;
+
sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab";
};
}
+11 -7
pkgs/desktops/gnome-3/core/nautilus/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-
, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib
-
, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }:
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook
+
, gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif
+
, exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ];
-
buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-
gnome3.gnome_desktop gnome3.adwaita-icon-theme
-
gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ];
+
buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux
+
tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme
+
gnome3.gsettings_desktop_schemas ];
propagatedBuildInputs = [ gnome-autoar ];
···
# hardeningDisable = [ "format" ];
enableParallelBuilding = true;
+
+
postPatch = ''
+
patchShebangs build-aux/meson/postinstall.py
+
'';
patches = [ ./extension_dir.patch ];
+3 -3
pkgs/desktops/gnome-3/core/nautilus/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "nautilus-3.24.2.1";
+
name = "nautilus-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz;
-
sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3";
+
url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz;
+
sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4";
};
}
+10 -12
pkgs/desktops/gnome-3/core/simple-scan/default.nix
···
-
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
-
, libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook
-
, gnome3 }:
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook
+
, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
+
, libxml2, sane-backends, vala, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ];
-
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
+
buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
+
gtk libwebp packagekit sane-backends vala ];
+
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ];
-
configureFlags = [ "--disable-packagekit" ];
+
postPatch = ''
+
patchShebangs data/meson_compile_gschema.py
-
patchPhase = ''
sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in
-
'';
-
-
preBuild = ''
-
# Clean up stale .c files referencing packagekit headers as of 3.20.0:
-
make clean
'';
postInstall = ''
···
enableParallelBuilding = true;
doCheck = true;
+
+
checkPhase = "meson test";
meta = with stdenv.lib; {
description = "Simple scanning utility";
+3 -3
pkgs/desktops/gnome-3/core/simple-scan/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "simple-scan-3.22.0.1";
+
name = "simple-scan-3.26.2";
src = fetchurl {
-
url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz;
-
sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50";
+
url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz;
+
sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212";
};
}
+2 -2
pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
+
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig file intltool ];
+
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
buildInputs = [ gmime libxml2 libsoup ];
meta = with stdenv.lib; {
+3 -3
pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "totem-pl-parser-3.10.2";
+
name = "totem-pl-parser-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz;
-
sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+
url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz;
+
sha256 = "1jzvq7s6qdsdpbc58jpcwvyj7qsq58r65kmnbknjzd79j4rsalzi";
};
}
+25 -12
pkgs/desktops/gnome-3/core/totem/default.nix
···
-
{ stdenv, intltool, fetchurl, gst_all_1
+
{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter
, clutter_gtk, clutter-gst, python3Packages, shared_mime_info
, pkgconfig, gtk3, glib, gobjectIntrospection
-
, bash, wrapGAppsHook, itstool, libxml2, dbus_glib
-
, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }:
+
, bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg
+
, gdk_pixbuf, file, tracker, nautilus }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo
-
clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-
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 gst_all_1.gst-libav
-
gnome3.libpeas shared_mime_info dbus_glib
-
gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
-
gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ];
+
nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ];
+
buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
+
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 gst_all_1.gst-libav gnome3.libpeas shared_mime_info dbus_glib
+
gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome_desktop
+
gnome3.gsettings_desktop_schemas tracker nautilus ];
propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
-
configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
checkPhase = "meson test";
+
+
patches = [
+
(fetchurl {
+
name = "remove-pycompile.patch";
+
url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204";
+
sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi";
+
})
+
];
+
+
postPatch = ''
+
chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file
+
patchShebangs .
+
'';
+
+
mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
wrapPrefixVariables = [ "PYTHONPATH" ];
+3 -3
pkgs/desktops/gnome-3/core/totem/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "totem-3.24.0";
+
name = "totem-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz;
-
sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01";
+
url = mirror://gnome/sources/totem/3.26/totem-3.26.0.tar.xz;
+
sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13";
};
}
+45
pkgs/desktops/gnome-3/core/tracker-miners/default.nix
···
+
{ stdenv, intltool, fetchurl, libxml2, upower
+
, pkgconfig, gtk3, glib
+
, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt
+
, gnome3, librsvg, gdk_pixbuf, libnotify
+
, evolution_data_server, gst_all_1, poppler
+
, icu, taglib, libjpeg, libtiff, giflib, libcue
+
, libvorbis, flac, exempi, networkmanager
+
, libpng, libexif, libgsf, libuuid, bzip2
+
, libsoup, json_glib, libseccomp
+
, libiptcdata }:
+
+
stdenv.mkDerivation rec {
+
inherit (import ./src.nix fetchurl) name src;
+
+
NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+
+
enableParallelBuilding = true;
+
+
nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];
+
# TODO: add libgrss, libenca
+
buildInputs = [
+
bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser
+
gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu
+
json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup
+
libtiff libuuid libvorbis libxml2 poppler taglib upower
+
];
+
+
LANG = "en_US.UTF-8"; # for running tests
+
+
doCheck = true;
+
+
postPatch = ''
+
substituteInPlace src/libtracker-common/tracker-domain-ontology.c --replace \
+
'SHAREDIR, "tracker", "domain-ontologies"' \
+
'"${gnome3.tracker}/share", "tracker", "domain-ontologies"'
+
'';
+
+
meta = with stdenv.lib; {
+
homepage = https://wiki.gnome.org/Projects/Tracker;
+
description = "Desktop-neutral user information store, search tool and indexer";
+
maintainers = gnome3.maintainers;
+
license = licenses.gpl2;
+
platforms = platforms.linux;
+
};
+
}
+10
pkgs/desktops/gnome-3/core/tracker-miners/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "tracker-miners-2.0.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.2.tar.xz;
+
sha256 = "cf417ece944c997f630dda41a7f5c449d609fa53dbb34fae7caa4c7af1e0e8ef";
+
};
+
}
+12 -32
pkgs/desktops/gnome-3/core/tracker/default.nix
···
-
{ stdenv, intltool, fetchurl, libxml2, upower
-
, pkgconfig, gtk3, glib
-
, bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt
-
, gnome3, librsvg, gdk_pixbuf, file, libnotify
-
, evolution_data_server, gst_all_1, poppler
-
, icu, taglib, libjpeg, libtiff, giflib, libcue
-
, libvorbis, flac, exempi, networkmanager
-
, libpng, libexif, libgsf, libuuid, bzip2
-
, libsoup, json_glib, libseccomp }:
+
{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig
+
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt
+
, gnome3, icu, libuuid, networkmanager, libsoup, json_glib }:
stdenv.mkDerivation rec {
-
inherit (import ./src.nix fetchurl) name src;
-
-
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler";
enableParallelBuilding = true;
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2
-
bzip2 gnome3.totem-pl-parser libxslt
-
gnome3.gsettings_desktop_schemas wrapGAppsHook
-
file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
-
upower libnotify evolution_data_server gnome3.libgee
-
gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
-
poppler icu taglib libjpeg libtiff giflib libvorbis
-
exempi networkmanager libpng libexif libgsf libuuid
-
libsoup json_glib libseccomp
-
];
+
nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ];
+
# TODO: add libstemmer
+
buildInputs = [
+
glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib
+
];
-
preConfigure = ''
-
substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
-
'';
+
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas
+
configureFlags = [ "--disable-unit-tests" ];
-
preFixup = ''
-
gappsWrapperArgs+=(
-
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
-
)
+
postPatch = ''
+
patchShebangs utils/g-ir-merge/g-ir-merge
'';
meta = with stdenv.lib; {
+3 -3
pkgs/desktops/gnome-3/core/tracker/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "tracker-1.12.3";
+
name = "tracker-2.0.1";
src = fetchurl {
-
url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz;
-
sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3";
+
url = mirror://gnome/sources/tracker/2.0/tracker-2.0.1.tar.xz;
+
sha256 = "ac5c9f4dbb0741af5877ae2818d8c053aa9a431477a924a17976bb7e44411e47";
};
}
+3 -4
pkgs/desktops/gnome-3/core/vte/default.nix
···
{ stdenv, fetchurl, intltool, pkgconfig
-
, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls
+
, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2
}:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gobjectIntrospection intltool gnome3.glib
-
gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
+
nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ];
+
buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ];
propagatedBuildInputs = [ gnutls pcre2 ];
+3 -3
pkgs/desktops/gnome-3/core/vte/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "vte-0.50.1";
+
name = "vte-0.50.2";
src = fetchurl {
-
url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz;
-
sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2";
+
url = mirror://gnome/sources/vte/0.50/vte-0.50.2.tar.xz;
+
sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf";
};
}
+3 -3
pkgs/desktops/gnome-3/core/yelp/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "yelp-3.22.0";
+
name = "yelp-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz;
-
sha256 = "8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e";
+
url = mirror://gnome/sources/yelp/3.26/yelp-3.26.0.tar.xz;
+
sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b";
};
}
+3 -3
pkgs/desktops/gnome-3/core/zenity/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "zenity-3.24.0";
+
name = "zenity-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz;
-
sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7";
+
url = mirror://gnome/sources/zenity/3.26/zenity-3.26.0.tar.xz;
+
sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830";
};
}
+5 -3
pkgs/desktops/gnome-3/default.nix
···
callPackage = pkgs.newScope self;
-
version = "3.24";
+
version = "3.26";
maintainers = with pkgs.lib.maintainers; [ lethalman ];
corePackages = with gnome3; [
···
gnome3 = self // { recurseForDerivations = false; };
gtk = gtk3;
gtkmm = gtkmm3;
-
vala = pkgs.vala_0_32;
+
vala = pkgs.vala_0_38;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
# Simplify the nixos module and gnome packages
···
totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
+
tracker = callPackage ./core/tracker { };
+
+
tracker-miners = callPackage ./core/tracker-miners { };
vte = callPackage ./core/vte { };
+3 -3
pkgs/desktops/gnome-3/devtools/anjuta/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "anjuta-3.22.0";
+
name = "anjuta-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz;
-
sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03";
+
url = mirror://gnome/sources/anjuta/3.26/anjuta-3.26.0.tar.xz;
+
sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70";
};
}
+3 -3
pkgs/desktops/gnome-3/devtools/devhelp/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "devhelp-3.24.0";
+
name = "devhelp-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz;
-
sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430";
+
url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.0.tar.xz;
+
sha256 = "6bf2714f7f953b5858c643585383c4e4c8e9c65055527505abbf24fbf1ac8e38";
};
}
+3 -3
pkgs/desktops/gnome-3/devtools/gdl/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gdl-3.22.0";
+
name = "gdl-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz;
-
sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c";
+
url = mirror://gnome/sources/gdl/3.26/gdl-3.26.0.tar.xz;
+
sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079";
};
}
+3 -3
pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-devel-docs-3.22.0";
+
name = "gnome-devel-docs-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz;
-
sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85";
+
url = mirror://gnome/sources/gnome-devel-docs/3.26/gnome-devel-docs-3.26.0.tar.xz;
+
sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3";
};
}
+2 -2
pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
···
stdenv.mkDerivation rec {
name = "gnome-shell-dash-to-dock-${version}";
-
version = "v60";
+
version = "v61";
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
rev = "extensions.gnome.org-" + version;
-
sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3";
+
sha256 = "152xzhal3wr40j0pv03v0gg20054n5hqqy3s10bkj2a0x830pgjk";
};
nativeBuildInputs = [
+3 -3
pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
···
stdenv.mkDerivation rec {
name = "gnome-shell-extension-topicons-plus-${version}";
-
version = "20";
+
version = "21";
src = fetchFromGitHub {
owner = "phocean";
repo = "TopIcons-plus";
-
rev = "01535328bd43ecb3f2c71376de6fc8d1d8a88577";
-
sha256 = "0pwpg72ihgj2jl9pg63y0hibdsl27srr3mab881w0gh17vwyixzi";
+
rev = "v${version}";
+
sha256 = "15p61krd7lcmgr1d4s2ydfjy3pyq79pq5100xzy6dln1538901m3";
};
buildInputs = [ glib ];
+3 -3
pkgs/desktops/gnome-3/games/five-or-more/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "five-or-more-3.22.0";
+
name = "five-or-more-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.0.tar.xz;
-
sha256 = "33c0ba7723144aea496112fa85a1d7e5a2a8ecaa32f4373471470d7c3078da94";
+
url = mirror://gnome/sources/five-or-more/3.26/five-or-more-3.26.0.tar.xz;
+
sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772";
};
}
+3 -3
pkgs/desktops/gnome-3/games/gnome-chess/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-chess-3.24.1";
+
name = "gnome-chess-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz;
-
sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3";
+
url = mirror://gnome/sources/gnome-chess/3.26/gnome-chess-3.26.0.tar.xz;
+
sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12";
};
}
+3 -3
pkgs/desktops/gnome-3/games/gnome-klotski/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-klotski-3.22.0";
+
name = "gnome-klotski-3.22.2";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.0.tar.xz;
-
sha256 = "25e35369d1b5d2f9e6b92d44568d21df631b5b23dd7b12ca226a04f58cb54700";
+
url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.2.tar.xz;
+
sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h";
};
}
+3 -3
pkgs/desktops/gnome-3/games/gnome-mines/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-mines-3.24.0";
+
name = "gnome-mines-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz;
-
sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6";
+
url = mirror://gnome/sources/gnome-mines/3.26/gnome-mines-3.26.0.tar.xz;
+
sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9";
};
}
+3 -3
pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-sudoku-3.24.0";
+
name = "gnome-sudoku-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz;
-
sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7";
+
url = mirror://gnome/sources/gnome-sudoku/3.26/gnome-sudoku-3.26.0.tar.xz;
+
sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0";
};
}
+3 -3
pkgs/desktops/gnome-3/games/gnome-taquin/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-taquin-3.22.0";
+
name = "gnome-taquin-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz;
-
sha256 = "780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982";
+
url = mirror://gnome/sources/gnome-taquin/3.26/gnome-taquin-3.26.1.tar.xz;
+
sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd";
};
}
+1 -6
pkgs/desktops/gnome-3/games/hitori/default.nix
···
, libxml2, intltool, itstool }:
stdenv.mkDerivation rec {
-
name = "hitori-${gnome3.version}.1";
-
-
src = fetchurl {
-
url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
-
sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
-
};
+
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
+3 -3
pkgs/desktops/gnome-3/games/iagno/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "iagno-3.22.0";
+
name = "iagno-3.26.1";
src = fetchurl {
-
url = mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz;
-
sha256 = "e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13";
+
url = mirror://gnome/sources/iagno/3.26/iagno-3.26.1.tar.xz;
+
sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121";
};
}
+3 -3
pkgs/desktops/gnome-3/games/lightsoff/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "lightsoff-3.24.0";
+
name = "lightsoff-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz;
-
sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce";
+
url = mirror://gnome/sources/lightsoff/3.26/lightsoff-3.26.0.tar.xz;
+
sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976";
};
}
+3 -3
pkgs/desktops/gnome-3/games/swell-foop/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "swell-foop-3.24.0";
+
name = "swell-foop-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz;
-
sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11";
+
url = mirror://gnome/sources/swell-foop/3.26/swell-foop-3.26.0.tar.xz;
+
sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22";
};
}
+5 -12
pkgs/desktops/gnome-3/misc/gitg/default.nix
···
-
{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib
-
, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection
+
{ stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib
+
, json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection
, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret
-
, dconf}:
-
-
-
# TODO: icons and theme still does not work
-
# use packaged gnome3.adwaita-icon-theme
+
, libsoup }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
propagatedUserEnvPkgs = [ shared_mime_info
gnome3.gnome_themes_standard ];
-
buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas
+
buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup
libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas
librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ];
-
nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ];
-
-
# https://bugzilla.gnome.org/show_bug.cgi?id=758240
-
preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir'';
+
nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+6 -4
pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit
-
, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }:
+
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit
+
, fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
-
buildInputs = [ libxslt gnome3.gtk packagekit fontconfig
+
nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ];
+
buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit
libcanberra_gtk3 libnotify dbus_glib dbus_libs ];
+
+
prePatch = "patchShebangs meson_post_install.sh";
meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/software/PackageKit/;
+3 -3
pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-packagekit-3.24.0";
+
name = "gnome-packagekit-3.26.0";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz;
-
sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f";
+
url = mirror://gnome/sources/gnome-packagekit/3.26/gnome-packagekit-3.26.0.tar.xz;
+
sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417";
};
}
+13 -39
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
···
-
From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001
+
From f7f7fe6bf36ca08c66192077bf964036eb02ffb5 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
-
Date: Sun, 25 Jun 2017 11:32:30 +0100
+
Date: Tue, 19 Sep 2017 03:08:07 +0200
Subject: [PATCH 1/3] Search for themes and icons in system data dirs
---
-
gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
-
gtweak/tweaks/tweak_group_keymouse.py | 7 ++-----
-
gtweak/utils.py | 17 +++++++++++++++++
-
3 files changed, 23 insertions(+), 18 deletions(-)
+
gtweak/tweaks/tweak_group_appearance.py | 17 ++++-------------
+
gtweak/utils.py | 17 +++++++++++++++++
+
2 files changed, 21 insertions(+), 13 deletions(-)
-
diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-
index 97751ed..db89b85 100644
-
--- a/gtweak/tweaks/tweak_group_interface.py
-
+++ b/gtweak/tweaks/tweak_group_interface.py
+
diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+
index ccadefc..0d12194 100644
+
--- a/gtweak/tweaks/tweak_group_appearance.py
+
+++ b/gtweak/tweaks/tweak_group_appearance.py
@@ -26,7 +26,7 @@ from gi.repository import Gtk
from gi.repository import GLib
import gtweak
-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
-
from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+
from gtweak.tweakmodel import Tweak
from gtweak.gshellwrapper import GnomeShellFactory
from gtweak.gsettings import GSettingsSetting
@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
···
os.path.isdir(d) and \
os.path.exists(os.path.join(d, "cursors")))
return valid
-
diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-
index 69c4b7e..b06900c 100644
-
--- a/gtweak/tweaks/tweak_group_keymouse.py
-
+++ b/gtweak/tweaks/tweak_group_keymouse.py
-
@@ -21,7 +21,7 @@ from gi.repository import GLib
-
-
import gtweak
-
from gtweak.gshellwrapper import GnomeShellFactory
-
-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
-
+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
-
from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
-
-
_shell = GnomeShellFactory().get_shell()
-
@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-
**options)
-
-
def _get_valid_key_themes(self):
-
- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
-
- os.path.join(GLib.get_user_data_dir(), "themes"),
-
- os.path.join(os.path.expanduser("~"), ".themes"))
-
- valid = walk_directories(dirs, lambda d:
-
+ valid = walk_directories(get_resource_dirs("themes"), lambda d:
-
os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-
os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
-
return valid
diff --git a/gtweak/utils.py b/gtweak/utils.py
-
index 39f8833..b0993b6 100644
+
index de6c345..6c60b88 100644
--- a/gtweak/utils.py
+++ b/gtweak/utils.py
@@ -21,6 +21,7 @@ import tempfile
···
import gtweak
from gtweak.gsettings import GSettingsSetting
-
@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
+
@@ -117,6 +118,22 @@ def execute_subprocess(cmd_then_args, block=True):
stdout, stderr = p.communicate()
return stdout, stderr, p.returncode
···
class AutostartManager:
--
-
2.12.2
+
2.14.1
+13 -36
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
···
-
From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001
+
From 8e75fe5f1ebd8a140a7306294d2219aea4ac47d2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
-
Date: Sun, 25 Jun 2017 11:35:10 +0100
+
Date: Tue, 19 Sep 2017 03:16:07 +0200
Subject: [PATCH 2/3] Don't show multiple entries for a single theme
---
-
gtweak/tweaks/tweak_group_interface.py | 8 ++++----
-
gtweak/tweaks/tweak_group_keymouse.py | 4 ++--
-
gtweak/utils.py | 16 ++++++++++++++++
-
3 files changed, 22 insertions(+), 6 deletions(-)
+
gtweak/tweaks/tweak_group_appearance.py | 8 ++++----
+
gtweak/utils.py | 16 ++++++++++++++++
+
2 files changed, 20 insertions(+), 4 deletions(-)
-
diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-
index db89b85..4697fe3 100644
-
--- a/gtweak/tweaks/tweak_group_interface.py
-
+++ b/gtweak/tweaks/tweak_group_interface.py
+
diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+
index 0d12194..8e05077 100644
+
--- a/gtweak/tweaks/tweak_group_appearance.py
+
+++ b/gtweak/tweaks/tweak_group_appearance.py
@@ -26,7 +26,7 @@ from gi.repository import Gtk
from gi.repository import GLib
import gtweak
-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
-
from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+
from gtweak.tweakmodel import Tweak
from gtweak.gshellwrapper import GnomeShellFactory
from gtweak.gsettings import GSettingsSetting
@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
···
class ShellThemeTweak(Gtk.Box, Tweak):
-
diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-
index b06900c..d34793e 100644
-
--- a/gtweak/tweaks/tweak_group_keymouse.py
-
+++ b/gtweak/tweaks/tweak_group_keymouse.py
-
@@ -21,7 +21,7 @@ from gi.repository import GLib
-
-
import gtweak
-
from gtweak.gshellwrapper import GnomeShellFactory
-
-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
-
+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
-
from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
-
-
_shell = GnomeShellFactory().get_shell()
-
@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-
valid = walk_directories(get_resource_dirs("themes"), lambda d:
-
os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-
os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
-
- return valid
-
+ return get_unique_resources(valid)
-
-
TWEAK_GROUPS = [
-
ListBoxTweakGroup(_("Keyboard and Mouse"),
diff --git a/gtweak/utils.py b/gtweak/utils.py
-
index b0993b6..0d995bc 100644
+
index 6c60b88..6fd7c6a 100644
--- a/gtweak/utils.py
+++ b/gtweak/utils.py
-
@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
+
@@ -134,6 +134,22 @@ def get_resource_dirs(resource):
return [dir for dir in dirs if os.path.isdir(dir)]
···
class AutostartManager:
--
-
2.12.2
+
2.14.1
+4 -4
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
···
-
From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001
+
From 6a6a7d1c708a2f568277699c5b605fa03ccb5faa Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
-
Date: Sun, 25 Jun 2017 11:50:33 +0100
+
Date: Tue, 19 Sep 2017 03:17:20 +0200
Subject: [PATCH 3/3] Create config dir if it doesn't exist
---
···
1 file changed, 4 insertions(+)
diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-
index a0c163b..f5883ec 100644
+
index a11363b..2871c49 100644
--- a/gtweak/gtksettings.py
+++ b/gtweak/gtksettings.py
@@ -36,6 +36,10 @@ class GtkSettingsManager:
···
keyfile.load_from_file(self._path, 0)
except MemoryError:
--
-
2.12.2
+
2.14.1
+13 -10
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
···
-
{ stdenv, intltool, fetchurl, atk
+
{ stdenv, meson, ninja, gettext, fetchurl, atk
, pkgconfig, gtk3, glib, libsoup
-
, bash, itstool, libxml2, python2Packages
+
, bash, itstool, libxml2, python3Packages
, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
stdenv.mkDerivation rec {
···
doCheck = true;
-
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
checkPhase = "meson test";
-
makeFlags = [ "DESTDIR=/" ];
+
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk3 glib intltool itstool libxml2
-
gnome3.gsettings_desktop_schemas file
+
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ];
+
buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas
gdk_pixbuf gnome3.defaultIconTheme librsvg
-
libnotify gnome3.gnome_shell python2Packages.pygobject3
+
libnotify gnome3.gnome_shell python3Packages.pygobject3
libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-
gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection
+
gnome3.gnome_desktop gobjectIntrospection
];
+
postPatch = ''
+
patchShebangs meson-postinstall.py
+
'';
+
preFixup = ''
gappsWrapperArgs+=(
-
--prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH")
+
--prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH")
'';
patches = [
+3 -3
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix
···
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
-
name = "gnome-tweak-tool-3.24.1";
+
name = "gnome-tweak-tool-3.26.3";
src = fetchurl {
-
url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz;
-
sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565";
+
url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.3.tar.xz;
+
sha256 = "9406447850b14de204f9c5a6eaa6b63ba805ddb1a10fd863239841090af76430";
};
}
+2 -2
pkgs/desktops/gnome-3/misc/gpaste/default.nix
···
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
stdenv.mkDerivation rec {
-
version = "3.24.2";
+
version = "3.26.0";
name = "gpaste-${version}";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-
sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340";
+
sha256 = "0xlcbm9qnw61h6xwa1c0lz5mp1ca3vjjn5wpk0ahhhl6k94mzjs7";
};
nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];
+2 -2
pkgs/desktops/gnome-3/misc/libgames-support/default.nix
···
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }:
stdenv.mkDerivation rec {
-
version = "1.2.1";
+
version = "1.2.3";
name = "libgnome-games-support-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libgnome-games-support/1.2/${name}.tar.xz";
-
sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6";
+
sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1";
};
nativeBuildInputs = [ pkgconfig ];
+1 -1
pkgs/desktops/gnome-3/misc/libgda/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+6 -1
pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
···
gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection
];
-
buildInputs = [ libssh2 libgit2 glib ];
+
propagatedBuildInputs = [
+
# Required by libgit2-glib-1.0.pc
+
libgit2 glib
+
];
+
+
buildInputs = [ libssh2 ];
meta = with stdenv.lib; {
platforms = platforms.linux;
+5 -5
pkgs/desktops/gnome-3/misc/pomodoro/default.nix
···
{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
-
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3,
+
dbus_glib, libcanberra_gtk2, gst_all_1, vala, gnome3, gtk3, libxml2,
glib, gobjectIntrospection, libpeas
}:
stdenv.mkDerivation rec {
-
version = "0.13.3";
+
version = "0.13.4";
name = "gnome-shell-pomodoro-${version}";
src = fetchFromGitHub {
owner = "codito";
repo = "gnome-pomodoro";
rev = "${version}";
-
sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2";
+
sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1";
};
configureScript = "./autogen.sh";
nativeBuildInputs = [
autoconf-archive libtool intltool appstream-glib
-
wrapGAppsHook pkgconfig
+
wrapGAppsHook pkgconfig libxml2
];
buildInputs = [
glib gobjectIntrospection libpeas
-
dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer
+
dbus_glib libcanberra_gtk2 vala gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gnome3.gsettings_desktop_schemas
gnome3.gnome_common gnome3.gnome_shell gtk3
+6 -5
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
···
-
{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
+
{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }:
stdenv.mkDerivation rec {
-
majorVersion = "0.3";
-
minorVersion = "1.3";
+
majorVersion = "0.4";
+
minorVersion = "3";
name = "pantheon-terminal-${majorVersion}.${minorVersion}";
src = fetchurl {
url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz";
···
done
'';
+
nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ];
buildInputs = with gnome3; [
-
perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper
-
vte_290 libgee gsettings_desktop_schemas defaultIconTheme
+
glib gtk3 granite libnotify gettext vte_290 libgee
+
gsettings_desktop_schemas defaultIconTheme
];
meta = {
description = "Elementary OS's terminal";
+3 -6
pkgs/development/compilers/orc/default.nix
···
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
-
name = "orc-0.4.27";
+
name = "orc-0.4.28";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
-
sha256 = "14vbwdydwarcvswzf744jdjb3ibhv6k4j6hzdacfan41zic3xrai";
+
sha256 = "bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce";
};
outputs = [ "out" "dev" ];
···
sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
'';
-
# building memcpy_speed.log
-
# ../test-driver: line 107: 4495 Segmentation fault "$@" > $log_file 2>&1
-
# FAIL: memcpy_speed
-
doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
+
doCheck = true;
meta = with stdenv.lib; {
description = "The Oil Runtime Compiler";
+3 -1
pkgs/development/compilers/vala/default.nix
···
inherit sha256;
};
+
outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs;
buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs;
···
extraBuildInputs = [ graphviz ];
};
-
vala = vala_0_34;
+
vala = vala_0_38;
}
+1 -1
pkgs/development/libraries/boost/generic.nix
···
-exec sed '1i#line 1 "{}"' -i '{}' \;
)
'' + optionalString (hostPlatform.libc == "msvcrt") ''
-
${stdenv.cc.prefix}ranlib "$out/lib/"*.a
+
${stdenv.cc.targetPrefix}ranlib "$out/lib/"*.a
'';
in
+1 -1
pkgs/development/libraries/ffmpeg-full/default.nix
···
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
-
"--cross-prefix=${stdenv.cc.prefix}"
+
"--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile"
"--target_os=${hostPlatform.parsed.kernel.name}"
"--arch=${hostPlatform.arch}"
+1 -1
pkgs/development/libraries/ffmpeg/generic.nix
···
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
-
"--cross-prefix=${stdenv.cc.prefix}"
+
"--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile"
"--target_os=${hostPlatform.parsed.kernel}"
"--arch=${hostPlatform.arch}"
-18
pkgs/development/libraries/giflib/5.0.nix
···
-
{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
-
-
stdenv.mkDerivation {
-
name = "giflib-5.0.6";
-
src = fetchurl {
-
url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2;
-
sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9";
-
};
-
-
buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
-
meta = {
-
description = "A library for reading and writing gif images";
-
platforms = stdenv.lib.platforms.unix;
-
license = stdenv.lib.licenses.mit;
-
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-
branch = "5.0";
-
};
-
}
+4 -3
pkgs/development/libraries/glib/default.nix
···
'';
ver_maj = "2.54";
-
ver_min = "1";
+
ver_min = "2";
in
stdenv.mkDerivation rec {
···
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-
sha256 = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3";
+
sha256 = "bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch
-
++ optional doCheck ./skip-timer-test.patch;
+
++ optional doCheck ./skip-timer-test.patch
+
++ [ ./schema-override-variable.patch ];
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
+12
pkgs/development/libraries/glib/schema-override-variable.patch
···
+
--- a/gio/gsettingsschema.c
+
+++ b/gio/gsettingsschema.c
+
@@ -352,6 +352,9 @@
+
+
try_prepend_data_dir (g_get_user_data_dir ());
+
+
+ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
+
+ try_prepend_dir (path);
+
+
+
if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)
+
try_prepend_dir (path);
+
+4 -3
pkgs/development/libraries/gnutls/3.5.nix pkgs/development/libraries/gnutls/3.6.nix
···
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
-
version = "3.5.15";
+
version = "3.6.1";
src = fetchurl {
-
url = "mirror://gnupg/gnutls/v3.5/gnutls-${version}.tar.xz";
-
sha256 = "1mgsxkbs44csw07ngwbqns2y2s03m975lk1sl5ay87wbic882q04";
+
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
+
sha256 = "1vdsir53ddxyapnxh5fpnfyij3scx3818iri4hl07g4lk4n0vc90";
};
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
···
postPatch = ''
sed '2iexit 77' -i tests/pkgconfig.sh
sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
+
# TODO: remove just this line on some rebuild
'';
})
+2 -2
pkgs/development/libraries/granite/default.nix
···
stdenv.mkDerivation rec {
majorVersion = "0.4";
-
minorVersion = "0.1";
+
minorVersion = "1";
name = "granite-${majorVersion}.${minorVersion}";
src = fetchurl {
url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz";
-
sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm";
+
sha256 = "177h5h1q4qd7g99mzbczvz78j8c9jf4f1gwdj9f6imbc7r913d4b";
};
cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0";
nativeBuildInputs = [ pkgconfig ];
+2 -2
pkgs/development/libraries/gtk+/3.x.nix
···
, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux, cups ? null
-
, darwin
+
, darwin, gnome3
}:
assert cupsSupport -> cups != null;
···
buildInputs = [ libxkbcommon epoxy json_glib ];
propagatedBuildInputs = with xorg; with stdenv.lib;
-
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
+
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk gnome3.gsettings_desktop_schemas
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
+2 -2
pkgs/development/libraries/gvfs/default.nix
···
{ stdenv, fetchurl, pkgconfig, intltool, libtool
, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma
-
, libxml2, libxslt, docbook_xsl, samba, libmtp
+
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper }:
let
···
nativeBuildInputs = [
pkgconfig intltool libtool file makeWrapper
-
libxml2 libxslt docbook_xsl
+
libxml2 libxslt docbook_xsl docbook_xml_dtd_42
];
buildInputs =
+2 -2
pkgs/development/libraries/harfbuzz/default.nix
···
}:
let
-
version = "1.5.1";
+
version = "1.7.1";
inherit (stdenv.lib) optional optionals optionalString;
in
···
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-
sha256 = "56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51";
+
sha256 = "9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e";
};
outputs = [ "out" "dev" ];
+1 -1
pkgs/development/libraries/libav/default.nix
···
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
-
"--cross-prefix=${stdenv.cc.prefix}"
+
"--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${hostPlatform.arch}"
+4 -3
pkgs/development/libraries/libdrm/default.nix
···
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
-
name = "libdrm-2.4.84";
+
name = "libdrm-2.4.88";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-
sha256 = "7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa";
+
sha256 = "b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5";
};
outputs = [ "out" "dev" "bin" ];
···
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-install-test-programs" ]
-
++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
+
++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64)
+
[ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
++ stdenv.lib.optional stdenv.isDarwin "-C";
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
+2 -2
pkgs/development/libraries/libsecret/default.nix
···
{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc
-
, libgcrypt, gobjectIntrospection, vala_0_32 }:
+
, libgcrypt, gobjectIntrospection, vala_0_38 }:
let
version = "0.18.5";
in
···
propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ];
-
buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ];
+
buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ];
# optional: build docs with gtk-doc? (probably needs a flag as well)
meta = {
+2 -2
pkgs/development/libraries/libsoup/default.nix
···
{ stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection
-
, valaSupport ? true, vala_0_32
+
, valaSupport ? true, vala_0_38
, libintlOrEmpty
, intltool, python }:
let
···
outputs = [ "out" "dev" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
-
++ stdenv.lib.optionals valaSupport [ vala_0_32 ];
+
++ stdenv.lib.optionals valaSupport [ vala_0_38 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ];
+2
pkgs/development/libraries/libxmlxx/default.nix
···
sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
};
+
outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ libxml2 glibmm ];
+2
pkgs/development/libraries/libxmlxx/v3.nix
···
sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
};
+
outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [ pkgconfig perl ];
buildInputs = [ glibmm ];
+2 -2
pkgs/development/libraries/mesa/default.nix
···
in
let
-
version = "17.2.4";
+
version = "17.2.6";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
···
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
-
sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v";
+
sha256 = "1pihiymglf3bf6w2vphac65v64hv71wgrj38mckbwc03c8j55n3a";
};
prePatch = "patchShebangs .";
+2 -2
pkgs/development/libraries/nettle/default.nix
···
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
-
version = "3.3";
+
version = "3.4";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-
sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
+
sha256 = "150y8655h629wn946dvzasq16qxsc1m9nf58mifvhl350bgl4ymf";
};
})
+1 -1
pkgs/development/libraries/newt/default.nix
···
'';
crossAttrs = {
-
makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}";
+
makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
};
meta = with stdenv.lib; {
+2 -2
pkgs/development/libraries/pango/default.nix
···
let
ver_maj = "1.40";
-
ver_min = "12";
+
ver_min = "14";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-
sha256 = "75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc";
+
sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3";
};
outputs = [ "bin" "dev" "out" "devdoc" ];
+7
pkgs/development/libraries/pcre2/default.nix
···
stripLen = 2;
addPrefixes = true;
})
+
(fetchpatch {
+
name = "CVE-2017-8786.patch";
+
url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch";
+
sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b";
+
stripLen = 2;
+
addPrefixes = true;
+
})
];
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
+5 -5
pkgs/development/libraries/qt-4.x/4.8/default.nix
···
'' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6";
patches = [];
preConfigure = ''
-
sed -i -e 's/ g++/ ${stdenv.cc.prefix}g++/' \
-
-e 's/ gcc/ ${stdenv.cc.prefix}gcc/' \
-
-e 's/ ar/ ${stdenv.cc.prefix}ar/' \
-
-e 's/ strip/ ${stdenv.cc.prefix}strip/' \
-
-e 's/ windres/ ${stdenv.cc.prefix}windres/' \
+
sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \
+
-e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \
+
-e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \
+
-e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \
+
-e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \
mkspecs/win32-g++/qmake.conf
'';
-2
pkgs/development/libraries/zeitgeist/default.nix
···
sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8";
};
-
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
configureScript = "./autogen.sh";
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
+1 -1
pkgs/development/libraries/zlib/default.nix
···
];
makeFlags = [
-
"PREFIX=${stdenv.cc.prefix}"
+
"PREFIX=${stdenv.cc.targetPrefix}"
] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [
"-f" "win32/Makefile.gcc"
] ++ stdenv.lib.optionals (!static) [
+3 -3
pkgs/development/tools/build-managers/cmake/default.nix
···
let
os = stdenv.lib.optionalString;
majorVersion = "3.9";
-
minorVersion = "4";
+
minorVersion = "6";
version = "${majorVersion}.${minorVersion}";
in
···
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-
# from https://cmake.org/files/v3.9/cmake-3.9.4-SHA-256.txt
-
sha256 = "b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1";
+
# from https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt
+
sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218";
};
prePatch = optionalString (!useSharedLibraries) ''
+9
pkgs/development/tools/build-managers/meson/default.nix
···
popd
'';
+
patches = [
+
# Unlike libtool, vanilla Meson does not pass any information
+
# about the path library will be installed to to g-ir-scanner,
+
# breaking the GIR when path other than ${!outputLib}/lib is used.
+
# We patch Meson to add a --fallback-library-path argument with
+
# library install_dir to g-ir-scanner.
+
./gir-fallback-path.patch
+
];
+
postPatch = ''
sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py
'';
+13
pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
···
+
--- a/mesonbuild/modules/gnome.py
+
+++ b/mesonbuild/modules/gnome.py
+
@@ -427,6 +427,10 @@
+
scan_command += ['--no-libtool', '--namespace=' + ns, '--nsversion=' + nsversion, '--warn-all',
+
'--output', '@OUTPUT@']
+
+
+ fallback_libpath = girtarget.get_custom_install_dir()[0]
+
+ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/":
+
+ scan_command += ['--fallback-library-path=' + fallback_libpath]
+
+
+
header = kwargs.pop('header', None)
+
if header:
+
if not isinstance(header, str):
+8 -2
pkgs/development/tools/documentation/gnome-doc-utils/default.nix
···
sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
};
+
nativeBuildInputs = [ intltool pkgconfig ];
+
buildInputs = [ libxslt ];
+
configureFlags = "--disable-scrollkeeper";
-
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ libxslt intltool ];
+
+
preBuild = ''
+
substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""'
+
'';
+
propagatedBuildInputs = [ libxml2Python ];
}
+8 -23
pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
···
-
diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4
-
index 618c1c9..1842a0d 100644
--- a/m4/gtkdoc_jh_check_xml_catalog.m4
+++ b/m4/gtkdoc_jh_check_xml_catalog.m4
-
@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
+
@@ -5,8 +5,8 @@
+
[
+
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+
- if $jh_found_xmlcatalog && \
+
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
+
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
AC_MSG_RESULT([found])
ifelse([$3],,,[$3])
else
-
- AC_MSG_RESULT([not found])
-
- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4])
-
+ jh_check_xml_catalog_saved_ifs="$IFS"
-
+ IFS=' '
-
+ for f in $XML_CATALOG_FILES; do
-
+ if [[ -f "$f" ]] && \
-
+ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then
-
+ jh_found_xmlcatalog=true
-
+ AC_MSG_RESULT([found])
-
+ ifelse([$3],,,[$3])
-
+ break
-
+ fi
-
+ done
-
+ IFS="$jh_check_xml_catalog_saved_ifs"
-
+ if ! $jh_found_xmlcatalog; then
-
+ AC_MSG_RESULT([not found])
-
+ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4])
-
+ fi
-
fi
-
])
+5 -5
pkgs/development/tools/misc/binutils/default.nix
···
version = "2.28.1";
basename = "binutils-${version}";
inherit (stdenv.lib) optional optionals optionalString;
-
# The prefix prepended to binary names to allow multiple binuntils on the
+
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
-
prefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
+
targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
in
stdenv.mkDerivation rec {
-
name = prefix + basename;
+
name = targetPrefix + basename;
src = fetchurl {
url = "mirror://gnu/binutils/${basename}.tar.bz2";
···
then "-Wno-string-plus-int -Wno-deprecated-declarations"
else "-static-libgcc";
-
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if hostPlatform == targetPlatform && targetPlatform.isArm
···
enableParallelBuilding = true;
passthru = {
-
inherit prefix version;
+
inherit targetPrefix version;
};
meta = with stdenv.lib; {
+1 -1
pkgs/misc/uboot/default.nix
···
crossAttrs = {
makeFlags = [
"ARCH=${hostPlatform.platform.kernelArch}"
-
"CROSS_COMPILE=${stdenv.cc.prefix}"
+
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
};
+8 -8
pkgs/os-specific/darwin/binutils/default.nix
···
}:
# Make sure both underlying packages claim to have prepended their binaries
-
# with the same prefix.
-
assert binutils-raw.prefix == cctools.prefix;
+
# with the same targetPrefix.
+
assert binutils-raw.targetPrefix == cctools.targetPrefix;
let
-
inherit (binutils-raw) prefix;
+
inherit (binutils-raw) targetPrefix;
cmds = [
"ar" "ranlib" "as" "dsymutil" "install_name_tool"
"ld" "strip" "otool" "lipo" "nm" "strings" "size"
];
in
-
# TODO loop over prefixed binaries too
+
# TODO loop over targetPrefixed binaries too
stdenv.mkDerivation {
-
name = "${prefix}cctools-binutils-darwin";
+
name = "${targetPrefix}cctools-binutils-darwin";
buildCommand = ''
mkdir -p $out/bin $out/include
-
ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt
+
ln -s ${binutils-raw.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt
# We specifically need:
# - ld: binutils doesn't provide it on darwin
···
# - strip: the binutils one seems to break mach-o files
# - lipo: gcc build assumes it exists
# - nm: the gnu one doesn't understand many new load commands
-
for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: prefix + e) cmds)}; do
+
for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: targetPrefix + e) cmds)}; do
ln -sf "${cctools}/bin/$i" "$out/bin/$i"
done
···
'';
passthru = {
-
inherit prefix;
+
inherit targetPrefix;
};
}
+5 -5
pkgs/os-specific/darwin/cctools/port.nix
···
}:
let
-
# The prefix prepended to binary names to allow multiple binuntils on the
+
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
-
prefix = stdenv.lib.optionalString
+
targetPrefix = stdenv.lib.optionalString
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
in
···
let
baseParams = rec {
-
name = "${prefix}cctools-port-${version}";
+
name = "${targetPrefix}cctools-port-${version}";
version = "895";
src = fetchFromGitHub {
···
enableParallelBuilding = true;
-
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [
"CXXFLAGS=-I${libcxx}/include/c++/v1"
···
'';
passthru = {
-
inherit prefix;
+
inherit targetPrefix;
};
meta = {
+2 -2
pkgs/os-specific/linux/busybox/default.nix
···
CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"
${extraConfig}
-
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}"
+
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}"
EOF
make oldconfig
···
'';
postConfigure = lib.optionalString useMusl ''
-
makeFlagsArray+=("CC=${stdenv.cc.prefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
+
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
'';
nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+1 -1
pkgs/os-specific/linux/kernel/perf.nix
···
/* I don't want cross-python or cross-perl -
I don't know if cross-python even works */
propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ];
-
makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}";
+
makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
elfutils = elfutils.crossDrv;
inherit (kernel.crossDrv) src patches;
};
+1 -1
pkgs/os-specific/linux/klibc/default.nix
···
] # TODO(@Ericson2314): We now can get the ABI from
# `hostPlatform.parsed.abi`, is this still a good idea?
++ stdenv.lib.optional (hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
-
++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.prefix}";
+
++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
# Install static binaries as well.
postInstall = ''
+1 -1
pkgs/os-specific/linux/mdadm/4.nix
···
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
"STRIP="
] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
-
"CROSS_COMPILE=${stdenv.cc.prefix}"
+
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
nativeBuildInputs = [ groff ];
+1 -1
pkgs/os-specific/linux/mdadm/default.nix
···
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
"STRIP="
] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
-
"CROSS_COMPILE=${stdenv.cc.prefix}"
+
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
nativeBuildInputs = [ groff ];
+2 -2
pkgs/os-specific/linux/systemd/default.nix
···
src = fetchFromGitHub {
owner = "nixos";
repo = "systemd";
-
rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f";
-
sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5";
+
rev = "eef5613fda5";
+
sha256 = "0wgh5y319v56hcs82mhs58ipb100cz4x41vz3kh4bq1n7sx88cdz";
};
outputs = [ "out" "lib" "man" "dev" ];
+1 -1
pkgs/os-specific/windows/jom/default.nix
···
QTDIR = qt48;
crossAttrs = {
-
# cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.prefix}windres";
+
# cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
QTDIR = qt48.crossDrv;
preBuild = ''
export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
+20 -20
pkgs/servers/x11/xorg/default.nix
···
}) // {inherit libX11 xproto libXt ;};
bdftopcf = (mkDerivation "bdftopcf" {
-
name = "bdftopcf-1.0.5";
+
name = "bdftopcf-1.1";
builder = ./builder.sh;
src = fetchurl {
-
url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2;
-
sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q";
+
url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2;
+
sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab";
};
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ libXfont ];
+
buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix;
-
}) // {inherit libXfont ;};
+
}) // {inherit ;};
bigreqsproto = (mkDerivation "bigreqsproto" {
name = "bigreqsproto-1.1.2";
···
}) // {inherit compositeproto libX11 libXfixes xproto ;};
libXcursor = (mkDerivation "libXcursor" {
-
name = "libXcursor-1.1.14";
+
name = "libXcursor-1.1.15";
builder = ./builder.sh;
src = fetchurl {
-
url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2;
-
sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
+
url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2;
+
sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ];
···
}) // {inherit fixesproto libX11 xextproto xproto ;};
libXfont = (mkDerivation "libXfont" {
-
name = "libXfont-1.5.3";
+
name = "libXfont-1.5.4";
builder = ./builder.sh;
src = fetchurl {
-
url = mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2;
-
sha256 = "1l4k3i3xzqdmaszykh6bb2ah78p6c3z7fak7xzgq2d38s87w31db";
+
url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2;
+
sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ];
···
}) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
libXfont2 = (mkDerivation "libXfont2" {
-
name = "libXfont2-2.0.2";
+
name = "libXfont2-2.0.3";
builder = ./builder.sh;
src = fetchurl {
-
url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2;
-
sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l";
+
url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2;
+
sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ];
···
}) // {inherit xproto zlib ;};
libpciaccess = (mkDerivation "libpciaccess" {
-
name = "libpciaccess-0.13.5";
+
name = "libpciaccess-0.14";
builder = ./builder.sh;
src = fetchurl {
-
url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2;
-
sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m";
+
url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2;
+
sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib ];
···
}) // {inherit inputproto xorgserver xproto ;};
xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-
name = "xf86-input-libinput-0.25.0";
+
name = "xf86-input-libinput-0.26.0";
builder = ./builder.sh;
src = fetchurl {
-
url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2;
-
sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv";
+
url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2;
+
sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ inputproto xorgserver xproto ];
+4
pkgs/servers/x11/xorg/overrides.nix
···
compose = f: g: x: f (g x);
in
{
+
bdftopcf = attrs: attrs // {
+
buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.fontsproto ];
+
};
+
bitmap = attrs: attrs // {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
postInstall = ''
+6 -6
pkgs/servers/x11/xorg/tarballs-7.7.list
···
mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2
-
mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2
+
mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
mirror://xorg/individual/app/bitmap-1.0.8.tar.gz
mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
···
mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
-
mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2
+
mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
-
mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
+
mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
-
mirror://xorg/individual/lib/libXfont-1.5.3.tar.bz2
-
mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2
+
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
+
mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
···
mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-
mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2
+
mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
+8 -2
pkgs/tools/misc/colord/default.nix
···
{ stdenv, fetchurl, bash-completion
, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38
-
, libgudev, sane-backends }:
+
, libgudev, sane-backends, udev, gnome3, makeWrapper }:
stdenv.mkDerivation rec {
name = "colord-1.4.1";
···
./fix-build-paths.patch
];
-
nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ];
+
nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ];
buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus
bash-completion argyllcms libgudev sane-backends ];
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
+
'';
+
+
postFixup = ''
+
wrapProgram "$out/libexec/colord-session" \
+
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \
+
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
'';
meta = {
+18
pkgs/tools/misc/colord/fix-build-paths.patch
···
)
endif
+
@@ -50,5 +50,5 @@
+
output : 'org.freedesktop.ColorManager.conf',
+
configuration : con2,
+
install: true,
+
- install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') ,
+
+ install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') ,
+
)
--- a/meson.build
+++ b/meson.build
@@ -258,6 +258,3 @@
···
- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
+ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d')
)
+
--- a/src/plugins/meson.build
+
+++ b/src/plugins/meson.build
+
@@ -66,7 +66,7 @@
+
install_dir: join_paths(get_option('libdir'), 'colord-plugins'),
+
c_args : [
+
cargs,
+
- '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'),
+
+ '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'),
+
],
+
dependencies : [
+
gio,
+1 -1
pkgs/tools/networking/htpdate/default.nix
···
makeFlags = [
"INSTALL=install"
-
"STRIP=${stdenv.cc.bintools.prefix}strip"
+
"STRIP=${stdenv.cc.bintools.targetPrefix}strip"
"prefix=$(out)"
];
+4 -7
pkgs/top-level/all-packages.nix
···
gnu-efi = callPackage ../development/libraries/gnu-efi { };
-
gnutls = gnutls35;
-
-
gnutls35 = callPackage
+
gnutls = callPackage
(if stdenv.isDarwin
# Avoid > 3.5.10 due to frameworks for now; see discussion on:
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1
then ../development/libraries/gnutls/3.5.10.nix
-
else ../development/libraries/gnutls/3.5.nix)
+
else ../development/libraries/gnutls/3.6.nix)
guileBindings = config.gnutls.guile or false;
};
···
giflib = giflib_5_1;
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
-
giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { };
giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
libungif = callPackage ../development/libraries/giflib/libungif.nix { };
···
deepin-terminal = callPackage ../applications/misc/deepin-terminal {
-
vte = gnome3.vte;
+
inherit (gnome3) libgee vte;
wnck = libwnck3;
-
gee = libgee_0_8;
+
vala = vala_0_34;
termite = callPackage ../applications/misc/termite {