Merge commit '2858c41' into HEAD

Changed files
+2284 -1927
lib
nixos
doc
manual
release-notes
modules
services
misc
x11
display-managers
pkgs
applications
editors
misc
buku
sqlmap
networking
feedreaders
rawdog
office
build-support
cc-wrapper
expand-response-params
gcc-wrapper-old
desktops
gnome-3
3.22
apps
bijiben
cheese
evolution
file-roller
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
core
adwaita-icon-theme
baobab
eog
epiphany
evince
evolution-data-server
gdm
geocode-glib
gjs
gnome-backgrounds
gnome-bluetooth
gnome-calculator
gnome-control-center
gnome-desktop
gnome-dictionary
gnome-disk-utility
gnome-font-viewer
gnome-online-accounts
gnome-online-miners
gnome-session
gnome-settings-daemon
gnome-shell
gnome-shell-extensions
gnome-software
gnome-system-monitor
gnome-terminal
gnome-user-docs
gsettings-desktop-schemas
gtksourceview
libgweather
mutter
nautilus
sushi
totem
tracker
vte
zenity
devtools
devhelp
games
gnome-chess
gnome-mines
gnome-nibbles
gnome-sudoku
lightsoff
swell-foop
misc
gitg
gnome-autoar
gnome-packagekit
gnome-tweak-tool
3.24
apps
accerciser
bijiben
cheese
evolution
file-roller
gedit
ghex
glade
gnome-boxes
gnome-calendar
gnome-characters
gnome-clocks
gnome-documents
gnome-getting-started-docs
gnome-logs
gnome-maps
gnome-music
gnome-nettool
gnome-photos
gnome-weather
nautilus-sendto
polari
seahorse
vinagre
core
adwaita-icon-theme
baobab
caribou
dconf
dconf-editor
empathy
eog
epiphany
evince
evolution-data-server
folks
gconf
gcr
gdm
geocode-glib
gjs
gnome-backgrounds
gnome-bluetooth
gnome-calculator
gnome-common
gnome-contacts
gnome-control-center
gnome-desktop
gnome-dictionary
gnome-disk-utility
gnome-font-viewer
gnome-keyring
gnome-menus
gnome-online-accounts
gnome-online-miners
gnome-screenshot
gnome-session
gnome-settings-daemon
gnome-shell
gnome-shell-extensions
gnome-software
gnome-system-log
gnome-system-monitor
gnome-terminal
gnome-themes-standard
gnome-user-docs
gnome-user-share
grilo
grilo-plugins
gsettings-desktop-schemas
gsound
gtksourceview
gtksourceviewmm
gucharmap
libcroco
libgdata
libgee
libgepub
libgnome-keyring
libgnomekbd
libgweather
libgxps
libpeas
libzapojit
mutter
nautilus
rest
sushi
totem
totem-pl-parser
tracker
vino
vte
yelp
yelp-tools
yelp-xsl
zenity
desktop
rarian
devtools
games
aisleriot
five-or-more
four-in-a-row
gnome-chess
gnome-klotski
gnome-mahjongg
gnome-mines
gnome-nibbles
gnome-robots
gnome-sudoku
gnome-taquin
gnome-tetravex
hitori
iagno
lightsoff
quadrapassel
swell-foop
tali
misc
extensions
chrome-gnome-shell
dash-to-dock
mate
mate-themes
development
compilers
interpreters
libraries
appstream-glib
babl
clutter
clutter-gst
expat
gegl
geoclue
glib
gobject-introspection
libarchive
libchamplain
libdrm
mesa
ncurses
pango
qjson
python-modules
Cython
Flask-PyMongo
aafigure
adal
aiodns
alembic
argcomplete
asgi_ipc
astropy
async_timeout
audioread
autobahn
bottleneck
breathe
certifi
chai
confluent-kafka
coveralls
discordpy
django-polymorphic
django_compressor
djangorestframework
emcee
flake8
flask-migrate
fonttools
ftfy
gensim
html5-parser
ipywidgets
jsonpatch
keras
keystoneauth1
kitchen
ledgerblue
libtmux
llvmlite
m2r
magic-wormhole
marionette-harness
multidict
natsort
nbformat
numba
odfpy
oslo-config
pbr
plotly
py
pygobject
pygraphviz
pylast
pyopencl
pypandoc
pyroute2
pyrtlsdr
pyscard
pytest
pytest-asyncio
pytest-django
pytest-forked
pytest-xdist
python-editor
qtconsole
relatorio
rfc3986
semver
setuptools
setuptools_scm
simplejson
sphinx
sphinxcontrib-websupport
sqlalchemy
sqlmap
stevedore
stripe
tqdm
treq
txaio
vega
virtualenv
websockets
widgetsnbextension
xlwt
yamllint
yapf
yarl
zeep
tools
analysis
valgrind
misc
binutils
mypy
misc
themes
e17gtk
os-specific
darwin
apple-source-releases
ICU
Libc
Libsystem
adv_cmds
bootstrap_cmds
bsdmake
configd
cctools
linux
kernel-headers
stdenv
tools
inputmethods
misc
bepasty
colord
rmlint
networking
curl
tcpdump
unbound
text
top-level
+1 -1
lib/systems/doubles.nix
···
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;
+1 -3
lib/systems/inspect.nix
···
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; }; };
···
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:
+1 -1
lib/systems/parse.nix
···
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
···
<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
or group is revived, this allows it to be allocated the UID/GID it had before.
A consequence is that UIDs and GIDs are no longer reused.
+1 -1
nixos/modules/services/misc/bepasty.nix
···
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;
+17 -2
nixos/modules/services/x11/display-managers/gdm.nix
···
(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 ];
+9 -19
pkgs/applications/editors/ed/default.nix
···
-
{ 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:
···
*/
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}"
+2 -2
pkgs/applications/misc/buku/default.nix
···
-
{ 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
···
-
{ 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 ];
-
};
-
}
+4 -4
pkgs/applications/networking/feedreaders/rawdog/default.nix
···
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 ];
···
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;
+1 -1
pkgs/applications/office/fava/default.nix
···
sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
};
-
buildInputs = with python3Packages; [ pytest_30 ];
+
checkInputs = with python3Packages; [ pytest ];
checkPhase = ''
# pyexcel is optional
+142 -115
pkgs/build-support/cc-wrapper/default.nix
···
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"
···
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
···
'';
};
-
buildCommand =
+
dontBuild = true;
+
dontConfigure = true;
+
+
unpackPhase = ''
+
src=$PWD
+
'';
+
+
installPhase =
''
+
set -u
+
mkdir -p $out/bin $out/nix-support $man/nix-support
wrap() {
···
}
''
-
+ 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
-
'')
+
+ (if nativeTools then ''
+
echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
-
+ 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 ''
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 != "") ''
···
+ 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
···
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;
pkgs/build-support/cc-wrapper/expand-response-params.c pkgs/build-support/expand-response-params/expand-response-params.c
+1 -1
pkgs/build-support/cc-wrapper/ld-wrapper.sh
···
# 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
+1 -1
pkgs/build-support/cc-wrapper/utils.sh
···
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
···
+
{ 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/
+
'';
+
}
+1 -1
pkgs/build-support/gcc-wrapper-old/default.nix
···
(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
pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
···
-
# 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";
-
};
-
}
+9 -2
pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
···
, 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;
···
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 ];
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";
-10
pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
pkgs/desktops/gnome-3/3.22/apps/glade/default.nix pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
pkgs/desktops/gnome-3/3.22/apps/glade/src.nix pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
···
-
# 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";
-
};
-
}
+1 -1
pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
···
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-
librsvg gnome3.defaultIconTheme
+
librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
];
meta = with stdenv.lib; {
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
···
-
# 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";
-
};
-
}
+1 -1
pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
···
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-
systemd gnome3.defaultIconTheme
+
systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
];
meta = with stdenv.lib; {
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
···
-
# 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";
-
};
-
}
+11 -3
pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
···
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-
, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
+
, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
, webkitgtk }:
···
buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
gnome3.geocode_glib libchamplain file libsoup
-
gdk_pixbuf librsvg autoreconfHook
+
gdk_pixbuf librsvg libgweather autoreconfHook
gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
gnome3.gnome_online_accounts gnome3.defaultIconTheme
webkitgtk ];
-
patches = [ ./soup.patch ];
+
# The .service file isn't wrapped with the correct environment
+
# so misses GIR files when started. By re-pointing from the gjs
+
# entry point to the wrapped binary we get back to a wrapped
+
# binary.
+
preConfigure = ''
+
substituteInPlace "data/org.gnome.Maps.service.in" \
+
--replace "Exec=@pkgdatadir@/org.gnome.Maps" \
+
"Exec=$out/bin/gnome-maps"
+
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Maps;
-12
pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
···
-
--- 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
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
+2 -2
pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
···
, pkgconfig, gtk3, glib
, makeWrapper, itstool, gegl, babl, lcms2
, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-
, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:
+
, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
gnome3.gnome_online_accounts gnome3.gnome_desktop
lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-
wrapGAppsHook gexiv2 ];
+
wrapGAppsHook gexiv2 geocode_glib ];
enableParallelBuilding = true;
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
···
-
# 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";
-
};
-
}
-19
pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-
, libgweather, intltool, itstool, geoclue2 }:
-
-
stdenv.mkDerivation rec {
-
inherit (import ./src.nix fetchurl) name src;
-
-
buildInputs = [
-
pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
-
libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
-
];
-
-
meta = with stdenv.lib; {
-
homepage = https://wiki.gnome.org/Apps/Weather;
-
description = "Access current weather conditions and forecasts";
-
maintainers = gnome3.maintainers;
-
license = licenses.gpl2;
-
platforms = platforms.linux;
-
};
-
}
-10
pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
+2 -2
pkgs/desktops/gnome-3/3.22/apps/polari/default.nix pkgs/desktops/gnome-3/3.24/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
-
, gnome3, wrapGAppsHook, telepathy_logger }:
+
, gnome3, wrapGAppsHook, telepathy_logger, gspell }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
-
telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
+
telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
enableParallelBuilding = true;
-10
pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/baobab/default.nix pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
···
-
# 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";
-
};
-
}
+1
pkgs/desktops/gnome-3/3.22/core/caribou/default.nix pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
···
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
buildInputs = with gnome3;
[ glib gtk clutter at_spi2_core dbus pythonPackages.python
pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
pkgs/desktops/gnome-3/3.22/core/dconf/default.nix pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
pkgs/desktops/gnome-3/3.22/core/empathy/default.nix pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
pkgs/desktops/gnome-3/3.22/core/eog/default.nix pkgs/desktops/gnome-3/3.24/core/eog/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/eog/src.nix
···
-
# 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";
-
};
-
}
+2 -2
pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
···
, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
, 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 }:
+
, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
gnome3.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];
+
gst_all_1.gst-libav json_glib ];
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
-10
pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
···
-
# 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";
-
};
-
}
-7
pkgs/desktops/gnome-3/3.22/core/evince/default.nix pkgs/desktops/gnome-3/3.24/core/evince/default.nix
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
patches = [
-
(fetchpatch {
-
name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630
-
url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96";
-
sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy";
-
})
-
];
# missing help for now; fixing the autogen phase seemed too difficult
postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am";
-10
pkgs/desktops/gnome-3/3.22/core/evince/src.nix
···
-
# 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 -5
pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix pkgs/desktops/gnome-3/3.24/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 }:
+
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,
+
vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
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 ]
+
[ 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;
propagatedBuildInputs = [ libsecret nss nspr libical db ];
# uoa irrelevant for now
-
configureFlags = [ "--disable-uoa" "--disable-google-auth" ]
-
++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+
cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ]
+
++ stdenv.lib.optionals valaSupport [
+
"-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"
+
"-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
enableParallelBuilding = true;
-10
pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/folks/default.nix pkgs/desktops/gnome-3/3.24/core/folks/default.nix
pkgs/desktops/gnome-3/3.22/core/gconf/default.nix pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
pkgs/desktops/gnome-3/3.22/core/gcr/default.nix pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
pkgs/desktops/gnome-3/3.22/core/gcr/src.nix pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
-41
pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
···
-
{ 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
···
-
--- 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
···
-
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
···
-
--- 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));
+4 -6
pkgs/desktops/gnome-3/3.22/core/gdm/default.nix pkgs/desktops/gnome-3/3.24/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 }:
+
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth
+
, librsvg }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
accountsservice gnome3.dconf systemd
gobjectIntrospection libX11 gtk
-
libcanberra_gtk3 pam libtool plymouth ];
+
libcanberra_gtk3 pam libtool plymouth librsvg ];
enableParallelBuilding = true;
# Disable Access Control because our X does not support FamilyServerInterpreted yet
-
patches = [ ./xserver_path.patch
-
./sessions_dir.patch
+
patches = [ ./sessions_dir.patch
./gdm-x-session_extra_args.patch
./gdm-session-worker_xserver-path.patch
-
# ./disable_x_access_control.patch ./no-dbus-launch.patch
-
# ./libsystemd.patch
];
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
-13
pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
···
-
--- 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 ()) {
pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
-21
pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
···
-
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
···
-
--- 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
···
-
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
···
-
# 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
···
-
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);
-
+ }
-
-
}
-
pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
···
-
# 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";
-
};
-
}
+7 -2
pkgs/desktops/gnome-3/3.22/core/gjs/default.nix pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
···
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-
, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
+
, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
-
propagatedBuildInputs = [ spidermonkey_31 ];
+
propagatedBuildInputs = [ spidermonkey_38 ];
+
+
# GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
+
preConfigure = ''
+
sed -i s/mozjs-38/js/ configure
+
'';
postInstall = ''
sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
-11
pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
···
-
# Autogenerated by maintainers/scripts/gnome.sh update
-
-
fetchurl: {
-
name = "gnome-bluetooth-3.20.0";
-
-
src = fetchurl {
-
url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;
-
sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";
-
};
-
}
+2 -2
pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
···
{ stdenv, intltool, fetchurl, pkgconfig, libxml2
, bash, gtk3, glib, wrapGAppsHook
-
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
+
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
buildInputs = [ bash gtk3 glib intltool itstool
libxml2 gnome3.gtksourceview mpfr gmp
gdk_pixbuf gnome3.defaultIconTheme librsvg
-
gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
+
gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
-10
pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
+4 -2
pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
···
{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-
, libxslt, intltool, makeWrapper, systemd, xorg }:
+
, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
buildInputs = with gnome3;
[ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd
+
epoxy
+
];
# FIXME: glib binaries shouldn't be in .dev!
preFixup = ''
-10
pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
···
-
# 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";
-
};
-
}
+14 -5
pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
···
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, 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
+
, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2
, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
# 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
let
pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+
in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
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 librsvg
+
libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf
+
(librsvg.override { enableIntrospection = true; })
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
libical libtool nss gtk gstreamer makeWrapper gdm
-
libcanberra_gtk3 gnome_control_center
+
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
-
pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ];
+
gobjectIntrospection (stdenv.lib.getLib dconf) ];
installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
preBuild = ''
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"
'';
+
preFixup = with gnome3; ''
wrapProgram "$out/bin/gnome-shell" \
--prefix PATH : "${unzip}/bin" \
···
--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" \
-10
pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
···
-
# 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";
-
};
-
}
+2 -2
pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
···
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
-
, json_glib, libsecret }:
+
, json_glib, libsecret, valgrind-light }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
gtkspell3 json_glib libsecret
-
polkit attr acl libyaml ];
+
polkit attr acl libyaml valgrind-light ];
propagatedBuildInputs = [ isocodes ];
postInstall = ''
-10
pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
+5 -2
pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
···
{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
, bash, gtk3, glib, wrapGAppsHook
-
, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+
, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
···
buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
gtkmm3 libgtop wrapGAppsHook
gdk_pixbuf gnome3.defaultIconTheme librsvg
-
gnome3.gsettings_desktop_schemas ];
+
gnome3.gsettings_desktop_schemas systemd ];
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share"
)
'';
+
+
# fails to build without --enable-static
+
configureFlags = ["--enable-systemd" "--enable-static"];
enableParallelBuilding = true;
-10
pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
+2 -2
pkgs/desktops/gnome-3/3.22/core/grilo/default.nix pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
···
stdenv.mkDerivation rec {
major = "0.3"; # if you change this, also change ./setup-hook.sh
-
minor = "2";
+
minor = "3";
name = "grilo-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-
sha256 = "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b";
+
sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
};
setupHook = ./setup-hook.sh;
pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gsound/default.nix pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
-10
pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
pkgs/desktops/gnome-3/3.22/core/libgee/default.nix pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
-2
pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
nativeBuildInputs = [ pkgconfig intltool ];
-10
pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
+8 -2
pkgs/desktops/gnome-3/3.22/core/mutter/default.nix pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
···
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
-
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput
+
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
, libgudev, xwayland }:
stdenv.mkDerivation rec {
···
configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
+
propagatedBuildInputs = [
+
# required for pkgconfig to detect mutter-clutter
+
libXtst
+
];
+
buildInputs = with gnome3;
[ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
gnome3.geocode_glib libudev libinput libgudev
-
libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+
libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
+
libxkbcommon ];
preFixup = ''
wrapProgram "$out/bin/mutter" \
pkgs/desktops/gnome-3/3.22/core/mutter/math.patch pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
-10
pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
-10
pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/rest/default.nix pkgs/desktops/gnome-3/3.24/core/rest/default.nix
pkgs/desktops/gnome-3/3.22/core/sushi/default.nix pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
-1
pkgs/desktops/gnome-3/3.22/core/totem/default.nix pkgs/desktops/gnome-3/3.24/core/totem/default.nix
···
configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
-
wrapPrefixVariables = [ "PYTHONPATH" ];
meta = with stdenv.lib; {
-10
pkgs/desktops/gnome-3/3.22/core/totem/src.nix
···
-
# 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";
-
};
-
}
+5 -2
pkgs/desktops/gnome-3/3.22/core/tracker/default.nix pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
···
, evolution_data_server, gst_all_1, poppler
, icu, taglib, libjpeg, libtiff, giflib, libcue
, libvorbis, flac, exempi, networkmanager
-
, libpng, libexif, libgsf, libuuid, bzip2 }:
+
, libpng, libexif, libgsf, libuuid, bzip2
+
, libsoup, json_glib, libseccomp }:
stdenv.mkDerivation rec {
···
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 ];
+
exempi networkmanager libpng libexif libgsf libuuid
+
libsoup json_glib libseccomp
+
];
preConfigure = ''
substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
-11
pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
···
-
fetchurl: rec {
-
major = "1.10";
-
minor = "0";
-
name = "tracker-${major}.${minor}";
-
-
src = fetchurl {
-
url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
-
sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb";
-
};
-
-
}
pkgs/desktops/gnome-3/3.22/core/vino/default.nix pkgs/desktops/gnome-3/3.24/core/vino/default.nix
pkgs/desktops/gnome-3/3.22/core/vino/src.nix pkgs/desktops/gnome-3/3.24/core/vino/src.nix
pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
+1 -1
pkgs/desktops/gnome-3/3.22/core/vte/default.nix pkgs/desktops/gnome-3/3.24/core/vte/default.nix
···
inherit (import ./src.nix fetchurl) name src;
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
-
gnome3.gtk3 ncurses vala_0_32 libxml2 ];
+
gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
propagatedBuildInputs = [ gnutls pcre2 ];
pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
pkgs/desktops/gnome-3/3.22/core/vte/ng.nix pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
-11
pkgs/desktops/gnome-3/3.22/core/vte/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
pkgs/desktops/gnome-3/3.22/core/yelp/default.nix pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
pkgs/desktops/gnome-3/3.22/core/yelp/src.nix pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
pkgs/desktops/gnome-3/3.22/core/zenity/default.nix pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
-10
pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
···
-
# 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";
-
};
-
}
+2 -5
pkgs/desktops/gnome-3/3.22/default.nix pkgs/desktops/gnome-3/3.24/default.nix
···
callPackage = pkgs.newScope self;
-
version = "3.22";
+
version = "3.24";
maintainers = with pkgs.lib.maintainers; [ lethalman ];
corePackages = with gnome3; [
···
accerciser = callPackage ./apps/accerciser { };
-
bijiben = callPackage ./apps/bijiben {
-
# https://bugzilla.gnome.org/show_bug.cgi?id=728293
-
webkitgtk = pkgs.webkitgtk24x-gtk3;
-
};
+
bijiben = callPackage ./apps/bijiben { };
cheese = callPackage ./apps/cheese { };
pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
-10
pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
-10
pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
-10
pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
-10
pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
-10
pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
pkgs/desktops/gnome-3/3.22/games/hitori/default.nix pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
pkgs/desktops/gnome-3/3.22/games/hitori/src.nix pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
pkgs/desktops/gnome-3/3.22/games/iagno/default.nix pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
pkgs/desktops/gnome-3/3.22/games/iagno/src.nix pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
-10
pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
-10
pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/games/tali/default.nix pkgs/desktops/gnome-3/3.24/games/tali/default.nix
pkgs/desktops/gnome-3/3.22/games/tali/src.nix pkgs/desktops/gnome-3/3.24/games/tali/src.nix
pkgs/desktops/gnome-3/3.22/installer.nix pkgs/desktops/gnome-3/3.24/installer.nix
pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
pkgs/desktops/gnome-3/3.22/misc/california/default.nix pkgs/desktops/gnome-3/3.24/misc/california/default.nix
pkgs/desktops/gnome-3/3.22/misc/geary/default.nix pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
-10
pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
-12
pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
-10
pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
···
-
# 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";
-
};
-
}
+25 -22
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
···
-
From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
+
From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
-
Date: Sat, 1 Aug 2015 21:01:11 +0200
+
Date: Sun, 25 Jun 2017 11:32:30 +0100
Subject: [PATCH 1/3] Search for themes and icons in system data dirs
---
···
gtweak/utils.py | 17 +++++++++++++++++
3 files changed, 23 insertions(+), 18 deletions(-)
-
Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-
===================================================================
-
--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-
+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+
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
@@ -26,7 +26,7 @@ from gi.repository import Gtk
from gi.repository import GLib
···
from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
from gtweak.gshellwrapper import GnomeShellFactory
from gtweak.gsettings import GSettingsSetting
-
@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+
@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
if gtk_ver % 2: # Want even number
gtk_ver += 1
···
os.path.exists(os.path.join(d, "gtk-2.0")) and \
(os.path.exists(os.path.join(d, "gtk-3.0")) or \
os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
-
@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw
+
@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
**options)
def _get_valid_icon_themes(self):
···
os.path.isdir(d) and \
os.path.exists(os.path.join(d, "index.theme")))
return valid
-
@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo
+
@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
**options)
def _get_valid_cursor_themes(self):
···
os.path.isdir(d) and \
os.path.exists(os.path.join(d, "cursors")))
return valid
-
Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-
===================================================================
-
--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-
+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-
@@ -20,7 +20,7 @@ import os.path
-
from gi.repository import GLib
+
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
-
class PrimaryPasteTweak(GetterSetterSwitchTweak):
-
@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+
_shell = GnomeShellFactory().get_shell()
+
@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
**options)
def _get_valid_key_themes(self):
···
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
-
Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-
===================================================================
-
--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-
+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+
diff --git a/gtweak/utils.py b/gtweak/utils.py
+
index 39f8833..b0993b6 100644
+
--- a/gtweak/utils.py
+
+++ b/gtweak/utils.py
@@ -21,6 +21,7 @@ import tempfile
import shutil
import subprocess
···
import gtweak
from gtweak.gsettings import GSettingsSetting
-
@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl
+
@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
stdout, stderr = p.communicate()
return stdout, stderr, p.returncode
···
@singleton
class AutostartManager:
+
--
+
2.12.2
+
+24 -21
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
···
-
From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
+
From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
-
Date: Sat, 1 Aug 2015 21:26:57 +0200
+
Date: Sun, 25 Jun 2017 11:35:10 +0100
Subject: [PATCH 2/3] Don't show multiple entries for a single theme
---
···
gtweak/utils.py | 16 ++++++++++++++++
3 files changed, 22 insertions(+), 6 deletions(-)
-
Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-
===================================================================
-
--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-
+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+
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
@@ -26,7 +26,7 @@ from gi.repository import Gtk
from gi.repository import GLib
···
from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
from gtweak.gshellwrapper import GnomeShellFactory
from gtweak.gsettings import GSettingsSetting
-
@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+
@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
os.path.exists(os.path.join(d, "gtk-2.0")) and \
(os.path.exists(os.path.join(d, "gtk-3.0")) or \
os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
···
class IconThemeSwitcher(GSettingsComboTweak):
def __init__(self, **options):
-
@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
+
@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
valid = walk_directories(get_resource_dirs("icons"), lambda d:
os.path.isdir(d) and \
os.path.exists(os.path.join(d, "index.theme")))
···
class CursorThemeSwitcher(GSettingsComboTweak):
def __init__(self, **options):
-
@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
+
@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
valid = walk_directories(get_resource_dirs("icons"), lambda d:
os.path.isdir(d) and \
os.path.exists(os.path.join(d, "cursors")))
···
class ShellThemeTweak(Gtk.Box, Tweak):
-
Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-
===================================================================
-
--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-
+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-
@@ -20,7 +20,7 @@ import os.path
-
from gi.repository import GLib
+
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
-
class PrimaryPasteTweak(GetterSetterSwitchTweak):
-
@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+
_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")))
···
TWEAK_GROUPS = [
ListBoxTweakGroup(_("Keyboard and Mouse"),
-
Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-
===================================================================
-
--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-
+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+
diff --git a/gtweak/utils.py b/gtweak/utils.py
+
index b0993b6..0d995bc 100644
+
--- a/gtweak/utils.py
+
+++ b/gtweak/utils.py
@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
return [dir for dir in dirs if os.path.isdir(dir)]
···
@singleton
class AutostartManager:
+
--
+
2.12.2
+
+5 -7
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
···
-
From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
+
From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
-
Date: Sun, 2 Aug 2015 12:01:20 +0200
+
Date: Sun, 25 Jun 2017 11:50:33 +0100
Subject: [PATCH 3/3] Create config dir if it doesn't exist
-
Otherwise gnome-tweak-tool can't enable the dark theme and fails
-
without a clear error message.
---
gtweak/gtksettings.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-
index bcec9f1..f39991b 100644
+
index a0c163b..f5883ec 100644
--- a/gtweak/gtksettings.py
+++ b/gtweak/gtksettings.py
-
@@ -35,6 +35,10 @@ class GtkSettingsManager:
+
@@ -36,6 +36,10 @@ class GtkSettingsManager:
def _get_keyfile(self):
keyfile = None
try:
···
keyfile.load_from_file(self._path, 0)
except MemoryError:
--
-
2.7.0
+
2.12.2
+10 -11
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
···
{ stdenv, intltool, fetchurl, atk
, pkgconfig, gtk3, glib, libsoup
-
, bash, makeWrapper, itstool, libxml2, python2Packages
+
, bash, itstool, libxml2, python2Packages
, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
-
let
-
pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
-
in stdenv.mkDerivation rec {
+
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
···
makeFlags = [ "DESTDIR=/" ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-
gnome3.gsettings_desktop_schemas makeWrapper file
+
gnome3.gsettings_desktop_schemas file
gdk_pixbuf gnome3.defaultIconTheme librsvg
-
libnotify gnome3.gnome_shell
+
libnotify gnome3.gnome_shell python2Packages.pygobject3
libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-
gnome3.gnome_desktop wrapGAppsHook
-
python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
-
-
PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
+
gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection
+
];
-
wrapPrefixVariables = [ "PYTHONPATH" ];
+
preFixup = ''
+
gappsWrapperArgs+=(
+
--prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH")
+
'';
patches = [
./find_gsettings.patch
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
-10
pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
···
-
# 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";
-
};
-
}
pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
+4 -6
pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
···
-
{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
+
{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala_0_32, glib, gjs, mutter
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
stdenv.mkDerivation rec {
-
version = "3.20.4";
+
version = "3.24.2";
name = "gpaste-${version}";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-
sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
+
sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340";
};
-
buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
+
buildInputs = [ autoreconfHook pkgconfig vala_0_32 glib gjs mutter
gtk3 gnome3.gnome_control_center dbus
clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
-
-
preConfigure = "intltoolize -f";
configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
"--with-dbusservicesdir=$(out)/share/dbus-1/services"
+3 -1
pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ];
+
propagatedBuildInputs = [ enchant ]; # required for pkgconfig
+
+
buildInputs = [ pkgconfig glib gtk3 isocodes vala ];
meta = with stdenv.lib; {
platforms = platforms.linux;
+2 -2
pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
···
fetchurl: rec {
-
major = "1.2";
+
major = "1.4";
minor = "1";
name = "gspell-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
-
sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z";
+
sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4";
};
}
pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
+2 -2
pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
···
majorVersion = "1.9";
in
stdenv.mkDerivation rec {
-
name = "libmediaart-${majorVersion}.0";
+
name = "libmediaart-${majorVersion}.1";
src = fetchurl {
url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-
sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+
sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v";
};
buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
+10
pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
···
+
# 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";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
···
+
# 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";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
···
+
# 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";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
···
+
# 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";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-boxes-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz;
+
sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-calendar-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz;
+
sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-characters-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz;
+
sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-clocks-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz;
+
sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-documents-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz;
+
sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-getting-started-docs-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz;
+
sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-logs-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz;
+
sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-maps-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz;
+
sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-music-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz;
+
sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-photos-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz;
+
sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288";
+
};
+
}
+29
pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
···
+
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
+
, libgweather, intltool, itstool, geoclue2 }:
+
+
stdenv.mkDerivation rec {
+
inherit (import ./src.nix fetchurl) name src;
+
+
buildInputs = [
+
pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
+
libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
+
];
+
+
# The .service file isn't wrapped with the correct environment
+
# so misses GIR files when started. By re-pointing from the gjs
+
# entry point to the wrapped binary we get back to a wrapped
+
# binary.
+
preConfigure = ''
+
substituteInPlace "data/org.gnome.Weather.Application.service.in" \
+
--replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \
+
"Exec=$out/bin/gnome-weather"
+
'';
+
+
meta = with stdenv.lib; {
+
homepage = https://wiki.gnome.org/Apps/Weather;
+
description = "Access current weather conditions and forecasts";
+
maintainers = gnome3.maintainers;
+
license = licenses.gpl2;
+
platforms = platforms.linux;
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-weather-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz;
+
sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "polari-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz;
+
sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "adwaita-icon-theme-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz;
+
sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "baobab-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz;
+
sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/eog/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "eog-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz;
+
sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "epiphany-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz;
+
sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/evince/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "evince-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz;
+
sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "evolution-data-server-3.24.5";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz;
+
sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1";
+
};
+
}
+23
pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
···
+
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+
index ff3a1acb..b8705d8f 100644
+
--- a/daemon/gdm-session.c
+
+++ b/daemon/gdm-session.c
+
@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self)
+
char **search_dirs;
+
+
static const char *x_search_dirs[] = {
+
+ "/var/empty",
+
"/etc/X11/sessions/",
+
DMCONFDIR "/Sessions/",
+
DATADIR "/gdm/BuiltInSessions/",
+
@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self)
+
NULL
+
};
+
+
+ if (getenv("GDM_SESSIONS_DIR") != NULL) {
+
+ x_search_dirs[0] = getenv("GDM_SESSIONS_DIR");
+
+ };
+
+
+
static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
+
+
search_array = g_array_new (TRUE, TRUE, sizeof (char *));
+10
pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gdm-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz;
+
sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "geocode-glib-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz;
+
sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gjs-1.48.6";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
+
sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-backgrounds-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz;
+
sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-bluetooth-3.20.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz;
+
sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-calculator-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz;
+
sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-control-center-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz;
+
sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-desktop-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz;
+
sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-dictionary-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz;
+
sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-disk-utility-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
+
sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-font-viewer-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz;
+
sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-online-accounts-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz;
+
sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-online-miners-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz;
+
sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-session-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz;
+
sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-settings-daemon-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz;
+
sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-shell-extensions-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz;
+
sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-shell-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz;
+
sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-software-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz;
+
sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-system-monitor-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz;
+
sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-terminal-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz;
+
sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-user-docs-3.24.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz;
+
sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gsettings-desktop-schemas-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz;
+
sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gtksourceview-3.24.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz;
+
sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "libgweather-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz;
+
sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "mutter-3.24.4";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz;
+
sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "nautilus-3.24.2.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz;
+
sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "sushi-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz;
+
sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/totem/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "totem-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz;
+
sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "tracker-1.12.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz;
+
sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/vte/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "vte-0.48.3";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
+
sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "zenity-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz;
+
sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "devhelp-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz;
+
sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-chess-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz;
+
sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-mines-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz;
+
sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-nibbles-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz;
+
sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-sudoku-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz;
+
sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "lightsoff-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz;
+
sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "swell-foop-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz;
+
sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gitg-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
+
sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-autoar-0.2.2";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz;
+
sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-packagekit-3.24.0";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz;
+
sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f";
+
};
+
}
+10
pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
···
+
# Autogenerated by maintainers/scripts/gnome.sh update
+
+
fetchurl: {
+
name = "gnome-tweak-tool-3.24.1";
+
+
src = fetchurl {
+
url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz;
+
sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565";
+
};
+
}
+8 -8
pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
···
rev = "7d99523e90805cb65027cc2f5f1191a957dcf276";
sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc";
};
-
+
buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection
python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook];
preConfigure = ''
-
mkdir build usr etc
-
cd build
-
${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
-
substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"
+
mkdir build usr etc
+
cd build
+
${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
+
substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"
'';
postInstall = ''
rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json
rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json
wrapProgram $out/usr/bin/chrome-gnome-shell \
-
--prefix PATH '"${dbus}/bin/dbus:$PATH"' \
-
--prefix PATH '"${gnome3.gnome_shell}:$PATH"' \
-
--prefix PYTHONPATH : "$PYTHONPATH"
+
--prefix PATH : '"${dbus}/bin"' \
+
--prefix PATH : '"${gnome3.gnome_shell}/bin"' \
+
--prefix PYTHONPATH : "$PYTHONPATH"
'';
+3 -3
pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
···
stdenv.mkDerivation rec {
name = "gnome-shell-dash-to-dock-${version}";
-
version = "v57";
+
version = "v60";
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
-
rev = "97f6a0bb95b9f87d7a34a074c9b3624b65111794";
-
sha256 = "0b9i89hpn9k63zcrbl4bhs7qfb70wh09870fwv2ik7hajm64kynn";
+
rev = "extensions.gnome.org-" + version;
+
sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3";
};
nativeBuildInputs = [
+2 -1
pkgs/desktops/mate/mate-themes/default.nix
···
stdenv.mkDerivation rec {
name = "mate-themes-${version}";
version = "${major-ver}.${minor-ver}";
-
major-ver = gnome3.version;
+
# There is no 3.24 release.
+
major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22";
minor-ver = {
"3.20" = "22";
"3.22" = "13";
+7 -2
pkgs/development/compilers/gcc/4.5/default.nix
···
crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
crossConfigureFlags =
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
++ (optionals langVhdl [gnat])
;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
···
${if langAda then " --enable-libada" else ""}
${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
-
--target=${targetPlatform.config}
'';
};
+7 -2
pkgs/development/compilers/gcc/4.8/default.nix
···
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
dontDisableStatic = true;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if hostPlatform.isSunOS then
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
···
)
}
${if langAda then " --enable-libada" else ""}
-
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
+7 -2
pkgs/development/compilers/gcc/4.9/default.nix
···
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
dontDisableStatic = true;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if hostPlatform.isSunOS then
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
···
)
}
${if langAda then " --enable-libada" else ""}
-
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
+7 -4
pkgs/development/compilers/gcc/5/default.nix
···
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
dontDisableStatic = true;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if hostPlatform.isSunOS then
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
···
)
}
${if langAda then " --enable-libada" else ""}
-
--build=${buildPlatform.config}
-
--host=${hostPlatform.config}
-
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
+7 -2
pkgs/development/compilers/gcc/6/default.nix
···
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
dontDisableStatic = true;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if hostPlatform.isSunOS then
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
···
)
}
${if langAda then " --enable-libada" else ""}
-
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
+7 -2
pkgs/development/compilers/gcc/7/default.nix
···
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
dontDisableStatic = true;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if hostPlatform.isSunOS then
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
···
)
}
${if langAda then " --enable-libada" else ""}
-
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
+7 -2
pkgs/development/compilers/gcc/snapshot/default.nix
···
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in
-
"--target=${targetPlatform.config}" +
withArch +
withCpu +
withAbi +
···
dontDisableStatic = true;
+
# TODO(@Ericson2314): Always pass "--target" and always prefix.
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags = "
${if hostPlatform.isSunOS then
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
···
)
}
${if langAda then " --enable-libada" else ""}
-
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
+4 -4
pkgs/development/interpreters/perl/default.nix
···
perl = perl524;
perl522 = common {
-
version = "5.22.3";
-
sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
+
version = "5.22.4";
+
sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
};
perl524 = common {
-
version = "5.24.1";
-
sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6";
+
version = "5.24.2";
+
sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0";
};
}
+2 -1
pkgs/development/interpreters/python/cpython/2.7/default.nix
···
# needed for some packages, especially packages that backport
# functionality to 2.x from 3.x
for item in $out/lib/python${majorVersion}/test/*; do
-
if [[ "$item" != */test_support.py* ]]; then
+
if [[ "$item" != */test_support.py*
+
&& "$item" != */regrtest.py* ]]; then
rm -rf "$item"
else
echo $item
+8 -1
pkgs/development/interpreters/python/cpython/3.4/default.nix
···
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
'';
+
patches = [
+
./no-ldconfig.patch
+
];
+
postPatch = ''
# Determinism
substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
···
# needed for some packages, especially packages that backport functionality
# to 2.x from 3.x
for item in $out/lib/python${majorVersion}/test/*; do
-
if [[ "$item" != */test_support.py* ]]; then
+
if [[ "$item" != */test_support.py*
+
&& "$item" != */test/support
+
&& "$item" != */test/libregrtest
+
&& "$item" != */test/regrtest.py* ]]; then
rm -rf "$item"
else
echo $item
+147
pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
···
+
From 81bd99ad9058feb1d0361bc8862e8567c21a6142 Mon Sep 17 00:00:00 2001
+
From: Frederik Rietdijk <fridh@fridh.nl>
+
Date: Mon, 28 Aug 2017 09:24:06 +0200
+
Subject: [PATCH] Don't use ldconfig and speed up uuid load
+
+
---
+
Lib/ctypes/util.py | 52 ++--------------------------------------------------
+
Lib/uuid.py | 50 ++------------------------------------------------
+
2 files changed, 4 insertions(+), 98 deletions(-)
+
+
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+
index 595113bffd..780cd5d21b 100644
+
--- a/Lib/ctypes/util.py
+
+++ b/Lib/ctypes/util.py
+
@@ -88,28 +88,7 @@ elif os.name == "posix":
+
import re, tempfile
+
+
def _findLib_gcc(name):
+
- expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
+
- fdout, ccout = tempfile.mkstemp()
+
- os.close(fdout)
+
- cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
+
- 'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
+
- try:
+
- f = os.popen(cmd)
+
- try:
+
- trace = f.read()
+
- finally:
+
- rv = f.close()
+
- finally:
+
- try:
+
- os.unlink(ccout)
+
- except FileNotFoundError:
+
- pass
+
- if rv == 10:
+
- raise OSError('gcc or cc command not found')
+
- res = re.search(expr, trace)
+
- if not res:
+
- return None
+
- return res.group(0)
+
+ return None
+
+
+
if sys.platform == "sunos5":
+
@@ -200,34 +179,7 @@ elif os.name == "posix":
+
else:
+
+
def _findSoname_ldconfig(name):
+
- import struct
+
- if struct.calcsize('l') == 4:
+
- machine = os.uname().machine + '-32'
+
- else:
+
- machine = os.uname().machine + '-64'
+
- mach_map = {
+
- 'x86_64-64': 'libc6,x86-64',
+
- 'ppc64-64': 'libc6,64bit',
+
- 'sparc64-64': 'libc6,64bit',
+
- 's390x-64': 'libc6,64bit',
+
- 'ia64-64': 'libc6,IA-64',
+
- }
+
- abi_type = mach_map.get(machine, 'libc6')
+
-
+
- # XXX assuming GLIBC's ldconfig (with option -p)
+
- regex = os.fsencode(
+
- '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
+
- try:
+
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
+
- stdin=subprocess.DEVNULL,
+
- stderr=subprocess.DEVNULL,
+
- stdout=subprocess.PIPE,
+
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+
- res = re.search(regex, p.stdout.read())
+
- if res:
+
- return os.fsdecode(res.group(1))
+
- except OSError:
+
- pass
+
+ return None
+
+
def find_library(name):
+
return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
+
diff --git a/Lib/uuid.py b/Lib/uuid.py
+
index 1061bffc43..846f5819f5 100644
+
--- a/Lib/uuid.py
+
+++ b/Lib/uuid.py
+
@@ -451,57 +451,11 @@ def _netbios_getnode():
+
return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
+
(bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
+
+
-# Thanks to Thomas Heller for ctypes and for his help with its use here.
+
+
-# If ctypes is available, use it to find system routines for UUID generation.
+
-# XXX This makes the module non-thread-safe!
+
_uuid_generate_random = _uuid_generate_time = _UuidCreate = None
+
-try:
+
- import ctypes, ctypes.util
+
+
- # The uuid_generate_* routines are provided by libuuid on at least
+
- # Linux and FreeBSD, and provided by libc on Mac OS X.
+
- for libname in ['uuid', 'c']:
+
- try:
+
- lib = ctypes.CDLL(ctypes.util.find_library(libname))
+
- except:
+
- continue
+
- if hasattr(lib, 'uuid_generate_random'):
+
- _uuid_generate_random = lib.uuid_generate_random
+
- if hasattr(lib, 'uuid_generate_time'):
+
- _uuid_generate_time = lib.uuid_generate_time
+
- if _uuid_generate_random is not None:
+
- break # found everything we were looking for
+
-
+
- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
+
- # in issue #8621 the function generates the same sequence of values
+
- # in the parent process and all children created using fork (unless
+
- # those children use exec as well).
+
- #
+
- # Assume that the uuid_generate functions are broken from 10.5 onward,
+
- # the test can be adjusted when a later version is fixed.
+
- import sys
+
- if sys.platform == 'darwin':
+
- import os
+
- if int(os.uname().release.split('.')[0]) >= 9:
+
- _uuid_generate_random = _uuid_generate_time = None
+
-
+
- # On Windows prior to 2000, UuidCreate gives a UUID containing the
+
- # hardware address. On Windows 2000 and later, UuidCreate makes a
+
- # random UUID and UuidCreateSequential gives a UUID containing the
+
- # hardware address. These routines are provided by the RPC runtime.
+
- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last
+
- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
+
- # to bear any relationship to the MAC address of any network device
+
- # on the box.
+
- try:
+
- lib = ctypes.windll.rpcrt4
+
- except:
+
- lib = None
+
- _UuidCreate = getattr(lib, 'UuidCreateSequential',
+
- getattr(lib, 'UuidCreate', None))
+
-except:
+
- pass
+
+_uuid_generate_time = _UuidCreate = None
+
+
+
+
def _unixdll_getnode():
+
"""Get the hardware address on Unix using ctypes."""
+
--
+
2.14.1
+
+4 -1
pkgs/development/interpreters/python/cpython/3.5/default.nix
···
# needed for some packages, especially packages that backport functionality
# to 2.x from 3.x
for item in $out/lib/python${majorVersion}/test/*; do
-
if [[ "$item" != */test_support.py* ]]; then
+
if [[ "$item" != */test_support.py*
+
&& "$item" != */test/support
+
&& "$item" != */test/libregrtest
+
&& "$item" != */test/regrtest.py* ]]; then
rm -rf "$item"
else
echo $item
+10 -10
pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
···
-
From f0ed87f4066296b7aa3c095d04672c138506fa45 Mon Sep 17 00:00:00 2001
+
From 590c46bb04f79ab611b2f8fd682dd7e43a01f268 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
-
Date: Sat, 29 Jul 2017 20:33:56 +0200
+
Date: Mon, 28 Aug 2017 09:24:06 +0200
Subject: [PATCH] Don't use ldconfig and speed up uuid load
---
Lib/ctypes/util.py | 70 ++----------------------------------------------------
-
Lib/uuid.py | 52 ----------------------------------------
-
2 files changed, 2 insertions(+), 120 deletions(-)
+
Lib/uuid.py | 49 --------------------------------------
+
2 files changed, 2 insertions(+), 117 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 7684eab81d..e9957d7951 100644
···
def find_library(name):
return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
diff --git a/Lib/uuid.py b/Lib/uuid.py
-
index e96e7e034c..a099ab4b4a 100644
+
index e96e7e034c..31160ace95 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
-
@@ -455,58 +455,6 @@ def _netbios_getnode():
+
@@ -455,58 +455,9 @@ def _netbios_getnode():
continue
return int.from_bytes(bytes, 'big')
-# Thanks to Thomas Heller for ctypes and for his help with its use here.
-
-
+
-# If ctypes is available, use it to find system routines for UUID generation.
-# XXX This makes the module non-thread-safe!
-
-_uuid_generate_time = _UuidCreate = None
+
_uuid_generate_time = _UuidCreate = None
-try:
- import ctypes, ctypes.util
- import sys
-
-
+
- # The uuid_generate_* routines are provided by libuuid on at least
- # Linux and FreeBSD, and provided by libc on Mac OS X.
- _libnames = ['uuid']
···
def _unixdll_getnode():
"""Get the hardware address on Unix using ctypes."""
--
-
2.13.3
+
2.14.1
+4 -1
pkgs/development/interpreters/python/cpython/3.6/default.nix
···
# needed for some packages, especially packages that backport functionality
# to 2.x from 3.x
for item in $out/lib/python${majorVersion}/test/*; do
-
if [[ "$item" != */test_support.py* ]]; then
+
if [[ "$item" != */test_support.py*
+
&& "$item" != */test/support
+
&& "$item" != */test/libregrtest
+
&& "$item" != */test/regrtest.py* ]]; then
rm -rf "$item"
else
echo $item
+10 -10
pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
···
-
From a831df344ec1c883a0ef04d8cc8f5c53a942f6de Mon Sep 17 00:00:00 2001
+
From 105621b99cc30615c79b5aa3d12d6732e14b0d59 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
-
Date: Sat, 29 Jul 2017 20:17:40 +0200
+
Date: Mon, 28 Aug 2017 09:24:06 +0200
Subject: [PATCH] Don't use ldconfig and speed up uuid load
---
Lib/ctypes/util.py | 70 ++----------------------------------------------------
-
Lib/uuid.py | 51 ---------------------------------------
-
2 files changed, 2 insertions(+), 119 deletions(-)
+
Lib/uuid.py | 48 -------------------------------------
+
2 files changed, 2 insertions(+), 116 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 339ae8aa8a..2944985c30 100644
···
def _findLib_ld(name):
# See issue #9998 for why this is needed
diff --git a/Lib/uuid.py b/Lib/uuid.py
-
index 200c800b34..a099ab4b4a 100644
+
index 200c800b34..31160ace95 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
-
@@ -455,57 +455,6 @@ def _netbios_getnode():
+
@@ -455,57 +455,9 @@ def _netbios_getnode():
continue
return int.from_bytes(bytes, 'big')
-# Thanks to Thomas Heller for ctypes and for his help with its use here.
-
-
+
-# If ctypes is available, use it to find system routines for UUID generation.
-# XXX This makes the module non-thread-safe!
-
-_uuid_generate_time = _UuidCreate = None
+
_uuid_generate_time = _UuidCreate = None
-try:
- import ctypes, ctypes.util
- import sys
-
-
+
- # The uuid_generate_* routines are provided by libuuid on at least
- # Linux and FreeBSD, and provided by libc on Mac OS X.
- _libnames = ['uuid']
···
def _unixdll_getnode():
"""Get the hardware address on Unix using ctypes."""
--
-
2.13.3
+
2.14.1
+4 -4
pkgs/development/libraries/appstream-glib/default.nix
···
{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
, gtk_doc, autoconf, automake, libtool, libarchive, libyaml
, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
-
, libuuid, json_glib, autoconf-archive
+
, libuuid, json_glib, autoconf-archive, gperf
}:
stdenv.mkDerivation rec {
-
name = "appstream-glib-0.6.3";
+
name = "appstream-glib-0.6.13";
src = fetchFromGitHub {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-
sha256 = "12l0vzhi9vpyrnf7vrpq21rb26mb6yskp5zgngdjyjanwhzmc617";
+
sha256 = "1csscszdp1imd0hiib6xx7mfylfl1r64xmma14p5jq1yprprpa9h";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ];
buildInputs = [ glib gtk_doc gettext sqlite libsoup
gcab attr acl docbook_xsl libuuid json_glib
-
libarchive libyaml gobjectIntrospection ];
+
libarchive libyaml gobjectIntrospection gperf ];
propagatedBuildInputs = [ gtk3 ];
configureScript = "./autogen.sh";
+2 -2
pkgs/development/libraries/babl/default.nix
···
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
-
name = "babl-0.1.24";
+
name = "babl-0.1.28";
src = fetchurl {
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-
sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7";
+
sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3";
};
meta = with stdenv.lib; {
+2 -2
pkgs/development/libraries/clutter-gst/default.nix
···
stdenv.mkDerivation rec {
major = "3.0";
-
minor = "20";
+
minor = "24";
name = "clutter-gst-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
-
sha256 = "1jb6q0f6vbh8nskz88siny70pm43wbnw2wzr2klsyb9axn3if0d0";
+
sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9";
};
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
+4 -4
pkgs/development/libraries/clutter/default.nix
···
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib,
+
, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib,
gobjectIntrospection, gtk3
}:
let
ver_maj = "1.26";
-
ver_min = "0";
+
ver_min = "2";
in
stdenv.mkDerivation rec {
name = "clutter-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-
sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
+
sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
};
buildInputs = [ gtk3 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs =
[ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-
atk json_glib gobjectIntrospection
+
atk json_glib gobjectIntrospection libxcb
];
configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
+6 -13
pkgs/development/libraries/expat/default.nix
···
{ stdenv, fetchpatch, fetchurl }:
stdenv.mkDerivation rec {
-
name = "expat-2.2.3";
+
name = "expat-2.2.4";
src = fetchurl {
url = "mirror://sourceforge/expat/${name}.tar.bz2";
-
sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k";
+
sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83";
};
outputs = [ "out" "dev" ]; # TODO: fix referrers
outputBin = "dev";
-
patches = [
-
(fetchpatch {
-
name = "fix-aarch-build.patch";
-
url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch";
-
sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w";
-
stripLen = 1;
-
excludes = [ "coverage.sh" ];
-
})
-
];
-
configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
outputMan = "dev"; # tiny page for a dev tool
doCheck = true;
-
preCheck = "patchShebangs ./run.sh";
+
preCheck = ''
+
patchShebangs ./run.sh
+
patchShebangs ./test-driver-wrapper.sh
+
'';
meta = with stdenv.lib; {
homepage = http://www.libexpat.org/;
+2 -2
pkgs/development/libraries/gegl/3.0.nix
···
, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }:
stdenv.mkDerivation rec {
-
name = "gegl-0.3.6";
+
name = "gegl-0.3.18";
src = fetchurl {
url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-
sha256 = "08m7dlf2kwmp7jw3qskwxas192swhn1g4jcd8aldg9drfjygprvh";
+
sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp";
};
hardeningDisable = [ "format" ];
+3 -2
pkgs/development/libraries/geoclue/default.nix
···
-
{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }:
+
{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2,
+
libxslt, glib_networking }:
stdenv.mkDerivation rec {
name = "geoclue-0.12.0";
···
sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
};
-
buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ];
+
buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt glib_networking ];
propagatedBuildInputs = [dbus glib dbus_glib];
+2 -2
pkgs/development/libraries/glib/default.nix
···
'';
ver_maj = "2.52";
-
ver_min = "1";
+
ver_min = "3";
in
stdenv.mkDerivation rec {
···
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-
sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
+
sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
+3 -3
pkgs/development/libraries/gobject-introspection/default.nix
···
# In that case its about 6MB which could be separated
let
-
ver_maj = "1.50";
-
ver_min = "0";
+
ver_maj = "1.52";
+
ver_min = "1";
in
with stdenv.lib;
stdenv.mkDerivation rec {
···
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-
sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5";
+
sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";
};
outputs = [ "out" "dev" ];
+2 -2
pkgs/development/libraries/libarchive/default.nix
···
stdenv.mkDerivation rec {
name = "libarchive-${version}";
-
version = "3.3.1";
+
version = "3.3.2";
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.gz";
-
sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9";
+
sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
};
outputs = [ "out" "lib" "dev" ];
+2 -2
pkgs/development/libraries/libchamplain/default.nix
···
{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
-
, clutter_gtk, libsoup /*, libmemphis */ }:
+
, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
stdenv.mkDerivation rec {
major = "0.12";
···
sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
};
-
buildInputs = [ pkgconfig ];
+
buildInputs = [ pkgconfig gobjectIntrospection ];
propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
+2 -2
pkgs/development/libraries/libdrm/default.nix
···
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
-
name = "libdrm-2.4.82";
+
name = "libdrm-2.4.83";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-
sha256 = "43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c";
+
sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983";
};
outputs = [ "out" "dev" ];
+2 -2
pkgs/development/libraries/mesa/default.nix
···
in
let
-
version = "17.1.6";
+
version = "17.1.7";
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://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
-
sha256 = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50";
+
sha256 = "1xg5v61nvabjk3rx48cwmnwv6zpqdcnkxl8bz82284mifjl75x39";
};
prePatch = "patchShebangs .";
+8 -9
pkgs/development/libraries/ncurses/default.nix
···
, buildPlatform, hostPlatform
, buildPackages
}:
-
let
-
version = if abiVersion == "5" then "5.9" else "6.0";
-
sha256 = if abiVersion == "5"
-
then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"
-
else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";
-
in
+
stdenv.mkDerivation rec {
+
version = if abiVersion == "5" then "5.9" else "6.0-20170729";
name = "ncurses-${version}";
-
src = fetchurl {
+
src = fetchurl (if abiVersion == "5" then {
url = "mirror://gnu/ncurses/${name}.tar.gz";
-
inherit sha256;
-
};
+
sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
+
} else {
+
url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz";
+
sha256 = "1cfdpl2gnj8szw28jmzrw47va0yqn16g03ywyzz3bjmaqxxmmwga";
+
});
patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;
+10 -1
pkgs/development/libraries/pango/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz
, libintlOrEmpty, gobjectIntrospection, darwin
}:
···
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16";
};
+
+
patches = [
+
# https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9
+
(fetchpatch rec {
+
name = "pango-fix-gtk2-test-failures.patch";
+
url = "https://bug785978.bugzilla-attachments.gnome.org/attachment.cgi?id=357690&action=diff&collapsed=&context=patch&format=raw&headers=1";
+
sha256 = "055m2dllfr5pgw6bci72snw38f4hsyw1x7flj188c965ild8lq3a";
+
})
+
];
outputs = [ "bin" "dev" "out" "devdoc" ];
+2 -2
pkgs/development/libraries/qjson/default.nix
···
{ stdenv, fetchFromGitHub, cmake, qt4 }:
stdenv.mkDerivation rec {
-
version = "0.8.1";
+
version = "0.9.0";
name = "qjson-${version}";
src = fetchFromGitHub {
owner = "flavio";
repo = "qjson";
rev = "${version}";
-
sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59";
+
sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
};
buildInputs = [ cmake qt4 ];
+2 -2
pkgs/development/python-modules/Cython/default.nix
···
buildPythonPackage rec {
pname = "Cython";
name = "${pname}-${version}";
-
version = "0.25.2";
+
version = "0.26";
src = fetchPypi {
inherit pname version;
-
sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
+
sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66";
};
# With Python 2.x on i686-linux or 32-bit ARM this test fails because the
+35
pkgs/development/python-modules/Flask-PyMongo/default.nix
···
+
{ buildPythonPackage
+
, fetchPypi
+
, flask
+
, pymongo
+
, lib
+
, pytest
+
}:
+
+
buildPythonPackage rec {
+
pname = "Flask-PyMongo";
+
name = "${pname}-${version}";
+
version = "0.5.1";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d";
+
};
+
+
checkInputs = [ pytest ];
+
+
checkPhase = ''
+
py.test tests
+
'';
+
+
# Tests seem to hang
+
doCheck = false;
+
+
propagatedBuildInputs = [ flask pymongo ];
+
+
meta = {
+
homepage = "http://flask-pymongo.readthedocs.org/";
+
description = "PyMongo support for Flask applications";
+
license = lib.licenses.bsd2;
+
};
+
}
+2 -2
pkgs/development/python-modules/aafigure/default.nix
···
buildPythonPackage rec {
pname = "aafigure";
-
version = "0.5";
+
version = "0.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
+
sha256 = "49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e";
};
propagatedBuildInputs = [ pillow ];
+4 -4
pkgs/development/python-modules/adal/default.nix
···
{ stdenv, buildPythonPackage, fetchPypi
-
, requests, pyjwt }:
+
, requests, pyjwt, dateutil }:
buildPythonPackage rec {
pname = "adal";
-
version = "0.1.0";
+
version = "0.4.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
+
sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
};
-
propagatedBuildInputs = [ requests pyjwt ];
+
propagatedBuildInputs = [ requests pyjwt dateutil ];
meta = with stdenv.lib; {
description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
+2 -2
pkgs/development/python-modules/aiodns/default.nix
···
buildPythonPackage rec {
pname = "aiodns";
-
version = "1.0.1";
+
version = "1.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
+
sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea";
};
propagatedBuildInputs = with stdenv.lib; [ pycares ]
+2 -2
pkgs/development/python-modules/alembic/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "alembic";
-
version = "0.9.3";
+
version = "0.9.5";
src = fetchPypi {
inherit pname version;
-
sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c";
+
sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05";
};
buildInputs = [ pytest pytestcov mock coverage ];
+2 -2
pkgs/development/python-modules/argcomplete/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "argcomplete";
-
version = "1.8.2";
+
version = "1.9.2";
src = fetchPypi {
inherit pname version;
-
sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+
sha256 = "d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed";
};
doCheck = false; # bash-completion test fails with "compgen: command not found".
+2 -2
pkgs/development/python-modules/asgi_ipc/default.nix
···
asgiref, msgpack, posix_ipc
}:
buildPythonPackage rec {
-
version = "1.4.0";
+
version = "1.4.1";
pname = "asgi_ipc";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-
sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588";
+
sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43";
};
propagatedBuildInputs = [ asgiref msgpack posix_ipc ];
+2 -2
pkgs/development/python-modules/astropy/default.nix
···
buildPythonPackage rec {
pname = "astropy";
-
version = "1.3.3";
+
version = "2.0.1";
name = "${pname}-${version}";
doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
src = fetchPypi {
inherit pname version;
-
sha256 = "ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99";
+
sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
};
propagatedBuildInputs = [ numpy cython h5py scipy ];
+2 -2
pkgs/development/python-modules/async_timeout/default.nix
···
let
pname = "async-timeout";
-
version = "1.2.1";
+
version = "1.3.0";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657";
+
sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f";
};
buildInputs = [ pytestrunner ];
+2 -2
pkgs/development/python-modules/audioread/default.nix
···
buildPythonPackage rec {
pname = "audioread";
name = "${pname}-${version}";
-
version = "2.1.1";
+
version = "2.1.5";
src = fetchPypi {
inherit pname version;
-
sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
+
sha256 = "36c3b118f097c58ba073b7d040c4319eff200756f094295677567e256282d0d7";
};
# No tests, need to disable or py3k breaks
+2 -2
pkgs/development/python-modules/autobahn/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "autobahn";
-
version = "17.5.1";
+
version = "17.8.1";
src = fetchurl {
url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-
sha256 = "0p2xx20g0rj6pnp4h3231mn8zk4ag8msv69f93gai2hzl5vglcia";
+
sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4";
};
# Upstream claim python2 support, but tests require pytest-asyncio which
+2 -2
pkgs/development/python-modules/bottleneck/default.nix
···
buildPythonPackage rec {
pname = "Bottleneck";
name = "Bottleneck-${version}";
-
version = "1.2.0";
+
version = "1.2.1";
src = fetchPypi {
inherit pname version;
-
sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
+
sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36";
};
checkInputs = [ nose ];
+2 -2
pkgs/development/python-modules/breathe/default.nix
···
{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
buildPythonPackage rec {
-
version = "4.6.0";
+
version = "4.7.2";
pname = "breathe";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/b/breathe/${name}.tar.gz";
-
sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a";
+
sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32";
};
propagatedBuildInputs = [ docutils six sphinx ];
+2 -2
pkgs/development/python-modules/certifi/default.nix
···
buildPythonPackage rec {
pname = "certifi";
-
version = "2017.4.17";
+
version = "2017.7.27.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a";
+
sha256 = "40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5";
};
meta = {
+2 -2
pkgs/development/python-modules/chai/default.nix
···
buildPythonPackage rec {
pname = "chai";
-
version = "1.1.1";
+
version = "1.1.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+
sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc";
};
meta = with stdenv.lib; {
+2 -2
pkgs/development/python-modules/confluent-kafka/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
-
version = "0.9.4";
+
version = "0.11.0";
pname = "confluent-kafka";
src = fetchPypi {
inherit pname version;
-
sha256 = "1v8apw9f8l01ql42jg1sfqv41yxvcbxn1a3ar01y0ni428swq6wk";
+
sha256 = "4c34bfe8f823ee3777d93820ec6578365d2bde3cd1302cbd0e44c86b68643667";
};
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
+2 -2
pkgs/development/python-modules/coveralls/default.nix
···
buildPythonPackage rec {
pname = "coveralls";
name = "${pname}-python-${version}";
-
version = "1.1";
+
version = "1.2.0";
# wanted by tests
src = fetchPypi {
inherit pname version;
-
sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
+
sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3";
};
buildInputs = [
+2 -2
pkgs/development/python-modules/discordpy/default.nix
···
let
pname = "discord.py";
-
version = "0.16.8";
+
version = "0.16.10";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa";
+
sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88";
};
propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
+2 -2
pkgs/development/python-modules/django-polymorphic/default.nix
···
buildPythonPackage rec {
pname = "django-polymorphic";
-
version = "1.2";
+
version = "1.3";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "1bz86711sx2b66rl2xz141xppsfmlxilkgjgq0jsavpw37vg7r3r";
+
sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad";
};
checkInputs = [ django ];
+2 -2
pkgs/development/python-modules/django_compressor/default.nix
···
rcssmin, rjsmin, django_appconf }:
buildPythonPackage rec {
pname = "django_compressor";
-
version = "2.1.1";
+
version = "2.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j";
+
sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f";
};
# Need to setup django testing
+2 -2
pkgs/development/python-modules/djangorestframework/default.nix
···
{ stdenv, buildPythonPackage, fetchurl, django }:
buildPythonPackage rec {
-
version = "3.6.3";
+
version = "3.6.4";
pname = "djangorestframework";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-
sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4";
+
sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42";
};
# Test settings are missing
+2 -2
pkgs/development/python-modules/docker.nix
···
, ipaddress, backports_ssl_match_hostname, docker_pycreds
}:
buildPythonPackage rec {
-
version = "2.4.2";
+
version = "2.5.1";
pname = "docker";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/docker/${name}.tar.gz";
-
sha256 = "11kl6kl82056bzcycvc2jpz59ra89vwbyzi0yaamixgcm9nzlvr1";
+
sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880";
};
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/dulwich.nix
···
, git, glibcLocales }:
buildPythonPackage rec {
-
version = "0.17.3";
+
version = "0.18.2";
pname = "dulwich";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-
sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca";
+
sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b";
};
LC_ALL = "en_US.UTF-8";
+2 -2
pkgs/development/python-modules/emcee/default.nix
···
buildPythonPackage rec {
pname = "emcee";
-
version = "2.1.0";
+
version = "2.2.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw";
+
sha256 = "b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172";
};
propagatedBuildInputs = [ numpy ];
+2 -2
pkgs/development/python-modules/flake8/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "flake8";
-
version = "3.3.0";
+
version = "3.4.1";
src = fetchPypi {
inherit pname version;
-
sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr";
+
sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8";
};
buildInputs = [ pytest mock pytestrunner ];
+2 -2
pkgs/development/python-modules/flask-migrate/default.nix
···
buildPythonPackage rec {
pname = "Flask-Migrate";
-
version = "2.0.4";
+
version = "2.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
+
sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f";
};
checkInputs = optional isPy3k glibcLocales;
+2 -2
pkgs/development/python-modules/fonttools/default.nix
···
buildPythonPackage rec {
pname = "fonttools";
-
version = "3.13.1";
+
version = "3.15.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d";
+
sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2";
extension = "zip";
};
+2 -2
pkgs/development/python-modules/ftfy/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "ftfy";
-
version = "4.4.3";
+
version = "5.1.1";
src = fetchPypi {
inherit pname version;
-
sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
+
sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";
};
propagatedBuildInputs = [ html5lib wcwidth];
+2 -2
pkgs/development/python-modules/gensim/default.nix
···
buildPythonPackage rec {
pname = "gensim";
name = "${pname}-${version}";
-
version = "2.1.0";
+
version = "2.3.0";
src = fetchPypi {
inherit pname version;
-
sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc";
+
sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f";
};
propagatedBuildInputs = [ smart_open numpy six scipy
+2 -2
pkgs/development/python-modules/html5-parser/default.nix
···
buildPythonPackage rec {
pname = "html5-parser";
-
version = "0.4.3";
+
version = "0.4.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "173vzg214x7qfq201m4b09wg5nszdgwjw5q02v23k54iqm3kcpnx";
+
sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5";
};
buildInputs = [ pkgconfig ];
+2 -2
pkgs/development/python-modules/ipywidgets/default.nix
···
buildPythonPackage rec {
pname = "ipywidgets";
-
version = "6.0.0";
+
version = "7.0.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
+
sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd";
};
# Tests are not distributed
+26
pkgs/development/python-modules/jsonpatch/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
, jsonpointer
+
}:
+
+
buildPythonPackage rec {
+
pname = "jsonpatch";
+
version = "1.16";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a";
+
};
+
+
# test files are missing
+
doCheck = false;
+
propagatedBuildInputs = [ jsonpointer ];
+
+
meta = {
+
description = "Library to apply JSON Patches according to RFC 6902";
+
homepage = "https://github.com/stefankoegl/python-json-patch";
+
license = lib.licenses.bsd2; # "Modified BSD license, says pypi"
+
};
+
}
+2 -2
pkgs/development/python-modules/keras/default.nix
···
buildPythonPackage rec {
pname = "Keras";
-
version = "2.0.6";
+
version = "2.0.7";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb";
+
sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0";
};
checkInputs = [
+2 -2
pkgs/development/python-modules/keystoneauth1/default.nix
···
buildPythonPackage rec {
pname = "keystoneauth1";
-
version = "1.1.0";
+
version = "3.1.0";
name = "${pname}-${version}";
disabled = isPyPy; # a test fails
src = fetchPypi {
inherit pname version;
-
sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
+
sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb";
};
buildInputs = [ pbr testtools testresources testrepository mock
+2 -2
pkgs/development/python-modules/kitchen/default.nix
···
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "kitchen";
-
version = "1.2.4";
+
version = "1.2.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq";
+
sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd";
};
meta = with stdenv.lib; {
+2 -2
pkgs/development/python-modules/ledgerblue/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "ledgerblue";
-
version = "0.1.13";
+
version = "0.1.15";
src = fetchPypi {
inherit pname version;
-
sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+
sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c";
};
buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
+2 -2
pkgs/development/python-modules/libtmux/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "libtmux";
-
version = "0.7.3";
+
version = "0.7.4";
src = fetchPypi {
inherit pname version;
-
sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8";
+
sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9";
};
buildInputs = [ pytest_29 ];
+2 -2
pkgs/development/python-modules/llvmlite/default.nix
···
buildPythonPackage rec {
pname = "llvmlite";
name = "${pname}-${version}";
-
version = "0.18.0";
+
version = "0.19.0";
disabled = isPyPy;
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404";
+
sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2";
};
propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+2 -2
pkgs/development/python-modules/m2r/default.nix
···
buildPythonPackage rec {
pname = "m2r";
name = "${pname}-${version}";
-
version = "0.1.7";
+
version = "0.1.10";
src = fetchPypi {
inherit pname version;
-
sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39";
+
sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6";
};
propagatedBuildInputs = [ mistune docutils ];
+2 -2
pkgs/development/python-modules/magic-wormhole/default.nix
···
buildPythonPackage rec {
pname = "magic-wormhole";
-
version = "0.9.2";
+
version = "0.10.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3";
+
sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee";
};
checkInputs = [ mock ];
+2 -2
pkgs/development/python-modules/marionette-harness/default.nix
···
buildPythonPackage rec {
pname = "marionette-harness";
-
version = "4.0.0";
+
version = "4.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0726zm09nwh4kkd4xirva4596svlifkkpbaywlmq2yb6ayk7d4vl";
+
sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983";
};
propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest
+2 -2
pkgs/development/python-modules/multidict/default.nix
···
let
pname = "multidict";
-
version = "2.1.6";
+
version = "3.1.3";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
+
sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12";
};
buildInputs = [ pytest ];
+2 -2
pkgs/development/python-modules/natsort/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "natsort";
-
version = "5.0.3";
+
version = "5.1.0";
buildInputs = [
hypothesis
···
src = fetchPypi {
inherit pname version;
-
sha256 = "1h87n0jcsi6mgjx1pws6g1lmcn8jwabwxj8hq334jvziaq0plyym";
+
sha256 = "5db0fd17c9f8ef3d54962a6e46159ce4807c630f0931169cd15ce54f2ac395b9";
};
# do not run checks on nix_run_setup.py
+2 -2
pkgs/development/python-modules/nbformat/default.nix
···
buildPythonPackage rec {
pname = "nbformat";
-
version = "4.3.0";
+
version = "4.4.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
+
sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402";
};
LC_ALL="en_US.UTF-8";
+2 -2
pkgs/development/python-modules/numba/default.nix
···
}:
buildPythonPackage rec {
-
version = "0.33.0";
+
version = "0.34.0";
pname = "numba";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/n/numba/${name}.tar.gz";
-
sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd";
+
sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+29
pkgs/development/python-modules/odfpy/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
}:
+
+
buildPythonPackage rec {
+
pname = "odfpy";
+
version = "1.3.5";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366";
+
};
+
+
checkPhase = ''
+
pushd tests
+
rm runtests
+
for file in test*.py; do
+
python $file
+
done
+
'';
+
+
meta = {
+
description = "Python API and tools to manipulate OpenDocument files";
+
homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
+
license = lib.licenses.asl20;
+
};
+
}
+2 -2
pkgs/development/python-modules/oslo-config/default.nix
···
buildPythonPackage rec {
pname = "oslo.config";
-
version = "2.5.0";
+
version = "4.11.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
+
sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05";
};
propagatedBuildInputs = [ pbr six netaddr stevedore ];
+2 -2
pkgs/development/python-modules/pbr/default.nix
···
buildPythonPackage rec {
pname = "pbr";
-
version = "3.0.1";
+
version = "3.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91";
+
sha256 = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1";
};
# circular dependencies with fixtures
+2 -2
pkgs/development/python-modules/plotly/default.nix
···
buildPythonPackage rec {
pname = "plotly";
-
version = "2.0.12";
+
version = "2.0.15";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0";
+
sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99";
};
propagatedBuildInputs = [
+20
pkgs/development/python-modules/py/default.nix
···
+
{ stdenv, buildPythonPackage, fetchPypi }:
+
buildPythonPackage rec {
+
pname = "py";
+
version = "1.4.34";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g";
+
};
+
+
# Circular dependency on pytest
+
doCheck = false;
+
+
meta = with stdenv.lib; {
+
description = "Library with cross-python path, ini-parsing, io, code, log facilities";
+
homepage = http://pylib.readthedocs.org/;
+
license = licenses.mit;
+
};
+
}
+3 -3
pkgs/development/python-modules/pygobject/3.nix
···
{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
buildPythonPackage rec {
-
major = "3.22";
-
minor = "0";
+
major = "3.24";
+
minor = "1";
name = "pygobject-${major}.${minor}";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
-
sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
+
sha256 = "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56";
};
outputs = [ "out" "dev" ];
+2 -2
pkgs/development/python-modules/pygraphviz/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pygraphviz";
-
version = "1.4rc1";
+
version = "1.3.1";
src = fetchPypi {
inherit pname version;
-
sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
+
sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
};
buildInputs = [ doctest-ignore-unicode mock nose ];
+2 -2
pkgs/development/python-modules/pylast/default.nix
···
buildPythonPackage rec {
pname = "pylast";
-
version = "1.8.0";
+
version = "1.9.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "85f8dd96aef0ccba5f80379c3d7bc1fabd72f59aebab040daf40a8b72268f9bd";
+
sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4";
};
propagatedBuildInputs = [ certifi six ];
+2 -2
pkgs/development/python-modules/pyopencl/default.nix
···
buildPythonPackage rec {
pname = "pyopencl";
-
version = "2017.1.1";
+
version = "2017.2";
name = "${pname}-${version}";
buildInputs = [ pytest opencl-headers ocl-icd ];
···
src = fetchPypi {
inherit pname version;
-
sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323";
+
sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9";
};
# gcc: error: pygpu_language_opencl.cpp: No such file or directory
+2 -2
pkgs/development/python-modules/pypandoc/default.nix
···
buildPythonPackage rec {
pname = "pypandoc";
-
version = "1.3.3";
+
version = "1.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
+
sha256 = "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b";
};
# Fix tests: first requires network access, second is a bug (reported upstream)
+2 -2
pkgs/development/python-modules/pyroute2/default.nix
···
buildPythonPackage rec {
pname = "pyroute2";
-
version = "0.4.18";
+
version = "0.4.19";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-
sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e";
+
sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a";
};
# requires root priviledges
+31
pkgs/development/python-modules/pyrtlsdr/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
, rtl-sdr
+
}:
+
+
buildPythonPackage rec {
+
pname = "pyrtlsdr";
+
version = "0.2.5";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4";
+
};
+
+
postPatch = ''
+
sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
+
'';
+
+
# No tests that can be used.
+
doCheck = false;
+
+
meta = with lib; {
+
description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
+
homepage = https://github.com/roger-/pyrtlsdr;
+
license = licenses.gpl3;
+
platforms = platforms.linux;
+
maintainers = with maintainers; [ bjornfor ];
+
};
+
}
+2 -2
pkgs/development/python-modules/pyscard/default.nix
···
{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
buildPythonPackage rec {
-
version = "1.9.5";
+
version = "1.9.6";
pname = "pyscard";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pyscard/${name}.tar.gz";
-
sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835";
+
sha256 = "6e28143c623e2b34200d2fa9178dbc80a39b9c068b693b2e6527cdae784c6c12";
};
patchPhase = ''
+2 -2
pkgs/development/python-modules/pytest-asyncio/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pytest-asyncio";
-
version = "0.5.0";
+
version = "0.6.0";
disabled = !isPy3k;
src = fetchurl {
url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-
sha256 = "03sxq8fglr4lw4y6wqlbli9ypr65fxzx6hlpn5wpccx8v5472iff";
+
sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b";
};
buildInputs = [ pytest ];
+1 -1
pkgs/development/python-modules/pytest-django/default.nix
···
# Unpin setuptools-scm
(fetchpatch {
url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-
sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
+
sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
})
];
+33
pkgs/development/python-modules/pytest-forked/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
, setuptools_scm
+
, pytest
+
}:
+
+
buildPythonPackage rec {
+
pname = "pytest-forked";
+
version = "0.2";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805";
+
};
+
+
buildInputs = [ pytest setuptools_scm ];
+
+
# Do not function
+
doCheck = false;
+
+
checkPhase = ''
+
py.test testing
+
'';
+
+
meta = {
+
description = "Run tests in isolated forked subprocesses";
+
homepage = https://github.com/pytest-dev/pytest-forked;
+
license = lib.licenses.mit;
+
};
+
+
}
+4 -4
pkgs/development/python-modules/pytest-xdist/default.nix
···
-
{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+
{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pytest-xdist";
-
version = "1.18.2";
+
version = "1.20.0";
src = fetchPypi {
inherit pname version;
-
sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae";
+
sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe";
};
-
buildInputs = [ pytest setuptools_scm ];
+
buildInputs = [ pytest setuptools_scm pytest-forked];
propagatedBuildInputs = [ execnet ];
postPatch = ''
+27
pkgs/development/python-modules/pytest/3_0.nix
···
+
{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
+
, setuptools_scm
+
}:
+
buildPythonPackage rec {
+
version = "3.0.7";
+
pname = "pytest";
+
name = "${pname}-${version}";
+
+
preCheck = ''
+
# don't test bash builtins
+
rm testing/test_argcomplete.py
+
'';
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+
};
+
+
buildInputs = [ hypothesis setuptools_scm ];
+
propagatedBuildInputs = [ py ]
+
++ (stdenv.lib.optional isPy26 argparse);
+
+
meta = with stdenv.lib; {
+
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+
platforms = platforms.unix;
+
};
+
}
+8 -6
pkgs/development/python-modules/pytest/default.nix
···
-
{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
+
{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
+
, setuptools_scm
+
}:
buildPythonPackage rec {
-
version = "3.0.7";
+
version = "3.2.1";
pname = "pytest";
name = "${pname}-${version}";
···
rm testing/test_argcomplete.py
'';
-
src = fetchurl {
-
url = "mirror://pypi/p/pytest/${name}.tar.gz";
-
sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
};
-
buildInputs = [ hypothesis ];
+
buildInputs = [ hypothesis setuptools_scm ];
propagatedBuildInputs = [ py ]
++ (stdenv.lib.optional isPy26 argparse);
+6 -2
pkgs/development/python-modules/python-editor/default.nix
···
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
-
version = "0.4";
+
version = "1.0.3";
pname = "python-editor";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
+
sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
};
+
# No proper tests
+
doCheck = false;
+
meta = with stdenv.lib; {
description = "A library that provides the `editor` module for programmatically";
homepage = https://github.com/fmoo/python-editor;
+
license = licenses.asl20;
};
}
+2 -2
pkgs/development/python-modules/qtconsole/default.nix
···
buildPythonPackage rec {
pname = "qtconsole";
-
version = "4.3.0";
+
version = "4.3.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209";
+
sha256 = "eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c";
};
buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
+4 -3
pkgs/development/python-modules/relatorio/default.nix
···
-
{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
+
{ lib, fetchurl, buildPythonPackage, genshi, lxml, python_magic }:
buildPythonPackage rec {
pname = "relatorio";
name = "${pname}-${version}";
-
version = "0.6.4";
+
version = "0.7.0";
src = fetchurl {
url = "mirror://pypi/r/relatorio/${name}.tar.gz";
-
sha256 = "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z";
+
sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845";
};
propagatedBuildInputs = [
genshi
lxml
+
python_magic
];
meta = {
homepage = http://relatorio.tryton.org/;
+3 -3
pkgs/development/python-modules/requests-oauthlib.nix
···
-
{ stdenv, buildPythonPackage, fetchurl
+
{ stdenv, buildPythonPackage, fetchPypi
, oauthlib, requests }:
buildPythonPackage rec {
···
pname = "requests-oauthlib";
name = "${pname}-${version}";
-
src = fetchurl {
-
url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
+
src = fetchPypi {
+
inherit pname version;
sha256 = "18gg9dwral153c10f8bwhz2dy4nw7c6mws5a2g7gidk3z5xhqy4n";
};
+2 -2
pkgs/development/python-modules/rfc3986/default.nix
···
buildPythonPackage rec {
pname = "rfc3986";
-
version = "1.0.0";
+
version = "1.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4";
+
sha256 = "8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b";
};
buildInputs = [ pytest ];
+5 -2
pkgs/development/python-modules/semver/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "semver";
-
version = "2.2.1";
+
version = "2.7.7";
src = fetchPypi {
inherit pname version;
-
sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+
sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d";
};
+
+
# No tests in archive
+
doCheck = false;
meta = with stdenv.lib; {
description = "Python package to work with Semantic Versioning (http://semver.org/)";
+2 -2
pkgs/development/python-modules/setuptools/default.nix
···
# Should use buildPythonPackage here somehow
stdenv.mkDerivation rec {
pname = "setuptools";
-
version = "36.0.1";
+
version = "36.2.7";
name = "${python.libPrefix}-${pname}-${version}";
src = fetchPypi {
inherit pname version;
extension = "zip";
-
sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
+
sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5";
};
buildInputs = [ python wrapPython unzip ];
+24
pkgs/development/python-modules/setuptools_scm/default.nix
···
+
{ stdenv, buildPythonPackage, fetchPypi, pip }:
+
buildPythonPackage rec {
+
pname = "setuptools_scm";
+
name = "${pname}-${version}";
+
version = "1.15.6";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9";
+
};
+
+
buildInputs = [ pip ];
+
+
# Seems to fail due to chroot and would cause circular dependency
+
# with pytest
+
doCheck = false;
+
+
meta = with stdenv.lib; {
+
homepage = https://bitbucket.org/pypa/setuptools_scm/;
+
description = "Handles managing your python package versions in scm metadata";
+
license = licenses.mit;
+
maintainers = with maintainers; [ jgeerds ];
+
};
+
}
+2 -2
pkgs/development/python-modules/simplejson/default.nix
···
buildPythonPackage rec {
pname = "simplejson";
-
version = "3.10.0";
+
version = "3.11.1";
name = "${pname}-${version}";
doCheck = !stdenv.isDarwin;
src = fetchPypi {
inherit pname version;
-
sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2";
+
sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7";
};
meta = {
+12 -4
pkgs/development/python-modules/sphinx/default.nix
···
, whoosh
, imagesize
, requests
+
, sphinxcontrib-websupport
+
, typing
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Sphinx";
-
version = "1.5.2";
+
version = "1.6.3";
src = fetchPypi {
inherit pname version;
-
sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
+
sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6";
};
LC_ALL = "en_US.UTF-8";
-
buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+
checkInputs = [ pytest ];
+
buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
# Disable two tests that require network access.
checkPhase = ''
cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
···
whoosh
imagesize
requests
-
];
+
sphinxcontrib-websupport
+
] ++ lib.optional (pythonOlder "3.5") typing;
+
+
# Lots of tests. Needs network as well at some point.
+
doCheck = false;
# https://github.com/NixOS/nixpkgs/issues/22501
# Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
+26
pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
, six
+
}:
+
+
buildPythonPackage rec {
+
pname = "sphinxcontrib-websupport";
+
version = "1.0.1";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9";
+
};
+
+
propagatedBuildInputs = [ six ];
+
+
doCheck = false;
+
+
meta = {
+
description = "Sphinx API for Web Apps";
+
homepage = http://sphinx-doc.org/;
+
license = lib.licenses.bsd2;
+
};
+
}
+9 -9
pkgs/development/python-modules/sqlalchemy/default.nix
···
{ lib
, fetchPypi
, buildPythonPackage
-
, pytest
+
, pytest_30
, mock
, pytest_xdist
, isPy3k
···
buildPythonPackage rec {
pname = "SQLAlchemy";
name = "${pname}-${version}";
-
version = "1.1.12";
+
version = "1.1.13";
src = fetchPypi {
inherit pname version;
-
sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9";
+
sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
};
-
checkInputs = [ pytest mock pytest_xdist ]
-
++ lib.optional (!isPy3k) pysqlite;
-
-
# Test-only dependency pysqlite doesn't build on Python 3. This isn't an
-
# acceptable reason to make all dependents unavailable on Python 3 as well
-
#doCheck = !(isPyPy || isPy3k);
+
checkInputs = [
+
pytest_30
+
mock
+
# Disable pytest_xdist tests for now, because our version seems to be too new.
+
# pytest_xdist
+
] ++ lib.optional (!isPy3k) pysqlite;
checkPhase = ''
py.test
+25
pkgs/development/python-modules/sqlmap/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchPypi
+
}:
+
+
buildPythonPackage rec {
+
pname = "sqlmap";
+
version = "1.1.8";
+
name = "${pname}-${version}";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49";
+
};
+
+
# No tests in archive
+
doCheck = false;
+
+
meta = with lib; {
+
homepage = "http://sqlmap.org";
+
license = licenses.gpl2;
+
description = "Automatic SQL injection and database takeover tool";
+
maintainers = with maintainers; [ bennofs ];
+
};
+
}
+2 -2
pkgs/development/python-modules/stevedore/default.nix
···
buildPythonPackage rec {
pname = "stevedore";
-
version = "1.21.0";
+
version = "1.25.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "12sg88ax0lv2sxr685rqdaxm9gryjrpj4fvax459zvwy1r4n83ma";
+
sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e";
};
doCheck = false;
+2 -2
pkgs/development/python-modules/stripe/default.nix
···
buildPythonPackage rec {
pname = "stripe";
-
version = "1.41.1";
+
version = "1.62.1";
name = "${pname}-${version}";
# Tests require network connectivity and there's no easy way to disable
···
src = fetchPypi {
inherit pname version;
-
sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5";
+
sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679";
};
buildInputs = [ unittest2 mock ];
+2 -2
pkgs/development/python-modules/tqdm/default.nix
···
buildPythonPackage rec {
pname = "tqdm";
-
version = "4.11.2";
+
version = "4.15.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "14baa7a9ea7723d46f60de5f8c6f20e840baa7e3e193bf0d9ec5fe9103a15254";
+
sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953";
};
buildInputs = [ nose coverage glibcLocales flake8 ];
+2 -2
pkgs/development/python-modules/treq/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "treq";
-
version = "17.3.1";
+
version = "17.8.0";
src = fetchPypi {
inherit pname version;
-
sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
+
sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16";
};
propagatedBuildInputs = [ twisted requests six incremental service-identity ];
+2 -2
pkgs/development/python-modules/txaio/default.nix
···
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "txaio";
-
version = "2.7.1";
+
version = "2.8.1";
src = fetchPypi {
inherit pname version;
-
sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly";
+
sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb";
};
buildInputs = [ pytest mock ];
+2 -2
pkgs/development/python-modules/vega/default.nix
···
buildPythonPackage rec {
pname = "vega";
-
version = "0.4.4";
+
version = "0.5.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
+
sha256 = "9871bce3a00bb775d9f7f8212aa237f99f11ca7cfe6ecf246773f5559f20c38c";
};
buildInputs = [ pytest ];
+2 -2
pkgs/development/python-modules/virtualenv/default.nix
···
buildPythonPackage rec {
pname = "virtualenv";
-
version = "15.0.3";
+
version = "15.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d";
+
sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a";
};
# Doubt this is needed - FRidh 2017-07-07
+2 -2
pkgs/development/python-modules/websockets/default.nix
···
let
pname = "websockets";
-
version = "3.3";
+
version = "3.4";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93";
+
sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5";
};
disabled = pythonOlder "3.3";
+2 -2
pkgs/development/python-modules/widgetsnbextension/default.nix
···
buildPythonPackage rec {
pname = "widgetsnbextension";
name = "${pname}-${version}";
-
version = "2.0.0";
+
version = "3.0.2";
src = fetchPypi {
inherit pname version;
-
sha256 = "566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f";
+
sha256 = "e8890d87c80782ee4ea3ed9afffc89a0af8b4ff475d1608d900f728ea55f041c";
};
propagatedBuildInputs = [ notebook ];
+2 -2
pkgs/development/python-modules/xlwt/default.nix
···
buildPythonPackage rec {
pname = "xlwt";
name = "${pname}-${version}";
-
version = "1.2.0";
+
version = "1.3.0";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9";
+
sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88";
};
buildInputs = [ nose ];
+2 -2
pkgs/development/python-modules/yamllint/default.nix
···
buildPythonPackage rec {
pname = "yamllint";
-
version = "0.5.2";
+
version = "1.8.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84";
+
sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c";
};
buildInputs = [ nose ];
+2 -2
pkgs/development/python-modules/yapf/default.nix
···
buildPythonPackage rec {
pname = "yapf";
-
version = "0.16.3";
+
version = "0.17.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2";
+
sha256 = "5472f4c95ab9b9fe9f5bf74ece3c986bfafa1f98ad9e1e296d4c35d291c97856";
};
meta = with stdenv.lib; {
+2 -2
pkgs/development/python-modules/yarl/default.nix
···
let
pname = "yarl";
-
version = "0.10.3";
+
version = "0.12.0";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-
sha256 = "27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138";
+
sha256 = "fc0f71ffdce882b4d4b287b0b3a68d9f2557ab14cc2c10ce4df714c42512cbde";
};
buildInputs = [ pytest pytestrunner ];
+2 -2
pkgs/development/python-modules/zeep/default.nix
···
let
pname = "zeep";
-
version = "2.0.0";
+
version = "2.3.0";
in buildPythonPackage {
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
-
sha256 = "5b9bd6b8772d6b505118c11d6924eb7df0decf12bbbeb43b1c27d781817361ad";
+
sha256 = "b01d81c61d7b7858b7be001615d3c995a371815f5e6902c914fea9beba30b716";
};
propagatedBuildInputs = [
+3 -3
pkgs/development/tools/analysis/valgrind/default.nix
···
{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
stdenv.mkDerivation rec {
-
name = "valgrind-3.12.0";
+
name = "valgrind-3.13.0";
src = fetchurl {
-
url = "http://valgrind.org/downloads/${name}.tar.bz2";
-
sha256 = "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7";
+
url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2";
+
sha256 = "0fqc3684grrbxwsic1rc5ryxzxmigzjx9p5vf3lxa37h0gpq0rnp";
};
outputs = [ "out" "dev" "man" "doc" ];
+6 -1
pkgs/development/tools/misc/binutils/default.nix
···
else "-static-libgcc";
# TODO(@Ericson2314): Always pass "--target" and always prefix.
-
configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ];
+
configurePlatforms =
+
# TODO(@Ericson2314): Figure out what's going wrong with Arm
+
if hostPlatform == targetPlatform && targetPlatform.isArm
+
then []
+
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
configureFlags =
[ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
+2 -2
pkgs/development/tools/mypy/default.nix
···
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "mypy";
-
version = "0.511";
+
version = "0.521";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
-
sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z";
+
sha256 = "9d30df20cd937b80cfc6007d75426f27a232789cfa288c63bf9370f2542c9658";
};
propagatedBuildInputs = [ lxml typed-ast ];
+3 -1
pkgs/misc/themes/e17gtk/default.nix
···
{ stdenv, fetchFromGitHub, gnome3 }:
-
+
let
+
gnome3 = { version = "3.22"; }; # FIXME
+
in
stdenv.mkDerivation rec {
name = "e17gtk-${version}";
version = "${gnome3.version}.1";
+1 -1
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
···
{ stdenv, cctools, appleDerivation }:
appleDerivation {
-
buildInputs = [ cctools ];
+
nativeBuildInputs = [ cctools ];
postPatch = ''
substituteInPlace makefile \
+2 -2
pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
···
appleDerivation {
phases = [ "unpackPhase" "installPhase" ];
-
buildInputs = [ ed unifdef ];
+
nativeBuildInputs = [ ed unifdef ];
installPhase = ''
export SRCROOT=$PWD
···
export PRIVATE_HEADERS_FOLDER_PATH=include
bash xcodescripts/headers.sh
'';
-
}
+
}
+1 -1
pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
···
appleDerivation {
phases = [ "unpackPhase" "installPhase" ];
-
buildInputs = [ ed unifdef ];
+
nativeBuildInputs = [ ed unifdef ];
# TODO: asl.h actually comes from syslog project now
installPhase = ''
+1 -1
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
···
appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
-
buildInputs = [ cpio ];
+
nativeBuildInputs = [ cpio ];
installPhase = ''
export NIX_ENFORCE_PURITY=
+2 -1
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
···
};
in appleDerivation {
-
buildInputs = [ bsdmake perl yacc flex ];
+
nativeBuildInputs = [ bsdmake perl yacc flex ];
+
buildInputs = [ flex ];
patchPhase = ''
substituteInPlace BSDmakefile \
+2 -2
pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
···
{ stdenv, appleDerivation, yacc, flex }:
appleDerivation {
-
buildInputs = [ yacc flex ];
+
nativeBuildInputs = [ yacc flex ];
buildPhase = ''
cd migcom.tproj
···
--replace '/bin/rmdir' "rmdir" \
--replace 'C=''${MIGCC}' "C=cc"
'';
-
}
+
}
+3 -3
pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
···
{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
appleDerivation {
-
buildInputs = [ makeWrapper ];
+
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace mk/bsd.prog.mk \
···
for file in $(find . -name '*.c'); do
obj="$(basename "$file" .c).o"
objs+=("$obj")
-
cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
+
$CC -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
done
-
cc "''${objs[@]}" -o bsdmake
+
$CC "''${objs[@]}" -o bsdmake
'';
installPhase = ''
+2 -1
pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
···
appleDerivation {
meta.broken = stdenv.cc.nativeLibc;
-
buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ];
+
nativeBuildInputs = [ bootstrap_cmds ];
+
buildInputs = [ launchd ppp IOKit eap8021x ];
propagatedBuildInputs = [ Security ];
+2 -1
pkgs/os-specific/darwin/cctools/port.nix
···
sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
};
-
buildInputs = [ autoconf automake libtool_2 libuuid ] ++
+
nativeBuildInputs = [ autoconf automake libtool_2 ];
+
buildInputs = [ libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
+19 -25
pkgs/os-specific/linux/kernel-headers/4.4.nix
···
-
{ stdenv, fetchurl, perl, cross ? null }:
+
{ stdenvNoCC, lib, buildPackages
+
, buildPlatform, hostPlatform
+
, fetchurl, perl
+
}:
-
assert cross == null -> stdenv.isLinux;
+
assert hostPlatform.isLinux;
let
-
version = "4.4.10";
-
-
kernelHeadersBaseConfig =
-
if cross == null
-
then stdenv.platform.kernelHeadersBaseConfig
-
else cross.platform.kernelHeadersBaseConfig;
-
+
inherit (hostPlatform.platform) kernelHeadersBaseConfig;
in
-
stdenv.mkDerivation {
+
stdenvNoCC.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
···
sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
};
-
targetConfig = if cross != null then cross.config else null;
+
targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;
-
platform =
-
if cross != null then cross.platform.kernelArch else
-
if stdenv.system == "i686-linux" then "i386" else
-
if stdenv.system == "x86_64-linux" then "x86_64" else
-
if stdenv.system == "powerpc-linux" then "powerpc" else
-
if stdenv.isArm then "arm" else
-
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
-
abort "don't know what the kernel include directory is called for this platform";
+
platform = hostPlatform.platform.kernelArch or (
+
if hostPlatform.system == "i686-linux" then "i386" else
+
if hostPlatform.system == "x86_64-linux" then "x86_64" else
+
if hostPlatform.system == "powerpc-linux" then "powerpc" else
+
if hostPlatform.isArm then "arm" else
+
abort "don't know what the kernel include directory is called for this platform");
-
buildInputs = [perl];
+
# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
+
# We do this so we have a build->build, not build->host, C compiler.
+
nativeBuildInputs = [ buildPackages.stdenv.cc perl ];
-
extraIncludeDirs =
-
if cross != null then
-
(if cross.arch == "powerpc" then ["ppc"] else [])
-
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+
extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];
buildPhase = ''
if test -n "$targetConfig"; then
···
fi
'';
-
meta = with stdenv.lib; {
+
meta = with lib; {
description = "Header files and scripts for Linux kernel";
license = licenses.gpl2;
platforms = platforms.linux;
+11 -4
pkgs/stdenv/darwin/default.nix
···
stageFun = step: last: {shell ? "${bootstrapTools}/bin/bash",
overrides ? (self: super: {}),
extraPreHook ? "",
+
extraNativeBuildInputs,
extraBuildInputs,
allowedRequisites ? null}:
let
thisStdenv = import ../generic {
-
inherit config shell extraBuildInputs;
+
inherit config shell extraNativeBuildInputs extraBuildInputs;
allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
thisStdenv.cc.expand-response-params
];
···
};
+
extraNativeBuildInputs = [];
extraBuildInputs = [];
};
···
persistent = _: _: {};
in with prevStage; stageFun 1 prevStage {
extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
+
extraNativeBuildInputs = [];
extraBuildInputs = [ pkgs.libcxx ];
allowedRequisites =
···
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
'';
-
extraBuildInputs = with pkgs; [ xz darwin.CF libcxx ];
+
extraNativeBuildInputs = [ pkgs.xz ];
+
extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
allowedRequisites =
[ bootstrapTools ] ++
···
# enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
# and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
# patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-
extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+
extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+
extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
extraPreHook = ''
export PATH=${pkgs.bash}/bin:$PATH
···
};
in with prevStage; stageFun 4 prevStage {
shell = "${pkgs.bash}/bin/bash";
-
extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+
extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+
extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
extraPreHook = ''
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
'';
···
libc = pkgs.darwin.Libsystem;
};
+
extraNativeBuildInputs = [];
extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
extraAttrs = {
+1
pkgs/stdenv/generic/builder.sh
···
echo "export SHELL=$shell" > $out/setup
echo "initialPath=\"$initialPath\"" >> $out/setup
echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
+
echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup
echo "$preHook" >> $out/setup
cat "$setup" >> $out/setup
+14 -8
pkgs/stdenv/generic/default.nix
···
, setupScript ? ./setup.sh
+
, extraNativeBuildInputs ? []
, extraBuildInputs ? []
, __stdenvImpureHostDeps ? []
, __extraImpureHostDeps ? []
···
}:
let
-
defaultNativeBuildInputs = extraBuildInputs ++
+
defaultNativeBuildInputs = extraNativeBuildInputs ++
[ ../../build-support/setup-hooks/move-docs.sh
../../build-support/setup-hooks/compress-man-pages.sh
../../build-support/setup-hooks/strip.sh
···
cc
];
+
defaultBuildInputs = extraBuildInputs;
+
# The stdenv that we are producing.
stdenv =
derivation (
-
(if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
-
{
+
lib.optionalAttrs (allowedRequisites != null) {
+
allowedRequisites = allowedRequisites
+
++ defaultNativeBuildInputs ++ defaultBuildInputs;
+
}
+
// {
inherit name;
# Nix itself uses the `system` field of a derivation to decide where to
···
setup = setupScript;
-
inherit preHook initialPath shell defaultNativeBuildInputs;
+
inherit preHook initialPath shell
+
defaultNativeBuildInputs defaultBuildInputs;
}
// lib.optionalAttrs buildPlatform.isDarwin {
__sandboxProfile = stdenvSandboxProfile;
···
inherit buildPlatform hostPlatform targetPlatform;
-
inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
+
inherit extraNativeBuildInputs extraBuildInputs
+
__extraImpureHostDeps extraSandboxProfile;
# Utility flags to test the type of platform.
inherit (hostPlatform)
isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
-
isi686 isx86_64 is64bit isMips isBigEndian;
-
isArm = hostPlatform.isArm32;
-
isAarch64 = hostPlatform.isArm64;
+
isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian;
# Whether we should run paxctl to pax-mark binaries.
needsPax = isLinux;
+12 -4
pkgs/stdenv/generic/make-derivation.nix
···
"sandboxProfile" "propagatedSandboxProfile"])
// (let
computedSandboxProfile =
-
lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies);
+
lib.concatMap (input: input.__propagatedSandboxProfile or [])
+
(stdenv.extraNativeBuildInputs
+
++ stdenv.extraBuildInputs
+
++ lib.concatLists dependencies);
computedPropagatedSandboxProfile =
-
lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies);
+
lib.concatMap (input: input.__propagatedSandboxProfile or [])
+
(lib.concatLists propagatedDependencies);
computedImpureHostDeps =
-
lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies));
+
lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+
(stdenv.extraNativeBuildInputs
+
++ stdenv.extraBuildInputs
+
++ lib.concatLists dependencies));
computedPropagatedImpureHostDeps =
-
lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies));
+
lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+
(lib.concatLists propagatedDependencies));
in
{
name = name + lib.optionalString
+177 -103
pkgs/stdenv/generic/setup.sh
···
-
set -e
+
set -eu
set -o pipefail
: ${outputs:=out}
···
# code). The hooks for <hookName> are the shell function or variable
# <hookName>, and the values of the shell array ‘<hookName>Hooks’.
runHook() {
+
local oldOpts="$(shopt -po nounset)"
+
set -u # May be called from elsewhere, so do `set -u`.
+
local hookName="$1"
shift
-
local var="$hookName"
-
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+
local hooksSlice="${hookName%Hook}Hooks[@]"
-
local varRef="$var[@]"
local hook
-
for hook in "_callImplicitHook 0 $hookName" "${!varRef}"; do
+
# Hack around old bash being bad and thinking empty arrays are
+
# undefined.
+
for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
_eval "$hook" "$@"
+
set -u # To balance `_eval`
done
+
+
eval "${oldOpts}"
return 0
}
···
# Run all hooks with the specified name, until one succeeds (returns a
# zero exit code). If none succeed, return a non-zero exit code.
runOneHook() {
+
local oldOpts="$(shopt -po nounset)"
+
set -u # May be called from elsewhere, so do `set -u`.
+
local hookName="$1"
shift
-
local var="$hookName"
-
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+
local hooksSlice="${hookName%Hook}Hooks[@]"
-
local varRef="$var[@]"
-
local hook
-
for hook in "_callImplicitHook 1 $hookName" "${!varRef}"; do
+
local hook ret=1
+
# Hack around old bash like above
+
for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
if _eval "$hook" "$@"; then
-
return 0
+
ret=0
+
break
fi
+
set -u # To balance `_eval`
done
-
return 1
+
+
eval "${oldOpts}"
+
return "$ret"
}
···
# environment variables) and from shell scripts (as functions). If you
# want to allow multiple hooks, use runHook instead.
_callImplicitHook() {
+
set -u
local def="$1"
local hookName="$2"
case "$(type -t "$hookName")" in
-
(function|alias|builtin) "$hookName";;
-
(file) source "$hookName";;
+
(function|alias|builtin)
+
set +u
+
"$hookName";;
+
(file)
+
set +u
+
source "$hookName";;
(keyword) :;;
-
(*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;;
+
(*) if [ -z "${!hookName:-}" ]; then
+
return "$def";
+
else
+
set +u
+
eval "${!hookName}"
+
fi;;
esac
+
# `_eval` expects hook to need nounset disable and leave it
+
# disabled anyways, so Ok to to delegate. The alternative of a
+
# return trap is no good because it would affect nested returns.
}
# A function wrapper around ‘eval’ that ensures that ‘return’ inside
-
# hooks exits the hook, not the caller.
+
# hooks exits the hook, not the caller. Also will only pass args if
+
# command can take them
_eval() {
-
local code="$1"
-
shift
-
if [ "$(type -t "$code")" = function ]; then
-
eval "$code \"\$@\""
+
if [ "$(type -t "$1")" = function ]; then
+
set +u
+
"$@" # including args
else
-
eval "$code"
+
set +u
+
eval "$1"
fi
+
# `run*Hook` reenables `set -u`
}
···
exitCode="$?"
set +e
-
if [ -n "$showBuildStats" ]; then
+
if [ -n "${showBuildStats:-}" ]; then
times > "$NIX_BUILD_TOP/.times"
local -a times=($(cat "$NIX_BUILD_TOP/.times"))
# Print the following statistics:
···
echo "build time elapsed: " "${times[@]}"
fi
-
if [ "$exitCode" != 0 ]; then
+
if (( "$exitCode" != 0 )); then
runHook failureHook
# If the builder had a non-zero exit code and
# $succeedOnFailure is set, create the file
# ‘$out/nix-support/failed’ to signal failure, and exit
# normally. Otherwise, return the original exit code.
-
if [ -n "$succeedOnFailure" ]; then
+
if [ -n "${succeedOnFailure:-}" ]; then
echo "build failed with exit code $exitCode (ignored)"
mkdir -p "$out/nix-support"
printf "%s" "$exitCode" > "$out/nix-support/failed"
···
local varName="$2"
local dir="$3"
if [ -d "$dir" ]; then
-
export "${varName}=${!varName}${!varName:+$delimiter}${dir}"
+
export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"
fi
}
···
# The function is used in multiple-outputs.sh hook,
# so it is defined here but tried after the hook.
_addRpathPrefix() {
-
if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
+
if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then
export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-
if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
+
if [ -n "${NIX_LIB64_IN_SELF_RPATH:-}" ]; then
export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
fi
-
if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
+
if [ -n "${NIX_LIB32_IN_SELF_RPATH:-}" ]; then
export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
fi
fi
···
addToSearchPath PATH "$i/bin"
done
-
if [ "$NIX_DEBUG" = 1 ]; then
+
if [ "${NIX_DEBUG:-}" = 1 ]; then
echo "initial path: $PATH"
fi
# Check that the pre-hook initialised SHELL.
-
if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
+
if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
BASH="$SHELL"
export CONFIG_SHELL="$SHELL"
···
# Execute the pre-hook.
-
if [ -z "$shell" ]; then export shell="$SHELL"; fi
+
if [ -z "${shell:-}" ]; then export shell="$SHELL"; fi
runHook preHook
···
# nix-shell doesn't use impure bash. This should replace the O(n)
# case with an O(1) hash map lookup, assuming bash is implemented
# well :D.
-
local varRef="$var[*]"
-
-
case "${!varRef}" in
+
local varSlice="$var[*]"
+
# ${..-} to hack around old bash empty array problem
+
case "${!varSlice-}" in
*" $pkg "*) return 0 ;;
esac
+
unset -v varSlice
eval "$var"'+=("$pkg")'
···
fi
if [ -f "$pkg" ]; then
+
local oldOpts="$(shopt -po nounset)"
+
set +u
source "$pkg"
+
eval "$oldOpts"
fi
if [ -d "$pkg/bin" ]; then
···
fi
if [ -f "$pkg/nix-support/setup-hook" ]; then
+
local oldOpts="$(shopt -po nounset)"
+
set +u
source "$pkg/nix-support/setup-hook"
+
eval "$oldOpts"
fi
if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
···
fi
}
-
if [ -z "$crossConfig" ]; then
+
declare -a nativePkgs crossPkgs
+
if [ -z "${crossConfig:-}" ]; then
# Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
# are handled identically to nativeBuildInputs
-
declare -a nativePkgs
-
for i in $nativeBuildInputs $buildInputs \
-
$defaultNativeBuildInputs $defaultBuildInputs \
-
$propagatedNativeBuildInputs $propagatedBuildInputs; do
+
for i in ${nativeBuildInputs:-} ${buildInputs:-} \
+
${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \
+
${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do
findInputs "$i" nativePkgs propagated-native-build-inputs
done
else
-
declare -a crossPkgs
-
for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
+
for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do
findInputs "$i" crossPkgs propagated-build-inputs
done
declare -a nativePkgs
-
for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
+
for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do
findInputs "$i" nativePkgs propagated-native-build-inputs
done
fi
···
runHook envHook "$pkg"
}
-
for i in "${nativePkgs[@]}"; do
+
# Old bash empty array hack
+
for i in ${nativePkgs+"${nativePkgs[@]}"}; do
_addToNativeEnv "$i"
done
···
runHook crossEnvHook "$pkg"
}
-
for i in "${crossPkgs[@]}"; do
+
# Old bash empty array hack
+
for i in ${crossPkgs+"${crossPkgs[@]}"}; do
_addToCrossEnv "$i"
done
···
# Set the prefix. This is generally $out, but it can be overriden,
# for instance if we just want to perform a test build/install to a
# temporary location and write a build report to $out.
-
if [ -z "$prefix" ]; then
+
if [ -z "${prefix:-}" ]; then
prefix="$out";
fi
-
if [ "$useTempPrefix" = 1 ]; then
+
if [ "${useTempPrefix:-}" = 1 ]; then
prefix="$NIX_BUILD_TOP/tmp_prefix";
fi
-
PATH=$_PATH${_PATH:+:}$PATH
-
if [ "$NIX_DEBUG" = 1 ]; then
+
PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH"
+
if [ "${NIX_DEBUG:-}" = 1 ]; then
echo "final path: $PATH"
fi
···
# Prevent OpenSSL-based applications from using certificates in
# /etc/ssl.
# Leave it in shells for convenience.
-
if [ -z "$SSL_CERT_FILE" ] && [ -z "$IN_NIX_SHELL" ]; then
+
if [ -z "${SSL_CERT_FILE:-}" ] && [ -z "${IN_NIX_SHELL:-}" ]; then
export SSL_CERT_FILE=/no-cert-file.crt
fi
···
# Select all environment variables that start with a lowercase character.
for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
-
if [ "$NIX_DEBUG" = "1" ]; then
+
if [ "${NIX_DEBUG:-}" = "1" ]; then
echo "@${varName}@ -> '${!varName}'"
fi
args+=("--subst-var" "$varName")
···
# then go to the build directory and source in `env-vars' to reproduce
# the environment used for building.
dumpVars() {
-
if [ "$noDumpEnvVars" != 1 ]; then
+
if [ "${noDumpEnvVars:-0}" != 1 ]; then
export > "$NIX_BUILD_TOP/env-vars" || true
fi
}
···
unpackPhase() {
runHook preUnpack
-
if [ -z "$srcs" ]; then
-
if [ -z "$src" ]; then
+
if [ -z "${srcs:-}" ]; then
+
if [ -z "${src:-}" ]; then
# shellcheck disable=SC2016
echo 'variable $src or $srcs should point to the source'
exit 1
···
done
# Find the source directory.
-
if [ -n "$setSourceRoot" ]; then
+
+
# set to empty if unset
+
: ${sourceRoot=}
+
+
if [ -n "${setSourceRoot:-}" ]; then
runOneHook setSourceRoot
elif [ -z "$sourceRoot" ]; then
-
sourceRoot=
for i in *; do
if [ -d "$i" ]; then
case $dirsBefore in
···
# By default, add write permission to the sources. This is often
# necessary when sources have been copied from other store
# locations.
-
if [ "$dontMakeSourcesWritable" != 1 ]; then
+
if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
chmod -R u+w "$sourceRoot"
fi
···
patchPhase() {
runHook prePatch
-
for i in $patches; do
+
for i in ${patches:-}; do
header "applying patch $i" 3
local uncompress=cat
case "$i" in
···
configurePhase() {
runHook preConfigure
+
# set to empty if unset
+
: ${configureScript=}
+
: ${configureFlags=}
+
if [[ -z "$configureScript" && -x ./configure ]]; then
configureScript=./configure
fi
-
if [ -z "$dontFixLibtool" ]; then
+
if [ -z "${dontFixLibtool:-}" ]; then
local i
find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do
echo "fixing libtool script $i"
···
done
fi
-
if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then
+
if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then
configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
fi
# Add --disable-dependency-tracking to speed up some builds.
-
if [ -z "$dontAddDisableDepTrack" ]; then
+
if [ -z "${dontAddDisableDepTrack:-}" ]; then
if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then
configureFlags="--disable-dependency-tracking $configureFlags"
fi
fi
# By default, disable static builds.
-
if [ -z "$dontDisableStatic" ]; then
+
if [ -z "${dontDisableStatic:-}" ]; then
if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then
configureFlags="--disable-static $configureFlags"
fi
fi
if [ -n "$configureScript" ]; then
+
# Old bash empty array hack
# shellcheck disable=SC2086
-
local flagsArray=($configureFlags "${configureFlagsArray[@]}")
+
local flagsArray=(
+
$configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"}
+
)
echoCmd 'configure flags' "${flagsArray[@]}"
# shellcheck disable=SC2086
$configureScript "${flagsArray[@]}"
···
buildPhase() {
runHook preBuild
-
if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+
# set to empty if unset
+
: ${makeFlags=}
+
+
if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
echo "no Makefile, doing nothing"
else
# See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
makeFlags="SHELL=$SHELL $makeFlags"
+
# Old bash empty array hack
# shellcheck disable=SC2086
-
local flagsArray=( \
-
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-
$makeFlags "${makeFlagsArray[@]}" \
-
$buildFlags "${buildFlagsArray[@]}")
+
local flagsArray=(
+
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+
$buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
+
)
echoCmd 'build flags' "${flagsArray[@]}"
make ${makefile:+-f $makefile} "${flagsArray[@]}"
···
checkPhase() {
runHook preCheck
+
# Old bash empty array hack
# shellcheck disable=SC2086
-
local flagsArray=( \
-
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-
$makeFlags "${makeFlagsArray[@]}" \
-
${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check})
+
local flagsArray=(
+
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+
${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
+
${checkTarget:-check}
+
)
echoCmd 'check flags' "${flagsArray[@]}"
make ${makefile:+-f $makefile} "${flagsArray[@]}"
···
installTargets="${installTargets:-install}"
+
# Old bash empty array hack
# shellcheck disable=SC2086
-
local flagsArray=( $installTargets \
-
$makeFlags "${makeFlagsArray[@]}" \
-
$installFlags "${installFlagsArray[@]}")
+
local flagsArray=(
+
$installTargets
+
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+
$installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
+
)
echoCmd 'install flags' "${flagsArray[@]}"
make ${makefile:+-f $makefile} "${flagsArray[@]}"
···
# Propagate build inputs and setup hook into the development output.
-
if [ -z "$crossConfig" ]; then
+
if [ -z "${crossConfig:-}" ]; then
# Not cross-compiling - propagatedBuildInputs are handled identically to propagatedNativeBuildInputs
local propagated="$propagatedNativeBuildInputs"
-
if [ -n "$propagatedBuildInputs" ]; then
+
if [ -n "${propagatedBuildInputs:-}" ]; then
propagated+="${propagated:+ }$propagatedBuildInputs"
fi
-
if [ -n "$propagated" ]; then
+
if [ -n "${propagated:-}" ]; then
mkdir -p "${!outputDev}/nix-support"
# shellcheck disable=SC2086
printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
fi
else
-
if [ -n "$propagatedBuildInputs" ]; then
+
if [ -n "${propagatedBuildInputs:-}" ]; then
mkdir -p "${!outputDev}/nix-support"
# shellcheck disable=SC2086
printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
fi
-
if [ -n "$propagatedNativeBuildInputs" ]; then
+
if [ -n "${propagatedNativeBuildInputs:-}" ]; then
mkdir -p "${!outputDev}/nix-support"
# shellcheck disable=SC2086
printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
fi
fi
-
if [ -n "$setupHook" ]; then
+
if [ -n "${setupHook:-}" ]; then
mkdir -p "${!outputDev}/nix-support"
substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"
fi
# Propagate user-env packages into the output with binaries, TODO?
-
if [ -n "$propagatedUserEnvPkgs" ]; then
+
if [ -n "${propagatedUserEnvPkgs:-}" ]; then
mkdir -p "${!outputBin}/nix-support"
# shellcheck disable=SC2086
printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
···
installCheckPhase() {
runHook preInstallCheck
+
# Old bash empty array hack
# shellcheck disable=SC2086
-
local flagsArray=( \
-
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-
$makeFlags "${makeFlagsArray[@]}" \
-
$installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck})
+
local flagsArray=(
+
${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+
$installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+
${installCheckTarget:-installcheck}
+
)
echoCmd 'installcheck flags' "${flagsArray[@]}"
make ${makefile:+-f $makefile} "${flagsArray[@]}"
···
distPhase() {
runHook preDist
+
# Old bash empty array hack
# shellcheck disable=SC2086
-
local flagsArray=($distFlags "${distFlagsArray[@]}" ${distTarget:-dist})
+
local flagsArray=(
+
$distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
+
)
echo 'dist flags: %q' "${flagsArray[@]}"
make ${makefile:+-f $makefile} "${flagsArray[@]}"
-
if [ "$dontCopyDist" != 1 ]; then
+
if [ "${dontCopyDist:-0}" != 1 ]; then
mkdir -p "$out/tarballs"
# Note: don't quote $tarballs, since we explicitly permit
···
genericBuild() {
-
if [ -f "$buildCommandPath" ]; then
-
. "$buildCommandPath"
+
if [ -f "${buildCommandPath:-}" ]; then
+
local oldOpts="$(shopt -po nounset)"
+
set +u
+
source "$buildCommandPath"
+
eval "$oldOpts"
return
fi
-
if [ -n "$buildCommand" ]; then
+
if [ -n "${buildCommand:-}" ]; then
+
local oldOpts="$(shopt -po nounset)"
+
set +u
eval "$buildCommand"
+
eval "$oldOpts"
return
fi
-
if [ -z "$phases" ]; then
-
phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
-
configurePhase $preBuildPhases buildPhase checkPhase \
-
$preInstallPhases installPhase $preFixupPhases fixupPhase installCheckPhase \
-
$preDistPhases distPhase $postPhases";
+
if [ -z "${phases:-}" ]; then
+
phases="${prePhases:-} unpackPhase patchPhase ${preConfigurePhases:-} \
+
configurePhase ${preBuildPhases:-} buildPhase checkPhase \
+
${preInstallPhases:-} installPhase ${preFixupPhases:-} fixupPhase installCheckPhase \
+
${preDistPhases:-} distPhase ${postPhases:-}";
fi
for curPhase in $phases; do
-
if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi
-
if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi
-
if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi
-
if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi
-
if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi
-
if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi
+
if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi
+
if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi
+
if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi
+
if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then continue; fi
+
if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi
+
if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi
-
if [[ -n "$tracePhases" ]]; then
+
if [[ -n "${tracePhases:-}" ]]; then
echo
echo "@ phase-started $out $curPhase"
fi
···
# Evaluate the variable named $curPhase if it exists, otherwise the
# function named $curPhase.
+
local oldOpts="$(shopt -po nounset)"
+
set +u
eval "${!curPhase:-$curPhase}"
+
eval "$oldOpts"
if [ "$curPhase" = unpackPhase ]; then
cd "${sourceRoot:-.}"
fi
-
if [ -n "$tracePhases" ]; then
+
if [ -n "${tracePhases:-}" ]; then
echo
echo "@ phase-succeeded $out $curPhase"
fi
···
dumpVars
+
+
# Disable nounset for nix-shell.
+
set +u
+10 -7
pkgs/stdenv/linux/default.nix
···
# the bootstrap. In all stages, we build an stdenv and the package
# set that can be built with that stdenv.
stageFun = prevStage:
-
{ name, overrides ? (self: super: {}), extraBuildInputs ? [] }:
+
{ name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }:
let
···
buildPlatform = localSystem;
hostPlatform = localSystem;
targetPlatform = localSystem;
-
inherit config extraBuildInputs;
+
inherit config extraNativeBuildInputs;
preHook =
''
# Don't patch #!/interpreter because it leads to retained
···
isl = isl_0_14;
};
};
-
extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
})
···
shell = self.bash + "/bin/bash";
};
};
-
extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
+
extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
})
···
initialPath =
((import ../common-path.nix) {pkgs = prevStage;});
-
extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+
extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
···
gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
]
# Library dependencies
-
++ map getLib [ attr acl zlib pcre libsigsegv ]
+
++ map getLib (
+
[ attr acl zlib pcre ]
+
++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
+
)
# More complicated cases
++ [
glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
-
gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
+
gcc gcc.cc gcc.cc.lib gcc.expand-response-params
]
++ lib.optionals (system == "aarch64-linux")
[ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
+4 -4
pkgs/stdenv/native/default.nix
···
export lt_cv_deplibs_check_method=pass_all
'';
-
extraBuildInputsCygwin = [
+
extraNativeBuildInputsCygwin = [
../cygwin/all-buildinputs-as-runtimedep.sh
../cygwin/wrap-exes-to-find-dlls.sh
] ++ (if system == "i686-cygwin" then [
···
if system == "x86_64-cygwin" then prehookCygwin else
prehookBase;
-
extraBuildInputs =
-
if system == "i686-cygwin" then extraBuildInputsCygwin else
-
if system == "x86_64-cygwin" then extraBuildInputsCygwin else
+
extraNativeBuildInputs =
+
if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
+
if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
[];
initialPath = extraPath ++ path;
+6 -8
pkgs/tools/inputmethods/ibus/default.nix
···
sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7";
};
};
+
pyEnv = python3.buildEnv.override {
+
extraLibs = [ python3.pkgs.pygobject3 ];
+
};
in stdenv.mkDerivation rec {
name = "ibus-${version}";
version = "1.5.16";
···
];
buildInputs = [
-
python3
+
pyEnv
intltool isocodes pkgconfig
gtk2 gtk3 dconf
json_glib
dbus libnotify gobjectIntrospection wayland
];
-
propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ];
+
propagatedBuildInputs = [ glib ];
-
nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ];
+
nativeBuildInputs = [ wrapGAppsHook ];
outputs = [ "out" "dev" ];
···
# Don't try to generate a system-wide dconf database; it wouldn't work.
substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
-
'';
-
-
postFixup = ''
-
buildPythonPath $out
-
patchPythonScript $out/share/ibus/setup/main.py
'';
doInstallCheck = true;
+34
pkgs/tools/misc/bepasty/default.nix
···
+
{ python
+
, lib
+
}:
+
+
with python.pkgs;
+
+
buildPythonApplication rec {
+
pname = "bepasty";
+
version = "0.4.0";
+
name = "${pname}-${version}";
+
+
propagatedBuildInputs = [
+
flask
+
pygments
+
xstatic
+
xstatic-bootbox
+
xstatic-bootstrap
+
xstatic-jquery
+
xstatic-jquery-file-upload
+
xstatic-jquery-ui
+
xstatic-pygments
+
];
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
+
};
+
+
meta = {
+
homepage = http://github.com/bepasty/bepasty-server;
+
description = "Binary pastebin server";
+
license = lib.licenses.mit;
+
maintainers = [ lib.maintainers.makefu ];
+
};
+
}
+10 -2
pkgs/tools/misc/colord/default.nix
···
{ stdenv, fetchurl, bash-completion
, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-
, gtk_doc, gobjectIntrospection, argyllcms
+
, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook
, libgudev, sane-backends }:
stdenv.mkDerivation rec {
···
url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
};
+
nativeBuildInputs = [ autoreconfHook intltool ];
enableParallelBuilding = true;
+
# Version mismatch requires intltoolize to overwrite
+
# with newer version.
+
preConfigure = ''
+
intltoolize --force
+
'';
+
configureFlags = [
"--enable-sane"
"--with-udevrulesdir=$(out)/lib/udev/rules.d"
···
"--disable-bash-completion"
];
+
# don't touch /var at install time, colord creates what it needs at runtime
postPatch = ''
sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
'';
-
buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
+
buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
bash-completion argyllcms libgudev sane-backends ];
postInstall = ''
+9 -7
pkgs/tools/misc/rmlint/default.nix
···
-
{ stdenv, fetchurl
-
, gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
+
{ stdenv, fetchFromGitHub,
+
gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "rmlint-${version}";
-
version = "2.4.4";
+
version = "2.6.1";
-
src = fetchurl {
-
url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-
sha256 = "1g38wmf58m9lbdngfsbz3dbkd44yqxppzvgi5mwag0w7r7khhir9";
+
src = fetchFromGitHub {
+
owner = "sahib";
+
repo = "rmlint";
+
rev = "v${version}";
+
sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8";
};
configurePhase = "scons config";
···
meta = {
description = "Extremely fast tool to remove duplicates and other lint from your filesystem";
-
homepage = http://rmlint.readthedocs.org;
+
homepage = https://rmlint.readthedocs.org;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = [ maintainers.koral ];
+2 -6
pkgs/tools/networking/curl/default.nix
···
assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec {
-
name = "curl-7.55.0";
+
name = "curl-7.55.1";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
-
sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg";
+
sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
···
CXXCPP = "g++ -E";
postInstall = ''
-
pushd docs/libcurl
-
make install
-
popd
-
moveToOutput bin/curl-config "$dev"
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''
+7 -6
pkgs/tools/networking/tcpdump/default.nix
···
-
{ stdenv, fetchurl, libpcap, enableStatic ? false
+
{ stdenv, fetchFromGitHub, libpcap, enableStatic ? false
, hostPlatform
}:
stdenv.mkDerivation rec {
name = "tcpdump-${version}";
-
version = "4.9.0";
+
version = "4.9.1";
-
src = fetchurl {
-
#url = "http://www.tcpdump.org/release/${name}.tar.gz";
-
url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz";
-
sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga";
+
src = fetchFromGitHub rec {
+
owner = "the-tcpdump-group";
+
repo = "tcpdump";
+
rev = "${repo}-${version}";
+
sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
};
buildInputs = [ libpcap ];
+2 -2
pkgs/tools/networking/unbound/default.nix
···
stdenv.mkDerivation rec {
name = "unbound-${version}";
-
version = "1.6.4";
+
version = "1.6.5";
src = fetchurl {
url = "http://unbound.net/downloads/${name}.tar.gz";
-
sha256 = "1vbzfzp932nhii5vq7z7rpczdyv624p17sy9hj1cn763ds0qh2nz";
+
sha256 = "0khhrj11yhh6a0h578w29yw2j7yzvaqkr4p44jzjapq1549am5z2";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
+35 -27
pkgs/tools/text/gawk/default.nix
···
-
{ stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false
-
, locale ? null }:
+
{ stdenv, fetchurl
+
# TODO: links -lsigsegv but loses the reference for some reason
+
, withSigsegv ? (false && stdenv.system != "x86_64-cygwin"), libsigsegv
+
, interactive ? false, readline
+
+
/* Test suite broke on:
+
stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
+
|| stdenv.isDarwin # XXX: `locale' segfaults
+
|| stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff?
+
|| stdenv.isFreeBSD
+
*/
+
, doCheck ? (interactive && stdenv.isLinux), glibcLocales ? null
+
, locale ? null
+
}:
+
+
assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
let
inherit (stdenv.lib) optional;
···
};
# When we do build separate interactive version, it makes sense to always include man.
-
outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man";
+
outputs = [ "out" "info" ] ++ optional (!interactive) "man";
-
# FIXME: 4.1.4 testsuite breaks when only C locales are available
-
doCheck = false /*!(
-
stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
-
|| stdenv.isDarwin # XXX: `locale' segfaults
-
|| stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff?
-
|| stdenv.isFreeBSD
-
)*/;
+
nativeBuildInputs = optional (doCheck && stdenv.isLinux) glibcLocales;
-
nativeBuildInputs = [ xz.bin ];
buildInputs =
-
stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
-
++ stdenv.lib.optional interactive readline
-
++ stdenv.lib.optional stdenv.isDarwin locale;
+
optional withSigsegv libsigsegv
+
++ optional interactive readline
+
++ optional stdenv.isDarwin locale;
-
configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
-
++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
+
configureFlags = [
+
(if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv")
+
(if interactive then "--with-readline=${readline.dev}" else "--without-readline")
+
];
+
+
inherit doCheck;
+
+
postInstall = ''
+
rm "$out"/bin/gawk-*
+
ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
+
'';
-
postInstall =
-
if interactive then
-
''
-
rm "$out"/bin/gawk-*
-
ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
-
''
-
else # TODO: remove this other branch on a stdenv rebuild
-
''
-
rm $out/bin/gawk-*
-
ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
-
'';
+
passthru = {
+
libsigsegv = if withSigsegv then libsigsegv else null; # for stdenv bootstrap
+
};
meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/gawk/;
+6 -11
pkgs/top-level/all-packages.nix
···
pythonPackages = python2Packages;
};
+
bepasty = callPackage ../tools/misc/bepasty { };
+
bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;
bgs = callPackage ../tools/X11/bgs { };
···
burp = callPackage ../tools/backup/burp { };
-
buku = callPackage ../applications/misc/buku {
-
pythonPackages = python3Packages;
-
};
+
buku = callPackage ../applications/misc/buku { };
byzanz = callPackage ../applications/video/byzanz {};
···
spiped = callPackage ../tools/networking/spiped { };
sqliteman = callPackage ../applications/misc/sqliteman { };
-
-
sqlmap = callPackage ../applications/misc/sqlmap { };
stdman = callPackage ../data/documentation/stdman { };
···
lkl = callPackage ../applications/virtualization/lkl { };
-
linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
-
cross = if targetPlatform != hostPlatform then targetPlatform else null;
-
};
+
linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };
linuxHeaders = linuxHeaders_4_4;
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
···
uclibc = callPackage ../os-specific/linux/uclibc { };
uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-
inherit (buildPackages) linuxHeaders;
gccCross = gccCrossStageStatic;
cross = assert targetPlatform != buildPlatform; targetPlatform;
});
···
libcanberra = self.libcanberra_gtk2;
});
-
gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
+
gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { });
-
gnome3 = gnome3_22;
+
gnome3 = gnome3_24;
gnomeExtensions = {
caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
+43 -162
pkgs/top-level/python-packages.nix
···
graphiteVersion = "0.9.15";
-
fetchPypi = {format ? "setuptools", ... } @attrs:
+
fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs:
let
fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
# Fetch a wheel. By default we fetch an universal wheel.
···
fetcher = (if format == "wheel" then fetchWheel
else if format == "setuptools" then fetchSource
else throw "Unsupported kind ${kind}");
-
in fetcher (builtins.removeAttrs attrs ["format"]);
+
in fetcher (builtins.removeAttrs attrs ["format"]) );
# This should become part of stdenv!
sharedLibraryExtension = if stdenv.isDarwin then ".dylib" else ".so";
···
};
cgroup-utils = callPackage ../development/python-modules/cgroup-utils {};
+
postPatch = ''
+
substituteInPlace setup.py --replace "argparse" ""
+
'';
+
channels = callPackage ../development/python-modules/channels {};
···
py.test tests
'';
-
# Python 3.5 str/bytes-like errors with reading files
-
doCheck = !isPy3k;
+
# https://github.com/pallets/click/issues/823
+
doCheck = false;
meta = {
homepage = http://click.pocoo.org/;
···
};
};
-
pytest = self.pytest_30;
+
pytest = self.pytest_32;
pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
···
pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
-
pytest_30 = callPackage ../development/python-modules/pytest{
+
pytest_30 = callPackage ../development/python-modules/pytest/3_0.nix {
+
hypothesis = self.hypothesis.override {
+
# hypothesis requires pytest that causes dependency cycle
+
doCheck = false;
+
pytest = null;
+
};
+
};
+
pytest_32 = callPackage ../development/python-modules/pytest{
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;
···
buildInputs = with self; [ pytest ];
checkPhase = "make test";
+
+
# Requires pytest < 3.1
+
doCheck = false;
meta = {
license = licenses.mit;
···
};
};
+
pytest-forked = callPackage ../development/python-modules/pytest-forked { };
+
pytest-rerunfailures = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pytest-rerunfailures";
···
};
};
-
jsonpatch = buildPythonPackage rec {
-
name = "jsonpatch-1.11";
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/j/jsonpatch/${name}.tar.gz";
-
sha256 = "22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47";
-
};
-
-
propagatedBuildInputs = with self; [ jsonpointer ];
-
-
meta = {
-
description = "Library to apply JSON Patches according to RFC 6902";
-
homepage = "https://github.com/stefankoegl/python-json-patch";
-
license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi"
-
};
-
};
+
jsonpatch = callPackage ../development/python-modules/jsonpatch { };
jsonpointer = buildPythonPackage rec {
name = "jsonpointer-1.9";
···
};
};
-
odfpy = buildPythonPackage rec {
-
version = "0.9.6";
-
name = "odfpy-${version}";
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/o/odfpy/${name}.tar.gz";
-
sha256 = "e458f969f1ccd7ed77d70a45fe69ad656ac61b39e36e4d32c42d4e3216030891";
-
};
-
-
buildInputs = with self; with pkgs; [ ];
-
-
propagatedBuildInputs = with self; [ ];
-
-
meta = {
-
description = "Python API and tools to manipulate OpenDocument files";
-
homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
-
license = licenses.asl20;
-
};
-
};
+
odfpy = callPackage ../development/python-modules/odfpy { };
pamela = buildPythonPackage rec {
···
# see https://github.com/getsentry/raven-python/blob/master/setup.py
doCheck = false;
+
propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ];
+
meta = {
maintainers = with maintainers; [ primeos ];
};
···
};
-
pyrtlsdr = buildPythonPackage rec {
-
name = "pyrtlsdr-0.2.0";
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/p/pyrtlsdr/${name}.zip";
-
sha256 = "cbb9086efe4320858c48f4856d09f7face191c4156510b1459ef4e5588935b6a";
-
};
-
-
postPatch = ''
-
sed "s|driver_files =.*|driver_files = ['${pkgs.rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
-
'';
-
-
meta = {
-
description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
-
homepage = https://github.com/roger-/pyrtlsdr;
-
license = licenses.gpl3;
-
platforms = platforms.linux;
-
maintainers = with maintainers; [ bjornfor ];
-
};
-
};
+
pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { };
random2 = self.buildPythonPackage rec {
name = "random2-1.0.1";
···
};
};
-
flask-pymongo = buildPythonPackage rec {
-
name = "Flask-PyMongo-${version}";
-
version = "0.3.1";
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/F/Flask-PyMongo/${name}.tar.gz";
-
sha256 = "0305qngvjrjyyabf8gxqgqvd9ffh00gr5yfrjf4nncr2my9svbyd";
-
};
-
-
propagatedBuildInputs = with self; [ flask pymongo_2_9_1 ];
-
-
meta = {
-
homepage = "http://flask-pymongo.readthedocs.org/";
-
description = "PyMongo support for Flask applications";
-
license = licenses.bsd2;
-
};
-
};
+
flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { };
flask-restful = buildPythonPackage rec {
name = "Flask-RESTful-${version}";
···
-
py = buildPythonPackage rec {
-
name = "py-${version}";
-
version = "1.4.31";
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/p/py/${name}.tar.gz";
-
sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
-
};
-
-
# Circular dependency on pytest
-
doCheck = false;
-
-
meta = {
-
description = "Library with cross-python path, ini-parsing, io, code, log facilities";
-
homepage = http://pylib.readthedocs.org/;
-
license = licenses.mit;
-
};
-
};
+
py = callPackage ../development/python-modules/py { };
pyacoustid = buildPythonPackage rec {
···
disabled = !isPy3k;
+
+
# No tests in archive
+
doCheck = false;
meta = {
description = "Python package for the generation of PostScript, PDF, and SVG files";
···
rm "$out/bin/"*.bat
'';
+
postPatch = ''
+
substituteInPlace setup.py --replace "argparse" ""
+
'';
+
meta = {
description = "Test data generator for Robot Framework";
homepage = https://github.com/mkorpela/RoboMachine;
···
'';
-
setuptools_scm = buildPythonPackage rec {
-
name = "setuptools_scm-${version}";
-
version = "1.15.0";
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz";
-
sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs";
-
};
-
-
buildInputs = with self; [ pip ];
-
checkInputs = with self; [ pytest ];
-
# Seems to fail due to chroot
-
doCheck = false;
-
-
checkPhase = ''
-
py.test
-
'';
-
-
meta = with stdenv.lib; {
-
homepage = https://bitbucket.org/pypa/setuptools_scm/;
-
description = "Handles managing your python package versions in scm metadata";
-
license = licenses.mit;
-
maintainers = with maintainers; [ jgeerds ];
-
};
-
};
-
-
setuptools_scm_18 = self.setuptools_scm.override rec {
-
name = "setuptools_scm-${version}";
-
version = "1.8.0";
-
-
# tests fail: ImportError: cannot import name 'find_files'
-
disabled = isPy35;
-
-
src = pkgs.fetchurl {
-
url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.bz2";
-
sha256 = "00p60v2yfqy1r58pjcx9wy6dvqd7wkpfs5z1dzwf7y75c1g3dgyx";
-
};
-
};
+
setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
setuptoolsDarcs = buildPythonPackage rec {
name = "setuptools_darcs-${version}";
···
+
sqlmap = callPackage ../development/python-modules/sqlmap { };
pgpdump = self.buildPythonPackage rec {
name = "pgpdump-1.5";
···
# Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
doCheck = false;
+
+
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
hieroglyph = callPackage ../development/python-modules/hieroglyph { };
···
# Disable broken test
# https://github.com/zeromq/pyzmq/issues/799
checkPhase = ''
-
py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send"
+
py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled"
'';
···
propagatedBuildInputs = with self; [
paste six
+
+
disabled = isPy3k; # Judging from SyntaxError
meta = with stdenv.lib; {
description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other";
···
description = "Python Import Magic - automagically add, remove and manage imports";
homepage = http://github.com/alecthomas/importmagic;
license = "bsd";
-
};
-
};
-
-
bepasty-server = buildPythonPackage rec {
-
name = "bepasty-server-${version}";
-
version = "0.4.0";
-
propagatedBuildInputs = with self;[
-
flask
-
pygments
-
xstatic
-
xstatic-bootbox
-
xstatic-bootstrap
-
xstatic-jquery
-
xstatic-jquery-file-upload
-
xstatic-jquery-ui
-
xstatic-pygments
-
];
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/b/bepasty/bepasty-${version}.tar.gz";
-
sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
-
};
-
-
meta = {
-
homepage = http://github.com/bepasty/bepasty-server;
-
description = "Binary pastebin server";
-
license = licenses.mit;
-
maintainers = [ maintainers.makefu ];