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

Merge commit '2858c41' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-08-30 21:07:07 +02:00
commit 6d4bd78fad
515 changed files with 2258 additions and 1901 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/systems/doubles.nix
View File

@ -26,7 +26,7 @@ in rec {
allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
none = [];
arm = filterDoubles predicates.isArm32;
arm = filterDoubles predicates.isArm;
i686 = filterDoubles predicates.isi686;
mips = filterDoubles predicates.isMips;
x86_64 = filterDoubles predicates.isx86_64;

4
lib/systems/inspect.nix
View File

@ -11,6 +11,7 @@ rec {
PowerPC = { cpu = cpuTypes.powerpc; };
x86 = { cpu = { family = "x86"; }; };
Arm = { cpu = { family = "arm"; }; };
Aarch64 = { cpu = { family = "aarch64"; }; };
Mips = { cpu = { family = "mips"; }; };
BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
@ -28,9 +29,6 @@ rec {
Windows = { kernel = kernels.windows; };
Cygwin = { kernel = kernels.windows; abi = abis.cygnus; };
MinGW = { kernel = kernels.windows; abi = abis.gnu; };
Arm32 = recursiveUpdate Arm patterns."32bit";
Arm64 = recursiveUpdate Arm patterns."64bit";
};
matchAnyAttrs = patterns:

2
lib/systems/parse.nix
View File

@ -40,7 +40,7 @@ rec {
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };

5
nixos/doc/manual/release-notes/rl-1709.xml
View File

@ -10,6 +10,11 @@
has the following highlights: </para>
<itemizedlist>
<listitem>
<para>
The GNOME version is now 3.24.
</para>
</listitem>
<listitem>
<para>
The user handling now keeps track of deallocated UIDs/GIDs. When a user

2
nixos/modules/services/misc/bepasty.nix
View File

@ -3,7 +3,7 @@
with lib;
let
gunicorn = pkgs.pythonPackages.gunicorn;
bepasty = pkgs.pythonPackages.bepasty-server;
bepasty = pkgs.bepasty;
gevent = pkgs.pythonPackages.gevent;
python = pkgs.pythonPackages.python;
cfg = config.services.bepasty;

19
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -103,14 +103,29 @@ in
(filter (arg: arg != "-terminate") cfg.xserverArgs);
GDM_SESSIONS_DIR = "${cfg.session.desktops}";
# Find the mouse
XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";
};
execCmd = "exec ${gdm}/bin/gdm";
};
# Because sd_login_monitor_new requires /run/systemd/machines
systemd.services.display-manager.wants = [ "systemd-machined.service" ];
systemd.services.display-manager.after = [ "systemd-machined.service" ];
systemd.services.display-manager.after = [
"rc-local.service"
"systemd-machined.service"
"systemd-user-sessions.service"
"getty@tty1.service"
];
systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
systemd.services.display-manager.serviceConfig = {
# Restart = "always"; - already defined in xserver.nix
KillMode = "mixed";
IgnoreSIGPIPE = "no";
BusName = "org.gnome.DisplayManager";
StandardOutput = "syslog";
StandardError = "inherit";
};
systemd.services.display-manager.path = [ gnome3.gnome_session ];

28
pkgs/applications/editors/ed/default.nix
View File

