alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2018-12-26 09:29:28 +01:00
parent 552d8a70d4 a809f883be
commit 0a1dc96ada
57 changed files with 383 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-1412.xml
View file

@ -17,7 +17,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
<link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165"> <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
Nix has been updated to 1.8.</link> Nix has been updated to 1.8.</link>
</para> </para>
</listitem> </listitem>

2
nixos/modules/services/desktops/geoclue2.nix
View file

@ -61,6 +61,8 @@ in
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
}; };
}; };
environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf";
}; };
} }

4
pkgs/applications/editors/eclipse/plugins.nix
View file

@ -555,12 +555,12 @@ rec {
spotbugs = buildEclipseUpdateSite rec { spotbugs = buildEclipseUpdateSite rec {
name = "spotbugs-${version}"; name = "spotbugs-${version}";
version = "3.1.9"; version = "3.1.10";
src = fetchzip { src = fetchzip {
stripRoot = false; stripRoot = false;
url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
sha256 = "0m68jbyaiz0rm4qq3nnwnvgndzv2c6ay6i29kh0p0vdbanggq3xz"; sha256 = "0xrflgw0h05z3za784ach2fx6dh04lgmfr426m1q235vv2ibds5y";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/misc/girara/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "girara-${version}"; name = "girara-${version}";
version = "0.3.1"; version = "0.3.2";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w"; sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
}; };
nativeBuildInputs = [ meson ninja pkgconfig gettext ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ];

4
pkgs/applications/misc/masterpdfeditor/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
let let
version = "5.1.60"; version = "5.2.20";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "masterpdfeditor-${version}"; name = "masterpdfeditor-${version}";
src = fetchurl { src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz"; sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m";
}; };
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

6
pkgs/applications/misc/pcmanfm/default.nix
View file

@ -7,10 +7,10 @@ let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcmanfm-1.3.0"; name = "pcmanfm-1.3.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas"; sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
}; };
buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = optional withGtk3 "--with-gtk=3"; configureFlags = optional withGtk3 "--with-gtk=3";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://blog.lxde.org/?cat=28/; homepage = https://blog.lxde.org/category/pcmanfm/;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
description = "File manager with GTK+ interface"; description = "File manager with GTK+ interface";
maintainers = [ maintainers.ttuegel ]; maintainers = [ maintainers.ttuegel ];

4
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psi-plus-${version}"; name = "psi-plus-${version}";
version = "1.4.404"; version = "1.4.504";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psi-plus"; owner = "psi-plus";
repo = "psi-plus-snapshots"; repo = "psi-plus-snapshots";
rev = "${version}"; rev = "${version}";
sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m"; sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
}; };
resources = fetchFromGitHub { resources = fetchFromGitHub {

4
pkgs/applications/office/skrooge/default.nix
View file

@ -7,11 +7,11 @@
mkDerivation rec { mkDerivation rec {
name = "skrooge-${version}"; name = "skrooge-${version}";
version = "2.16.2"; version = "2.17.0";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
sha256 = "0idvqbra8a71jb5kq9y5v377l7k3shf4z7w71apc3rjvb4l0jkhj"; sha256 = "0v83bcabchsz5fs0iv5i75ps01sga48hq4cx29dajcq3kf9xgwhr";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

20
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,12 +1,12 @@
{ {
"ce": { "ce": {
"version": "11.5.4", "version": "11.5.5",
"repo_hash": "1mk7zj79cz9g8y6b5p4cznv90h94mwgy14w9vdvmqbgbnx9bayc8", "repo_hash": "1dxky06im18s4kxbb33qwm22pkkhgvyjggx31164iy71zcxxj1jr",
"deb_hash": "18i3w1k8l5hj3732w3adw3cma78l9hx77wlrgvssg9gz609kqvx6", "deb_hash": "0wnyfl1bb5wb8kdyarjk9y4ydla84f3alnk3m3zwmdqfg9jsqgb8",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.4-ce.0_amd64.deb/download.deb", "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.5-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab-ce", "repo": "gitlab-ce",
"rev": "v11.5.4", "rev": "v11.5.5",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "0.129.0", "GITALY_SERVER_VERSION": "0.129.0",
"GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_PAGES_VERSION": "1.3.1",
@ -15,13 +15,13 @@
} }
}, },
"ee": { "ee": {
"version": "11.5.4", "version": "11.5.5",
"repo_hash": "1rpj34wblhk6yirix16grrlhg4dfna3mjvhn8bz82m94dkhx06lc", "repo_hash": "1j5g0x7rxrdb39b12psjirsa3s0lhqgnxh0q3r22cgzgxv0332b8",
"deb_hash": "05lizhf45xv4j0y0yafrpcrqmav1xmncxxgsm97s2mlhdwn5rfnd", "deb_hash": "193s1f7w9lcamqnmrc7c3klmybqqra7yr16x6ay0cznwcdgirisp",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.4-ee.0_amd64.deb/download.deb", "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.5-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab-ee", "repo": "gitlab-ee",
"rev": "v11.5.4-ee", "rev": "v11.5.5-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "0.129.0", "GITALY_SERVER_VERSION": "0.129.0",
"GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_PAGES_VERSION": "1.3.1",

2
pkgs/build-support/fetchgit/nix-prefetch-git
View file

@ -152,7 +152,7 @@ checkout_ref(){
if "$deepClone"; then if "$deepClone"; then
# The caller explicitly asked for a deep clone. Deep clones # The caller explicitly asked for a deep clone. Deep clones
# allow "git describe" and similar tools to work. See # allow "git describe" and similar tools to work. See
# http://thread.gmane.org/gmane.linux.distributions.nixos/3569 # https://marc.info/?l=nix-dev&m=139641582514772
# for a discussion. # for a discussion.
return 1 return 1
fi fi

4
pkgs/development/compilers/jsonnet/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jsonnet-${version}"; name = "jsonnet-${version}";
version = "0.11.2"; version = "0.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "google"; owner = "google";
repo = "jsonnet"; repo = "jsonnet";
sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/libraries/adns/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation {
preConfigure = preConfigure =
stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
# http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details. # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
doCheck = false; doCheck = false;
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString stdenv.isDarwin ''

55
pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch Normal file
View file

@ -0,0 +1,55 @@
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@
conf.set('demo_agent', '')
endif
- conf_dir = join_paths(get_option('sysconfdir'), 'geoclue')
+ conf_dir = join_paths(sysconfdir_install, 'geoclue')
configure_file(output: 'geoclue.conf',
input: 'geoclue.conf.in',
configuration: conf,
@@ -26,7 +26,7 @@
# DBus Service policy file
dbus_service_dir = get_option('dbus-sys-dir')
if dbus_service_dir == ''
- dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
+ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d')
endif
configure_file(output: 'org.freedesktop.GeoClue2.conf',
input: 'org.freedesktop.GeoClue2.conf.in',
--- a/demo/meson.build
+++ b/demo/meson.build
@@ -56,8 +56,7 @@
install_dir: desktop_dir)
# Also install in the autostart directory.
- autostart_dir = join_paths(get_option('prefix'),
- get_option('sysconfdir'),
+ autostart_dir = join_paths(sysconfdir_install,
'xdg', 'autostart')
meson.add_install_script('install-file.py',
desktop_file.full_path(),
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,11 @@
datadir = join_paths(get_option('prefix'), get_option('datadir'))
conf.set_quoted('LOCALEDIR', datadir + '/locale')
conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
+if get_option('sysconfdir_install') != ''
+ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
+else
+ sysconfdir_install = get_option('sysconfdir')
+endif
configure_file(output: 'config.h', configuration : conf)
configinc = include_directories('.')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,3 +34,6 @@
option('dbus-srv-user',
type: 'string', value: 'root',
description: 'The user (existing) as which the service will run')
+option('sysconfdir_install',
+ type: 'string', value: '',
+ description: 'sysconfdir to use during installation')

6
pkgs/development/libraries/geoclue/default.nix
View file

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs"; sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
}; };
patches = [
./add-option-for-installation-sysconfdir.patch
];
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,6 +40,8 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
"-Ddemo-agent=${if withDemoAgent then "true" else "false"}" "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"-D3g-source=false" "-D3g-source=false"
"-Dcdma-source=false" "-Dcdma-source=false"

11
pkgs/development/libraries/gnome-sharp/Makefile.in.patch
View file

@ -1,11 +0,0 @@
--- a/sample/gnomevfs/Makefile.in 2009-03-03 16:09:52.000000000 +0000
+++ b/sample/gnomevfs/Makefile.in 2014-10-14 13:35:51.020427244 +0100
@@ -218,7 +218,7 @@
@ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS =
@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS =
-@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)

36
pkgs/development/libraries/gnome-sharp/default.nix
View file

@ -1,17 +1,35 @@
{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: { stdenv
, lib
, fetchFromGitHub
, pkgconfig
, gtk2
, mono
, gtk-sharp-2_0
, gnome2
, autoconf
, automake
, libtool
, which
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gnome-sharp-2.24.1"; name = "gnome-sharp-${version}";
src = fetchurl { version = "2.24.4";
url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; src = fetchFromGitHub {
owner = "mono";
repo = "gnome-sharp";
rev = "${version}";
sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
buildInputs = [ gtk2 mono gtk-sharp-2_0 ] buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
patches = [ ./Makefile.in.patch ]; preConfigure = ''
./bootstrap-${lib.versions.majorMinor version}
'';
dontStrip = true; dontStrip = true;

6
pkgs/development/libraries/gtest/default.nix
View file

@ -3,6 +3,8 @@ stdenv.mkDerivation rec {
name = "gtest-${version}"; name = "gtest-${version}";
version = "1.8.1"; version = "1.8.1";
outputs = [ "out" "dev" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "googletest"; repo = "googletest";
@ -12,6 +14,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests"; description = "Google's framework for writing C++ tests";
homepage = https://github.com/google/googletest; homepage = https://github.com/google/googletest;

42
pkgs/development/libraries/gtk-sharp/2.0.nix
View file

@ -1,4 +1,8 @@
{ stdenv, fetchurl, pkgconfig, mono { stdenv
, lib
, fetchFromGitHub
, pkgconfig
, mono
, glib , glib
, pango , pango
, gtk2 , gtk2
@ -12,32 +16,44 @@
, libgnomeprintui ? null , libgnomeprintui ? null
, libxml2 , libxml2
, monoDLLFixer , monoDLLFixer
, autoconf
, automake
, libtool
, which
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gtk-sharp-2.12.10"; name = "gtk-sharp-${version}";
version = "2.12.45";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchFromGitHub {
url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz; owner = "mono";
sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc"; repo = "gtk-sharp";
rev = version;
sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
}; };
# patches = [ ./dllmap-glue.patch ]; postInstall = ''
pushd $out/bin
# patch bad usage of glib, which wasn't tolerated anymore for f in gapi2-*
prePatch = '' do
for f in glib/glue/{thread,list,slist}.c; do substituteInPlace $f --replace mono ${mono}/bin/mono
sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f"
done done
popd
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
buildInputs = [ buildInputs = [
mono glib pango gtk2 GConf libglade libgnomecanvas mono glib pango gtk2 GConf libglade libgnomecanvas
libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
]; ];
preConfigure = ''
./bootstrap-${lib.versions.majorMinor version}
'';
dontStrip = true; dontStrip = true;
inherit monoDLLFixer; inherit monoDLLFixer;

31
pkgs/development/libraries/libdeflate/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "libdeflate-${version}";
version = "1.1";
src = fetchFromGitHub {
owner = "ebiggers";
repo = "libdeflate";
rev = "v${version}";
sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb";
};
postPatch = ''
substituteInPlace Makefile --replace /usr $out
'';
configurePhase = ''
make programs/config.h
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Fast DEFLATE/zlib/gzip compressor and decompressor";
license = licenses.mit;
homepage = https://github.com/ebiggers/libdeflate;
platforms = platforms.linux;
maintainers = with maintainers; [ orivej ];
};
}

14
pkgs/development/libraries/libfm/default.nix
View file

@ -9,23 +9,29 @@ stdenv.mkDerivation rec {
name = if extraOnly name = if extraOnly
then "libfm-extra-${version}" then "libfm-extra-${version}"
else "libfm-${version}"; else "libfm-${version}";
version = "1.3.0.2"; version = "1.3.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
}; };
nativeBuildInputs = [ vala pkgconfig intltool ]; nativeBuildInputs = [ vala pkgconfig intltool ];
buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache;
configureFlags = optional extraOnly "--with-extra-only" configureFlags = [
"--sysconfdir=/etc"
] ++ optional extraOnly "--with-extra-only"
++ optional withGtk3 "--with-gtk=3"; ++ optional withGtk3 "--with-gtk=3";
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://blog.lxde.org/?cat=28/; homepage = https://blog.lxde.org/category/pcmanfm/;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
description = "A glib-based library for file management"; description = "A glib-based library for file management";
maintainers = [ maintainers.ttuegel ]; maintainers = [ maintainers.ttuegel ];

4
pkgs/development/libraries/libhandy/default.nix
View file

@ -6,7 +6,7 @@
let let
pname = "libhandy"; pname = "libhandy";
version = "0.0.5"; version = "0.0.6";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
owner = "Librem5"; owner = "Librem5";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08"; sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/libraries/libqmatrixclient/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqmatrixclient-${version}"; name = "libqmatrixclient-${version}";
version = "0.4.0"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "QMatrixClient"; owner = "QMatrixClient";
repo = "libqmatrixclient"; repo = "libqmatrixclient";
rev = "v${version}"; rev = "v${version}";
sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"; sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns";
}; };
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];

21
pkgs/development/libraries/libsigcxx/default.nix
View file

@ -1,20 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnum4 }: { stdenv, fetchurl, pkgconfig, gnum4, gnome3 }:
let
ver_maj = "2.10"; # odd major numbers are unstable
ver_min = "0";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsigc++-${ver_maj}.${ver_min}"; pname = "libsigc++";
version = "2.10.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"; sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
}; };
nativeBuildInputs = [ pkgconfig gnum4 ]; nativeBuildInputs = [ pkgconfig gnum4 ];
doCheck = true; doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "libsigcxx";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://libsigcplusplus.github.io/libsigcplusplus/; homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
description = "A typesafe callback system for standard C++"; description = "A typesafe callback system for standard C++";

28
pkgs/development/libraries/libuchardet/default.nix
View file

@ -1,25 +1,31 @@
{ stdenv, fetchFromGitHub, cmake }: { stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libuchardet-${version}"; pname = "uchardet";
version = "0.0.6";
version = "0.0.5"; outputs = [ "bin" "out" "man" "dev" ];
src = fetchFromGitHub { src = fetchurl {
owner = "BYVoid"; url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
repo = "uchardet"; sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
rev = "v${version}";
sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm";
}; };
buildInputs = [ cmake ]; buildInputs = [ cmake ];
doCheck = false; # fails all the tests (ctest) cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
# TODO: move the following to CMake setup hook
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
"-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man"
];
doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Mozilla's Universal Charset Detector C/C++ API"; description = "Mozilla's Universal Charset Detector C/C++ API";
homepage = https://www.byvoid.com/zht/project/uchardet; homepage = https://www.freedesktop.org/wiki/Software/uchardet/;
license = licenses.mpl11; license = licenses.mpl11;
maintainers = with maintainers; [ cstrahan ]; maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };

4
pkgs/development/libraries/menu-cache/default.nix
View file

@ -14,9 +14,9 @@ stdenv.mkDerivation {
buildInputs = [ glib libfm-extra ]; buildInputs = [ glib libfm-extra ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://blog.lxde.org/?tag=menu-cache;
license = licenses.gpl2Plus;
description = "Library to read freedesktop.org menu files"; description = "Library to read freedesktop.org menu files";
homepage = https://blog.lxde.org/tag/menu-cache/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.ttuegel ]; maintainers = [ maintainers.ttuegel ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };

25
pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
View file

@ -1,29 +1,30 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, cppo { lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit
, ppx_deriving, yojson, ounit , ppx_deriving, yojson
}: }:
stdenv.mkDerivation rec { buildDunePackage rec {
name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}"; pname = "ppx_deriving_yojson";
version = "3.1"; version = "3.3";
minimumOCamlVersion = "4.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml-ppx"; owner = "ocaml-ppx";
repo = "ppx_deriving_yojson"; repo = "ppx_deriving_yojson";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz";
}; };
buildInputs = [ ocaml findlib ocamlbuild cppo ounit ]; buildInputs = [ ppxfind ounit ];
propagatedBuildInputs = [ ppx_deriving yojson ]; propagatedBuildInputs = [ ppx_deriving yojson ];
inherit (topkg) installPhase; doCheck = true;
meta = { meta = {
description = "A Yojson codec generator for OCaml >= 4.02."; description = "A Yojson codec generator for OCaml >= 4.04";
inherit (src.meta) homepage; inherit (src.meta) homepage;
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
}; };
} }

21
pkgs/development/ocaml-modules/ppxfind/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ lib, buildDunePackage, fetchurl, ocaml-migrate-parsetree }:
buildDunePackage rec {
pname = "ppxfind";
version = "1.2";
src = fetchurl {
url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
sha256 = "1687jbgii5w5dvvid3ri2cx006ysv0rrspn8dz8x7ma8615whz2h";
};
minimumOCamlVersion = "4.03";
buildInputs = [ ocaml-migrate-parsetree ];
meta = {
homepage = "https://github.com/diml/ppxfind";
description = "ocamlfind ppx tool";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
};
}

4
pkgs/development/python-modules/affine/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "affine"; pname = "affine";
version = "2.2.1"; version = "2.2.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0j3mvcnmgjvvm0znqyf7xylq7i89zjf4dq0g8280xs6bwbl5cvih"; sha256 = "146slzpj2b220dmbmrxib030wymvplawxzn7gcgnbahgm500y3gz";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

4
pkgs/development/python-modules/biopython/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "biopython"; pname = "biopython";
version = "1.72"; version = "1.73";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "ab6b492443adb90c66267b3d24d602ae69a93c68f4b9f135ba01cb06d36ce5a2"; sha256 = "1q55jhf76z3k6is3psis0ckbki7df26x7dikpcc3vhk1vhkwribh";
}; };
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];