@ -1,26 +1,20 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, lzip
, buildPlatform, hostPlatform
}:
stdenv.mkDerivation rec {
name = "ed-${version}";
version = "1.14.1";
version = "1.14.2";
src = fetchurl {
# gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
#url = "mirror://gnu/ed/${name}.tar.gz";
# When updating, please make sure the sources pulled match those upstream by
# Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
# in the resulting directory
urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
in [
("http://pkgs.fedoraproject.org/repo/extras/ed"
+ "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
"http://fossies.org/linux/privat/${name}.tar.bz2"
];
sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
url = "mirror://gnu/ed/${name}.tar.lz";
sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
};
unpackCmd = "tar --lzip -xf";
nativeBuildInputs = [ lzip ];
/* FIXME: Tests currently fail on Darwin:
building test scripts for ed-1.5...
@ -32,11 +26,7 @@ stdenv.mkDerivation rec {
*/
doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
# TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix
# 1.12 is released.
preConfigure = ''
export DESTDIR=$out
'';
installFlags = [ "DESTDIR=$(out)" ];
configureFlags = [
"--exec-prefix=${stdenv.cc.prefix}"

4
pkgs/applications/misc/buku/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, pythonPackages, fetchFromGitHub }:
{ stdenv, python3, fetchFromGitHub }:
with pythonPackages; buildPythonApplication rec {
with python3.pkgs; buildPythonApplication rec {
version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck
name = "buku-${version}";

19
pkgs/applications/misc/sqlmap/default.nix
View File

@ -1,19 +0,0 @@
{ stdenv, pythonPackages, pkgs }:
pythonPackages.buildPythonPackage {
name = "sqlmap-1.1";
disabled = pythonPackages.isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/s/sqlmap/sqlmap-1.1.tar.gz";
sha256 = "0px72p52w76cylr68i69kz0kagmbrslgx2221yi77322fih0mngi";
};
meta = with pkgs.stdenv.lib; {
homepage = "http://sqlmap.org";
license = licenses.gpl2;
description = "Automatic SQL injection and database takeover tool";
maintainers = with stdenv.lib.maintainers; [ bennofs ];
};
}

8
pkgs/applications/networking/feedreaders/rawdog/default.nix
View File

@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "rawdog-${version}";
version = "2.21";
version = "2.22";
src = fetchurl {
url = "http://offog.org/files/${name}.tar.gz";
sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030";
url = "https://offog.org/files/${name}.tar.gz";
sha256 = "01ircwl80xi5lamamsb22i7vmsh2ysq3chn9mbsdhqic2i32hcz0";
};
propagatedBuildInputs = with python2Packages; [ feedparser ];
@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
namePrefix = "";
meta = with stdenv.lib; {
homepage = http://offog.org/code/rawdog/;
homepage = https://offog.org/code/rawdog/;
description = "RSS Aggregator Without Delusions Of Grandeur";
license = licenses.gpl2;
platforms = platforms.unix;

2
pkgs/applications/office/fava/default.nix
View File

@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
};
buildInputs = with python3Packages; [ pytest_30 ];
checkInputs = with python3Packages; [ pytest ];
checkPhase = ''
# pyexcel is optional

257
pkgs/build-support/cc-wrapper/default.nix
View File

@ -66,7 +66,7 @@ let
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"
# ARM with a wildcard, which can be "" or "-armhf".
else if targetPlatform.isArm32 then "${libc_lib}/lib/ld-linux*.so.3"
else if targetPlatform.isArm then "${libc_lib}/lib/ld-linux*.so.3"
else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1"
else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1"
else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1"
@ -74,18 +74,10 @@ let
else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
else null;
expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
then buildPackages.stdenv.mkDerivation {
name = "expand-response-params";
src = ./expand-response-params.c;
buildCommand = ''
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
cp "$src" expand-response-params.c
"$CC" -std=c99 -O3 -o "$out" expand-response-params.c
strip -S $out
${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
'';
} else "";
expand-response-params =
if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
then import ../expand-response-params { inherit (buildPackages) stdenv; }
else "";
in
@ -120,8 +112,17 @@ stdenv.mkDerivation {
'';
};
buildCommand =
dontBuild = true;
dontConfigure = true;
unpackPhase = ''
src=$PWD
'';
installPhase =
''
set -u
mkdir -p $out/bin $out/nix-support $man/nix-support
wrap() {
@ -133,110 +134,16 @@ stdenv.mkDerivation {
}
''
+ optionalString (libc != null) (''
if [[ -z ''${dynamicLinker+x} ]]; then
echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
dynamicLinker="${libc_lib}/lib/ld*.so.?"
fi
# Expand globs to fill array of options
dynamicLinker=($dynamicLinker)
case ''${#dynamicLinker[@]} in
0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
esac
if [ -n "$dynamicLinker" ]; then
echo $dynamicLinker > $out/nix-support/dynamic-linker
'' + (if targetPlatform.isDarwin then ''
printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
'' else ''
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
fi
ldflagsBefore=(-dynamic-linker "$dynamicLinker")
'') + ''
fi
# The dynamic linker is passed in `ldflagsBefore' to allow
# explicit overrides of the dynamic linker by callers to gcc/ld
# (the *last* value counts, so ours should come first).
printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
'')
+ optionalString (libc != null) ''
# The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
# against the crt1.o from our own glibc, rather than the one in
# /usr/lib. (This is only an issue when using an `impure'
# compiler/linker, i.e., one that searches /usr/lib and so on.)
#
# Unfortunately, setting -B appears to override the default search
# path. Thus, the gcc-specific "../includes-fixed" directory is
# now longer searched and glibc's <limits.h> header fails to
# compile, because it uses "#include_next <limits.h>" to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
''
+ (if nativeTools then ''
echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
ldPath="${nativePrefix}/bin"
'' else ''
echo $cc > $out/nix-support/orig-cc
# GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
# ${cc_solib}/lib64 (even though it does actually search there...)..
# This confuses libtool. So add it to the compiler tool search
# path explicitly.
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
ccLDFlags+=" -L${cc_solib}/lib64"
ccCFlags+=" -B${cc_solib}/lib64"
fi
ccLDFlags+=" -L${cc_solib}/lib"
ccCFlags+=" -B${cc_solib}/lib"
${optionalString cc.langVhdl or false ''
ccLDFlags+=" -L${zlib.out}/lib"
''}
# Find the gcc libraries path (may work only without multilib).
${optionalString cc.langAda or false ''
basePath=`echo ${cc_solib}/lib/*/*/*`
ccCFlags+=" -B$basePath -I$basePath/adainclude"
gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
echo "$gnatCFlags" > $out/nix-support/gnat-cflags
''}
if [ -e $ccPath/clang ]; then
# Need files like crtbegin.o from gcc
# It's unclear if these will ever be provided by an LLVM project
ccCFlags="$ccCFlags -B$basePath"
ccCFlags="$ccCFlags -isystem$cc/lib/clang/$ccVersion/include"
fi
echo "$ccLDFlags" > $out/nix-support/cc-ldflags
echo "$ccCFlags" > $out/nix-support/cc-cflags
ccPath="${cc}/bin"
ldPath="${binutils_bin}/bin"
# Propagate the wrapped cc so that if you install the wrapper,
# you get tools like gcov, the manpages, etc. as well (including
# for binutils and Glibc).
printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages
printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
''
+ optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
@ -327,15 +234,129 @@ stdenv.mkDerivation {
+ optionalString cc.langVhdl or false ''
ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
'';
propagatedBuildInputs = extraPackages;
setupHook = ./setup-hook.sh;
postFixup =
''
set -u
''
+ optionalString (libc != null) (''
##
## General libc support
##
# The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
# against the crt1.o from our own glibc, rather than the one in
# /usr/lib. (This is only an issue when using an `impure'
# compiler/linker, i.e., one that searches /usr/lib and so on.)
#
# Unfortunately, setting -B appears to override the default search
# path. Thus, the gcc-specific "../includes-fixed" directory is
# now longer searched and glibc's <limits.h> header fails to
# compile, because it uses "#include_next <limits.h>" to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
##
## Dynamic linker support
##
if [[ -z ''${dynamicLinker+x} ]]; then
echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
local dynamicLinker="${libc_lib}/lib/ld*.so.?"
fi
# Expand globs to fill array of options
dynamicLinker=($dynamicLinker)
case ''${#dynamicLinker[@]} in
0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
esac
if [ -n "$dynamicLinker" ]; then
echo $dynamicLinker > $out/nix-support/dynamic-linker
'' + (if targetPlatform.isDarwin then ''
printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
'' else ''
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
fi
local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
'') + ''
fi
# The dynamic linker is passed in `ldflagsBefore' to allow
# explicit overrides of the dynamic linker by callers to gcc/ld
# (the *last* value counts, so ours should come first).
printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
'')
+ optionalString (!nativeTools) ''
##
## Initial CFLAGS
##
# GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
# ${cc_solib}/lib64 (even though it does actually search there...)..
# This confuses libtool. So add it to the compiler tool search
# path explicitly.
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
ccLDFlags+=" -L${cc_solib}/lib64"
ccCFlags+=" -B${cc_solib}/lib64"
fi
ccLDFlags+=" -L${cc_solib}/lib"
ccCFlags+=" -B${cc_solib}/lib"
${optionalString cc.langVhdl or false ''
ccLDFlags+=" -L${zlib.out}/lib"
''}
# Find the gcc libraries path (may work only without multilib).
${optionalString cc.langAda or false ''
basePath=`echo ${cc_solib}/lib/*/*/*`
ccCFlags+=" -B$basePath -I$basePath/adainclude"
gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
echo "$gnatCFlags" > $out/nix-support/gnat-cflags
''}
echo "$ccLDFlags" > $out/nix-support/cc-ldflags
echo "$ccCFlags" > $out/nix-support/cc-cflags
##
## User env support
##
# Propagate the wrapped cc so that if you install the wrapper,
# you get tools like gcov, the manpages, etc. as well (including
# for binutils and Glibc).
printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages
''
+ ''
substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
rm $out/nix-support/setup-hook.tmp
##
## Hardening support
##
# some linkers on some platforms don't support specific -z flags
hardening_unsupported_flags=""
export hardening_unsupported_flags=""
if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
hardening_unsupported_flags+=" bindnow"
fi
@ -352,12 +373,18 @@ stdenv.mkDerivation {
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${./utils.sh} $out/nix-support/utils.sh
##
## Extra custom steps
##
''
+ extraBuildCommands;
inherit dynamicLinker expand-response-params;
expandResponseParams = expand-response-params; # for substitution in utils.sh
# for substitution in utils.sh
expandResponseParams = "${expand-response-params}/bin/expand-response-params";
crossAttrs = {
shell = shell.crossDrv + shell.crossDrv.shellPath;

2
pkgs/build-support/cc-wrapper/ld-wrapper.sh
View File

@ -121,7 +121,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
# It's important to add the rpath in the order of -L..., so
# the link time chosen objects will be those of runtime linking.
declare -A rpaths
for dir in "${libDirs[@]}"; do
for dir in ${libDirs+"${libDirs[@]}"}; do
if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
dir="$dir2"
fi

2
pkgs/build-support/cc-wrapper/utils.sh
View File

@ -30,7 +30,7 @@ expandResponseParams() {
if [[ "$arg" == @* ]]; then
# phase separation makes this look useless
# shellcheck disable=SC2157
if [ -n "@expandResponseParams@" ]; then
if [ -x "@expandResponseParams@" ]; then
# params is used by caller
#shellcheck disable=SC2034
readarray -d '' params < <("@expandResponseParams@" "$@")

19
pkgs/build-support/expand-response-params/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv }:
stdenv.mkDerivation {
name = "expand-response-params";
src = ./expand-response-params.c;
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path
# /nix/store/...-expand-response-params.c"
unpackPhase = ''
cp "$src" expand-response-params.c
src=$PWD
'';
buildPhase = ''
"$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
'';
installPhase = ''
mkdir -p $prefix/bin
mv expand-response-params $prefix/bin/
'';
}

0
pkgs/build-support/cc-wrapper/expand-response-params.c → pkgs/build-support/expand-response-params/expand-response-params.c
View File

2
pkgs/build-support/gcc-wrapper-old/default.nix
View File

@ -92,7 +92,7 @@ stdenv.mkDerivation {
(if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else
if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
# ARM with a wildcard, which can be "" or "-armhf".
if targetPlatform.isArm32 then "ld-linux*.so.3" else
if targetPlatform.isArm then "ld-linux*.so.3" else
if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else
if targetPlatform.system == "powerpc-linux" then "ld.so.1" else
if targetPlatform.system == "mips64el-linux" then "ld.so.1" else

10
pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "bijiben-3.21.2";
src = fetchurl {
url = mirror://gnome/sources/bijiben/3.21/bijiben-3.21.2.tar.xz;
sha256 = "d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "cheese-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/cheese/3.22/cheese-3.22.0.tar.xz;
sha256 = "0b52e4b0021cfb86a5abbd17356b72693f724892165d91b3ff7f5031a1ce53ea";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/evolution/3.22/evolution-3.22.0.tar.xz;
sha256 = "3e4742032b450cd8752097ba7e56302134e3653d510d4c53196654fb353ebbeb";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "file-roller-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/file-roller/3.22/file-roller-3.22.0.tar.xz;
sha256 = "5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-boxes-3.22.4";
src = fetchurl {
url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-calendar-3.22.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.1.tar.xz;
sha256 = "e6a3670c63122c4b37fbe243a54486e019c1bfd9a27c709234fb81b9e0c13360";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-characters-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz;
sha256 = "0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-clocks-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.0.tar.xz;
sha256 = "cdcd4ccd9716e7f12487a80d1b173aa28d9bde536d6274fbbc31acd6606c0511";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-documents-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.0.tar.xz;
sha256 = "edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-getting-started-docs-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz;
sha256 = "22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-logs-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.0.tar.xz;
sha256 = "114da79579d69840904970b2b3a72dc8f6be76a5673174b6628b42fd6781eb4f";
};
}

12
pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
View File

@ -1,12 +0,0 @@
--- gnome-maps-3.18.0/configure.ac.orig 2015-09-24 18:38:31.912498368 +0200
+++ gnome-maps-3.18.0/configure.ac 2015-09-24 18:38:40.783320413 +0200
@@ -50,8 +50,9 @@
folks >= $FOLKS_MIN_VERSION
geocode-glib-1.0 >= $GEOCODE_MIN_VERSION
champlain-0.12 >= $CHAMPLAIN_MIN_VERSION
libxml-2.0
rest-0.7
+ libsoup-2.4
])
AC_SUBST(GNOME_MAPS_LIB_CFLAGS)
AC_SUBST(GNOME_MAPS_LIB_LIBS)

10
pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-maps-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz;
sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-music-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz;
sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-photos-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz;
sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-weather-3.20.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz;
sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b";
};
}

10
pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "polari-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz;
sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818";
};
}

10
pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "adwaita-icon-theme-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz;
sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7";
};
}

10
pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "baobab-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz;
sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99";
};
}

10
pkgs/desktops/gnome-3/3.22/core/eog/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "eog-3.20.4";
src = fetchurl {
url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;
sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";
};
}

10
pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "epiphany-3.22.6";
src = fetchurl {
url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;
sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9";
};
}

10
pkgs/desktops/gnome-3/3.22/core/evince/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evince-3.22.1";
src = fetchurl {
url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz;
sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c";
};
}