4
pkgs/development/python-modules/buildbot/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy, python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
flake8, buildbot-worker, buildbot-pkg, glibcLocales }: flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
let let
@ -55,7 +55,7 @@ let
boto3 boto3
moto moto
mock mock
lz4 python-lz4
setuptoolsTrial setuptoolsTrial
isort isort
pylint pylint

4
pkgs/development/python-modules/dpkt/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dpkt"; pname = "dpkt";
version = "1.9.1"; version = "1.9.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6"; sha256 = "0m0ym219zsqfjl6jwivw5as3igjbmhpcn4dvabc5nkd0bk6jxaaj";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/python-modules/easyprocess/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "EasyProcess"; pname = "EasyProcess";
version = "0.2.3"; version = "0.2.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll"; sha256 = "0gdl6y37g8rns2i26d2zlx7x4kbpql9h5qd8k23ka69q6frcpb8k";
}; };
# No tests # No tests

3
pkgs/development/python-modules/goobook/default.nix
View file

@ -4,6 +4,7 @@
, isPy3k , isPy3k
, oauth2client , oauth2client
, gdata , gdata
, google_api_python_client
, simplejson , simplejson
, httplib2 , httplib2
, keyring , keyring
@ -21,7 +22,7 @@ buildPythonPackage rec {
sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d"; sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
}; };
propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ]; propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ];
preConfigure = '' preConfigure = ''
sed -i '/distribute/d' setup.py sed -i '/distribute/d' setup.py

2
pkgs/development/python-modules/jsonrpclib-pelix/default.nix
View file

@ -12,6 +12,8 @@ buildPythonPackage rec {
sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339"; sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
}; };
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
meta = with lib; { meta = with lib; {
description = "JSON RPC client library - Pelix compatible fork"; description = "JSON RPC client library - Pelix compatible fork";
homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/;

29
pkgs/development/python-modules/lz4/default.nix
View file

@ -1,29 +0,0 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytestrunner
, pytest
, psutil
, pkgconfig
, setuptools_scm
}:
buildPythonPackage rec {
pname = "lz4";
version = "2.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
};
buildInputs = [ setuptools_scm pytestrunner pkgconfig ];
checkInputs = [ pytest psutil ];
meta = with stdenv.lib; {
description = "Compression library";
homepage = https://github.com/python-lz4/python-lz4;
license = licenses.bsd3;
};
}

3
pkgs/development/python-modules/ofxparse/default.nix
View file

@ -3,6 +3,7 @@
, fetchPypi , fetchPypi
, six , six
, beautifulsoup4 , beautifulsoup4
, lxml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +15,7 @@ buildPythonPackage rec {
sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918"; sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
}; };
propagatedBuildInputs = [ six beautifulsoup4 ]; propagatedBuildInputs = [ six beautifulsoup4 lxml ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://sites.google.com/site/ofxparse"; homepage = "http://sites.google.com/site/ofxparse";

7
pkgs/development/python-modules/parsel/default.nix
View file

@ -1,8 +1,9 @@
{ stdenv { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytest , pytest
, pytestrunner , pytestrunner
, functools32
, six , six
, w3lib , w3lib
, lxml , lxml
@ -19,13 +20,13 @@ buildPythonPackage rec {
}; };
buildInputs = [ pytest pytestrunner ]; buildInputs = [ pytest pytestrunner ];
propagatedBuildInputs = [ six w3lib lxml cssselect ]; propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ];
checkPhase = '' checkPhase = ''
py.test py.test
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://github.com/scrapy/parsel"; homepage = "https://github.com/scrapy/parsel";
description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
license = licenses.bsd3; license = licenses.bsd3;

4
pkgs/development/python-modules/pytesseract/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytesseract"; pname = "pytesseract";
version = "0.2.5"; version = "0.2.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0wlz1vbg1k8cdrpzvrahjnbsfs4ki6xqhbkv17ycfchh7h6kfkfm"; sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi";
}; };
patches = [ patches = [

6
pkgs/development/python-modules/python-lz4/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-lz4"; pname = "python-lz4";
version = "2.1.0"; version = "2.1.2";
# get full repository inorder to run tests # get full repository inorder to run tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6"; sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d";
}; };
buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
@ -34,7 +34,7 @@ buildPythonPackage rec {
meta = { meta = {
description = "LZ4 Bindings for Python"; description = "LZ4 Bindings for Python";
homepage = https://github.com/python-lz4/python-lz4; homepage = https://github.com/python-lz4/python-lz4;
license = lib.licenses.bsd0; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ costrouc ]; maintainers = with lib.maintainers; [ costrouc ];
}; };
} }