10
pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-data-server-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz;
sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d";
};
}

41
pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
View File

@ -1,41 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "gdm-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
};
preConfigure = ''
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
'';
configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-initial-vt=10" ];
buildInputs = [ pkgconfig glib itstool libxml2 intltool
accountsservice gnome3.dconf systemd
gobjectIntrospection libX11 gtk
libcanberra_gtk3 pam libtool ];
#enableParallelBuilding = true; # problems compiling
# Disable Access Control because our X does not support FamilyServerInterpreted yet
patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GDM;
description = "A program that manages graphical display servers and handles graphical user logins";
platforms = platforms.linux;
maintainers = gnome3.maintainers;
};
}

15
pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch
View File

@ -1,15 +0,0 @@
--- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200
+++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200
@@ -1706,9 +1706,10 @@
gdm_error_trap_push ();
- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
XAddHost (self->priv->x11_display, &host_entries[i]);
- }
+ }*/
+ XDisableAccessControl(self->priv->x11_display);
XSync (self->priv->x11_display, False);
if (gdm_error_trap_pop ()) {

17
pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch
View File

@ -1,17 +0,0 @@
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index f759d2d..d154716 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -373,9 +373,12 @@ get_system_session_dirs (void)
#ifdef ENABLE_WAYLAND_SUPPORT
DATADIR "/wayland-sessions/",
#endif
+ NULL,
NULL
};
+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
+
return search_dirs;
}