43
pkgs/development/python-modules/pytorch/default.nix
View file

@ -1,6 +1,6 @@
{ buildPythonPackage, pythonOlder, { stdenv, fetchurl, buildPythonPackage, pythonOlder,
cudaSupport ? false, cudatoolkit ? null, cudnn ? null, cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
linkFarm, symlinkJoin, linkFarm, symlinkJoin,
utillinux, which }: utillinux, which }:
@ -25,7 +25,7 @@ let
"LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} "; "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
in buildPythonPackage rec { in buildPythonPackage rec {
version = "0.4.1"; version = "1.0.0";
pname = "pytorch"; pname = "pytorch";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -33,9 +33,17 @@ in buildPythonPackage rec {
repo = "pytorch"; repo = "pytorch";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1cr8h47jxgfar5bamyvlayvqymnb2qvp7rr0ka2d2d4rdldf9lrp"; sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm";
}; };
patches =
[ # Skips two tests that are only meant to run on multi GPUs
(fetchurl {
url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch";
sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i";
})
];
preConfigure = lib.optionalString cudaSupport '' preConfigure = lib.optionalString cudaSupport ''
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
'' + lib.optionalString (cudaSupport && cudnn != null) '' '' + lib.optionalString (cudaSupport && cudnn != null) ''
@ -58,12 +66,24 @@ in buildPythonPackage rec {
done done
''; '';
# Override the (weirdly) wrong version set by default. See
# https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038
# https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267
PYTORCH_BUILD_VERSION = version;
PYTORCH_BUILD_NUMBER = 0;
# Suppress a weird warning in mkl-dnn, part of ideep in pytorch
# (upstream seems to have fixed this in the wrong place?)
# https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ];
buildInputs = [ buildInputs = [
cmake cmake
numpy.blas numpy.blas
utillinux utillinux
which which
] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn]; ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ]
++ lib.optionals stdenv.isLinux [ numactl ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cffi cffi
@ -71,15 +91,16 @@ in buildPythonPackage rec {
pyyaml pyyaml
] ++ lib.optional (pythonOlder "3.5") typing; ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ hypothesis ];
checkPhase = '' checkPhase = ''
${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils distributed ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
''; '';
meta = { meta = {
description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; description = "Open source, prototype-to-production deep learning platform";
homepage = https://pytorch.org/; homepage = https://pytorch.org/;
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ teh ]; maintainers = with lib.maintainers; [ teh thoughtpolice ];
}; };
} }

2
pkgs/development/python-modules/qrcode/default.nix
View file

@ -1,5 +1,6 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, isPy27
, fetchPypi , fetchPypi
, six , six
, pillow , pillow
@ -18,6 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six pillow pymaging_png ]; propagatedBuildInputs = [ six pillow pymaging_png ];
checkInputs = [ mock ]; checkInputs = [ mock ];
doCheck = isPy27; # https://github.com/lincolnloop/python-qrcode/issues/163
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Quick Response code generation for Python"; description = "Quick Response code generation for Python";

24
pkgs/development/python-modules/secretstorage/2.nix Normal file
View file

@ -0,0 +1,24 @@
{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:
buildPythonPackage rec {
pname = "secretstorage";
version = "2.3.1";
src = fetchPypi {
pname = "SecretStorage";
inherit version;
sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";
};
propagatedBuildInputs = [ cryptography dbus-python ];
# Needs a D-Bus Sesison
doCheck = false;
meta = with lib; {
homepage = https://github.com/mitya57/secretstorage;
description = "Python bindings to FreeDesktop.org Secret Service API";
license = licenses.bsd3;
maintainers = with maintainers; [ orivej ];
};
}

2
pkgs/development/python-modules/secretstorage/default.nix
View file

@ -24,7 +24,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
homepage = https://github.com/mitya57/secretstorage; homepage = https://github.com/mitya57/secretstorage;
description = "Python bindings to FreeDesktop.org Secret Service API"; description = "Python bindings to FreeDesktop.org Secret Service API";
license = licenses.bsdOriginal; license = licenses.bsd3;
maintainers = with maintainers; [ teto ]; maintainers = with maintainers; [ teto ];
}; };
} }

4
pkgs/development/python-modules/shellingham/default.nix
View file

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "shellingham"; pname = "shellingham";
version = "1.2.7"; version = "1.2.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06biyiwq9571mryzbr50am3mxpc3blscwqhiq8c66ac4xm3maszm"; sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

3
pkgs/development/python-modules/taskw/default.nix
View file