83
pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch
View File

@ -1,83 +0,0 @@
--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200
+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200
@@ -322,7 +322,11 @@
fallback:
#endif
- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
+ if (g_getenv("GDM_X_SERVER") != NULL) {
+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
+ } else {
+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
+ }
}
static gboolean
--- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200
+++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200
@@ -207,6 +207,8 @@
char *display_fd_string = NULL;
char *vt_string = NULL;
char *display_number;
+ int nixos_argc = 0;
+ char **nixos_argv = NULL;
gsize display_number_size;
auth_file = prepare_auth_file ();
@@ -236,7 +238,15 @@
display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- g_ptr_array_add (arguments, X_SERVER);
+ if (g_getenv("GDM_X_SERVER") != NULL) {
+ int i = 0;
+ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
+ for (i = 0; i < nixos_argc; i++) {
+ g_ptr_array_add (arguments, nixos_argv[i]);
+ }
+ } else {
+ g_ptr_array_add (arguments, X_SERVER);
+ }
if (vt_string != NULL) {
g_ptr_array_add (arguments, vt_string);
@@ -259,12 +269,12 @@
g_ptr_array_add (arguments, "-noreset");
g_ptr_array_add (arguments, "-keeptty");
- g_ptr_array_add (arguments, "-verbose");
+ /*g_ptr_array_add (arguments, "-verbose");
if (state->debug_enabled) {
g_ptr_array_add (arguments, "7");
} else {
g_ptr_array_add (arguments, "3");
- }
+ }*/
if (state->debug_enabled) {
g_ptr_array_add (arguments, "-core");
@@ -275,6 +285,9 @@
(const char * const *) arguments->pdata,
&error);
g_free (display_fd_string);
+ if (nixos_argv) {
+ g_strfreev (nixos_argv);
+ }
g_clear_object (&launcher);
g_ptr_array_free (arguments, TRUE);
--- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200
+++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200
@@ -2359,6 +2359,12 @@
gchar *desktop_names;
const char *locale;
+ if (g_getenv ("GDM_X_SERVER") != NULL) {
+ gdm_session_set_environment_variable (self,
+ "GDM_X_SERVER",
+ g_getenv ("GDM_X_SERVER"));
+ }
+
gdm_session_set_environment_variable (self,
"GDMSESSION",
get_session_name (self));

13
pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
View File

@ -1,13 +0,0 @@
--- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200
+++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200
@@ -369,8 +369,9 @@
gdm_error_trap_push ();
for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
- XAddHost (slave->priv->server_display, &host_entries[i]);
+ //XAddHost (slave->priv->server_display, &host_entries[i]);
}
+ XDisableAccessControl(slave->priv->server_display);
XSync (slave->priv->server_display, False);
if (gdm_error_trap_pop ()) {

21
pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
View File

@ -1,21 +0,0 @@
https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
--- a/configure.ac 2016-05-27 11:10:44.589740789 +0200
+++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200
@@ -888,7 +888,7 @@
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login >= 186 libsystemd-daemon],
+ [libsystemd],
[have_systemd=yes], [have_systemd=no])
if test "x$with_systemd" = "xauto" ; then
@@ -912,7 +912,7 @@
AC_SUBST(SYSTEMD_LIBS)
PKG_CHECK_MODULES(JOURNALD,
- [libsystemd-journal],
+ [libsystemd],
[have_journald=yes], [have_journald=no])
if test "x$enable_systemd_journal" = "xauto" ; then