@ -5,6 +5,7 @@
, tox , tox
, six , six
, dateutil , dateutil
, kitchen
, pytz , pytz
, pkgs , pkgs
}: }:
@ -28,7 +29,7 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
buildInputs = [ nose pkgs.taskwarrior tox ]; buildInputs = [ nose pkgs.taskwarrior tox ];
propagatedBuildInputs = [ six dateutil pytz ]; propagatedBuildInputs = [ six dateutil kitchen pytz ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/ralphbean/taskw; homepage = https://github.com/ralphbean/taskw;

42
pkgs/development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch
View file

@ -4,45 +4,11 @@ Date: Sun Nov 16 15:19:38 2014 +0100
Use a template for taskwarrior install path. Use a template for taskwarrior install path.
diff --git a/taskw/warrior.py b/taskw/warrior.py
index 21dde88..e0509f2 100644
--- a/taskw/warrior.py --- a/taskw/warrior.py
+++ b/taskw/warrior.py +++ b/taskw/warrior.py
@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase): @@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase):
def _execute(self, *args):
""" Execute a given taskwarrior command with arguments
Returns a 2-tuple of stdout and stderr (respectively).
"""
command = (
[
- 'task', - 'task',
+ '@@taskwarrior@@/bin/task', + '@@taskwarrior@@/bin/task',
'rc:%s' % self.config_filename, @@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase):
] - ['task', '--version'],
+ self.get_configuration_override_args() + ['@@taskwarrior@@/bin/task', '--version'],
+ [six.text_type(arg) for arg in args]
)
# subprocess is expecting bytestrings only, so nuke unicode if present
for i in range(len(command)):
@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase):
except OSError:
# OSError is raised if subprocess.Popen fails to find
# the executable.
return False
@classmethod
def get_version(cls):
taskwarrior_version = subprocess.Popen(
- ['task', '--version'],
+ ['@@taskwarrior@@/bin/task', '--version'],
stdout=subprocess.PIPE
).communicate()[0]
return LooseVersion(taskwarrior_version.decode())
def sync(self, init=False):
if self.get_version() < LooseVersion('2.3'):
raise UnsupportedVersionException(
"'sync' requires version 2.3 of taskwarrior or later."

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let let
version = "11.5.0"; version = "11.6.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl { docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "1siiws19qzfv2nnyp9fy215yd08iv70x830b61kr1742ywc0jcbn"; sha256 = "16xwj962biny18ci8lvfc6r6jq9vcdlc8vs6w7d5yzvd9x55rvwd";
}; };
docker_arm = fetchurl { docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "0d7wnpry4861dcmpspbaar97mkf0jf2bcxvr4nph9xnkw8w7fs2z"; sha256 = "05wb7imly0c5zqmxrgdpls8izsq1g409nh31yf6j0sr76m8qkvf9";
}; };
in in
buildGoPackage rec { buildGoPackage rec {
@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-runner"; repo = "gitlab-runner";
rev = "v${version}"; rev = "v${version}";
sha256 = "028bl249yfccdnwskbn6sxzf1xsg94chbm107n2h83j7a81cz8kw"; sha256 = "1g9wyi9n9xvynvn7c8kjzm5pznyw7w4ziklxjniaa69idzgvbl5g";
}; };
patches = [ ./fix-shell-path.patch ]; patches = [ ./fix-shell-path.patch ];

2
pkgs/development/tools/misc/dejagnu/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
# the build daemon when building in a chroot. See # the build daemon when building in a chroot. See
# <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for # <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for
# details. # details.
# The test-suite needs to have a non-empty stdin: # The test-suite needs to have a non-empty stdin:

2
pkgs/os-specific/linux/ati-drivers/default.nix
View file

@ -19,7 +19,7 @@ with stdenv.lib;
# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well # make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
# which is a problem because it doesn't contain the xorgserver patch supporting # which is a problem because it doesn't contain the xorgserver patch supporting
# the XORG_DRI_DRIVER_PATH env var. # the XORG_DRI_DRIVER_PATH env var.
# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a # See https://marc.info/?l=nix-dev&m=139641585515351 for a
# workaround (TODO) # workaround (TODO)
# The gentoo ebuild contains much more "magic" and is usually a great resource to # The gentoo ebuild contains much more "magic" and is usually a great resource to

2
pkgs/servers/monitoring/net-snmp/default.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
perlarchname=$(perl -e 'use Config; print $Config{archname};') perlarchname=$(perl -e 'use Config; print $Config{archname};')
installFlags="INSTALLSITEARCH=$out/lib/perl5/site_perl/$perlversion/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3" installFlags="INSTALLSITEARCH=$out/lib/perl5/site_perl/$perlversion/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3"
# http://comments.gmane.org/gmane.network.net-snmp.user/32434 # http://article.gmane.org/gmane.network.net-snmp.user/32434
substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v' substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v'
''; '';

4
pkgs/servers/monitoring/uchiwa/bower-packages.nix
View file