20
pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
View File

@ -1,20 +0,0 @@
--- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000
+++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000
@@ -48,8 +48,6 @@
#include "gdm-session-enum-types.h"
#include "gdm-launch-environment.h"
-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
-
extern char **environ;
#define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
@@ -512,7 +510,7 @@
gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
} else {
/* wrap it in dbus-launch */
- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
+ char *command = g_strdup (launch_environment->priv->command);
gdm_session_select_program (launch_environment->priv->session, command);
g_free (command);

21
pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
View File

@ -1,21 +0,0 @@
diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c
index b839fea..053d4ac 100644
--- a/daemon/gdm-session.c.orig
+++ b/daemon/gdm-session.c
@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self)
#ifdef ENABLE_WAYLAND_SUPPORT
DATADIR "/wayland-sessions/",
#endif
+ "/var/empty",
"/etc/X11/sessions/",
DMCONFDIR "/Sessions/",
DATADIR "/gdm/BuiltInSessions/",
DATADIR "/xsessions/",
NULL
};
+ if (getenv("GDM_SESSIONS_DIR") != NULL) {
+ search_dirs[1] = getenv("GDM_SESSIONS_DIR");
+ };
#ifdef ENABLE_WAYLAND_SUPPORT
if (self->priv->ignore_wayland) {

10
pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gdm-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz;
sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4";
};
}

17
pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
View File

@ -1,17 +0,0 @@
diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c
index 6357d34..5bef5c8 100644
--- a/daemon/gdm-server.c.orig
+++ b/daemon/gdm-server.c
@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server)
return;
fallback:
- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
+ if (g_getenv("GDM_X_SERVER") != NULL) {
+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
+ } else {
+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
+ }
}

10
pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "geocode-glib-3.20.1";
src = fetchurl {
url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;
sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";
};
}

11
pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
View File

@ -1,11 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: rec {
name = "gjs-${major}.4";
major = "1.47";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-backgrounds-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz;
sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-calculator-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz;
sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-control-center-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz;
sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-desktop-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz;
sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-dictionary-3.20.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;
sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-disk-utility-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz;
sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-font-viewer-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz;
sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-online-accounts-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz;
sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-online-miners-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz;
sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-session-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz;
sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-settings-daemon-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz;
sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-shell-extensions-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz;
sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-shell-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.0.tar.xz;
sha256 = "d8d22cc19e28641f2eac47e812065c209e4866b6e5f9d636647a0a8c96e5dca9";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-software-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.0.tar.xz;
sha256 = "22e30c84851b0768bd46dbb90de6d3308acdc2973d3ca4ee52a19cdb5a0182ba";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-system-monitor-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.0.tar.xz;
sha256 = "4339d36c2f7b702652ee03424a241f855992c583bb437d7083c61d8dcfe3fff8";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-terminal-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.0.tar.xz;
sha256 = "97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-user-docs-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz;
sha256 = "7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gsettings-desktop-schemas-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz;
sha256 = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1";
};
}