@ -1,7 +1,7 @@
# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
{ fetchbower, buildEnv }: { fetchbower, buildEnv }:
buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "uchiwa-web" "1.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk") (fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1")
(fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")
(fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
(fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")
@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")
(fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")
(fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
(fetchbower "ua-parser-js" "0.7.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn") (fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4")
(fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
(fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx") (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx")
]; } ]; }

4
pkgs/servers/monitoring/uchiwa/src.nix
View file

@ -1,4 +1,4 @@
{ {
version = "1.3.1-1"; version = "1.5.0-1";
sha256 = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi"; sha256 = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b";
} }

5
pkgs/tools/compression/mozlz4a/default.nix
View file

@ -1,4 +1,5 @@
{stdenv, fetchurl, python3, pylz4}: { stdenv, fetchurl, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "mozlz4a"; pname = "mozlz4a";
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
chmod a+x "$out/bin/mozlz4a" chmod a+x "$out/bin/mozlz4a"
''; '';
buildInputs = [ pylz4 python3 ]; buildInputs = [ python3 python3.pkgs.python-lz4 ];
meta = { meta = {
inherit version; inherit version;

4
pkgs/tools/misc/coreutils/default.nix
View file

@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv; ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
# The tests are known broken on Cygwin # The tests are known broken on Cygwin
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD. # and {Open,Free}BSD.
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512 # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
doCheck = stdenv.hostPlatform == stdenv.buildPlatform doCheck = stdenv.hostPlatform == stdenv.buildPlatform

10
pkgs/top-level/all-packages.nix
View file

@ -1693,9 +1693,7 @@ in
mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
mozlz4a = callPackage ../tools/compression/mozlz4a { mozlz4a = callPackage ../tools/compression/mozlz4a { };
pylz4 = python3Packages.lz4;
};
msr-tools = callPackage ../os-specific/linux/msr-tools { }; msr-tools = callPackage ../os-specific/linux/msr-tools { };
@ -4796,7 +4794,7 @@ in
fmodex = callPackage ../games/zandronum/fmod.nix { }; fmodex = callPackage ../games/zandronum/fmod.nix { };
pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; }; pdfmod = callPackage ../applications/misc/pdfmod { };
pdf-quench = callPackage ../applications/misc/pdf-quench { }; pdf-quench = callPackage ../applications/misc/pdf-quench { };
@ -10313,7 +10311,7 @@ in
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
hyena = callPackage ../development/libraries/hyena { mono = mono4; }; hyena = callPackage ../development/libraries/hyena { };
hyperscan = callPackage ../development/libraries/hyperscan { }; hyperscan = callPackage ../development/libraries/hyperscan { };
@ -10700,6 +10698,8 @@ in
libde265 = callPackage ../development/libraries/libde265 {}; libde265 = callPackage ../development/libraries/libde265 {};
libdeflate = callPackage ../development/libraries/libdeflate { };
libdevil = callPackage ../development/libraries/libdevil { libdevil = callPackage ../development/libraries/libdevil {
inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.frameworks) OpenGL;
}; };

2
pkgs/top-level/ocaml-packages.nix
View file

@ -580,6 +580,8 @@ let
piqi = callPackage ../development/ocaml-modules/piqi { }; piqi = callPackage ../development/ocaml-modules/piqi { };
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { };
psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { };

7
pkgs/top-level/python-packages.nix
View file

@ -648,6 +648,7 @@ in {
python-hosts = callPackage ../development/python-modules/python-hosts { }; python-hosts = callPackage ../development/python-modules/python-hosts { };
python-lz4 = callPackage ../development/python-modules/python-lz4 { }; python-lz4 = callPackage ../development/python-modules/python-lz4 { };
lz4 = self.python-lz4; # alias 2018-12-05
python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
@ -3268,8 +3269,6 @@ in {
ldappool = callPackage ../development/python-modules/ldappool { }; ldappool = callPackage ../development/python-modules/ldappool { };
lz4 = callPackage ../development/python-modules/lz4 { };
retrying = callPackage ../development/python-modules/retrying { }; retrying = callPackage ../development/python-modules/retrying { };
fasteners = callPackage ../development/python-modules/fasteners { }; fasteners = callPackage ../development/python-modules/fasteners { };
@ -4259,7 +4258,9 @@ in {
blessings = callPackage ../development/python-modules/blessings { }; blessings = callPackage ../development/python-modules/blessings { };
secretstorage = callPackage ../development/python-modules/secretstorage { }; secretstorage = if isPy3k
then callPackage ../development/python-modules/secretstorage { }
else callPackage ../development/python-modules/secretstorage/2.nix { };
semantic = callPackage ../development/python-modules/semantic { }; semantic = callPackage ../development/python-modules/semantic { };