10
pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gtksourceview-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz;
sha256 = "70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5";
};
}

10
pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "libgweather-3.20.3";
src = fetchurl {
url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.3.tar.xz;
sha256 = "fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b";
};
}

10
pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "mutter-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/mutter/3.22/mutter-3.22.0.tar.xz;
sha256 = "a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3";
};
}

10
pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "nautilus-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/nautilus/3.22/nautilus-3.22.0.tar.xz;
sha256 = "7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816";
};
}

10
pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "sushi-3.21.91";
src = fetchurl {
url = mirror://gnome/sources/sushi/3.21/sushi-3.21.91.tar.xz;
sha256 = "db71c9ec3dd2dde6aed03b469253ce7d9f30c60ff50c2a8dc9f7776b70d15d55";
};
}

10
pkgs/desktops/gnome-3/3.22/core/totem/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "totem-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/totem/3.22/totem-3.22.0.tar.xz;
sha256 = "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea";
};
}

11
pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
View File

@ -1,11 +0,0 @@
fetchurl: rec {
major = "1.10";
minor = "0";
name = "tracker-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb";
};
}

11
pkgs/desktops/gnome-3/3.22/core/vte/src.nix
View File

@ -1,11 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: rec {
name = "vte-${major}.0";
major = "0.46";
src = fetchurl {
url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz";
sha256 = "5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7";
};
}

10
pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "zenity-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz;
sha256 = "1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466";
};
}

10
pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "devhelp-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz;
sha256 = "59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0";
};
}

10
pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-chess-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.0.tar.xz;
sha256 = "838040c120af08aaa8ef1a6a284e2de296b998b37e49adb9436a12b6a428154a";
};
}

10
pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-mines-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.0.tar.xz;
sha256 = "ee6df05b36fdff0376371887c1375e63d9e90655146a9a787db3c3aa2b74908a";
};
}

10
pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-nibbles-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.0.tar.xz;
sha256 = "9cbc0aa458af0a4c00fd1bd528c4c3fecaea713390e2cbee796b0a6930e0cb49";
};
}

10
pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-sudoku-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.0.tar.xz;
sha256 = "0f39a7afb864c6cffa1991cc5fda958e0eb03329eebe21ca2d965588cf5fa0d5";
};
}

10
pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "lightsoff-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.0.tar.xz;
sha256 = "0458e0ff99a10a99573db4d3e1ea5abde186056d8e32cf1f0bd76e25ff2c4fca";
};
}

10
pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "swell-foop-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.0.tar.xz;
sha256 = "e7bb6f4c7932a17c3f48e5b7df66f4e3953642e8126389531592a79fdf71e0a4";
};
}

10
pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gitg-3.23.90";
src = fetchurl {
url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz;
sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg";
};
}

12
pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
View File

@ -1,12 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: rec {
pname = "gnome-autoar";
version = "0.1";
name = "${pname}-${version}.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
sha256 = "f65cb810b562dc038ced739fbf59739fd5df1a8e848636e21f363ded9f349ac9";
};
}

10
pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-packagekit-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.0.tar.xz;
sha256 = "0b28d4928f9767a512723b49656266aaa2a7909d880e5e4238c0e3436ac4908c";
};
}

10
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-tweak-tool-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz;
sha256 = "3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb";
};
}

0
pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix → pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
View File

0
pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix → pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
View File

0
pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix → pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
View File

10
pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix Normal file
View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "bijiben-3.24.1";
src = fetchurl {
url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz;
sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741";
};
}

0
pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix → pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
View File

10
pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix Normal file
View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "cheese-3.24.0";
src = fetchurl {
url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz;
sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372";
};
}

11
pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix → pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
View File

@ -2,7 +2,8 @@
, 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}:
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap
, cmake}:
let
majVer = gnome3.version;
@ -24,7 +25,9 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
nss nspr libnotify procps highlight gnome3.libgweather
gnome3.gsettings_desktop_schemas
gnome3.libgnome_keyring gnome3.glib_networking openldap ];
gnome3.libgnome_keyring gnome3.glib_networking openldap
cmake
];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
@ -32,6 +35,10 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" "--with-openldap"];
cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF"
"-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF"
];
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;

10
pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix Normal file
View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-3.24.5";
src = fetchurl {
url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz;
sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189";
};
}

0
pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix → pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
View File

10
pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix Normal file
View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "file-roller-3.24.1";
src = fetchurl {
url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz;
sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a";
};
}

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