Merge branch 'master' into staging
This commit is contained in:
commit
a446660385
|
@ -344,6 +344,7 @@
|
|||
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
|
||||
nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
|
||||
ndowens = "Nathan Owens <ndowens04@gmail.com>";
|
||||
neeasade = "Nathan Isom <nathanisom27@gmail.com>";
|
||||
nequissimus = "Tim Steinbach <tim@nequissimus.com>";
|
||||
nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
|
||||
nhooyr = "Anmol Sethi <anmol@aubble.com>";
|
||||
|
|
|
@ -476,9 +476,7 @@ rec {
|
|||
readPathsFromFile = rootPath: file:
|
||||
let
|
||||
root = toString rootPath;
|
||||
lines =
|
||||
builtins.map (lib.removeSuffix "\n")
|
||||
(lib.splitString "\n" (builtins.readFile file));
|
||||
lines = lib.splitString "\n" (builtins.readFile file);
|
||||
removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
|
||||
relativePaths = removeComments lines;
|
||||
absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;
|
||||
|
|
|
@ -1,25 +1,35 @@
|
|||
{ fetchzip, stdenv, pkgconfig, autoreconfHook
|
||||
{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook
|
||||
, openssl, db48, boost, zlib, miniupnpc
|
||||
, qt4, qrencode, glib, protobuf, yasm
|
||||
, utillinux }:
|
||||
, qrencode, glib, protobuf, yasm, libevent
|
||||
, utillinux
|
||||
, enable_Upnp ? false
|
||||
, disable_Wallet ? false
|
||||
, disable_Daemon ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dashpay-${version}";
|
||||
version = "0.12.1.3";
|
||||
|
||||
name = "dashpay-${meta.version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/dashpay/dash/archive/v${meta.version}.tar.gz";
|
||||
sha256 = "19bk7cviy3n2dpj4kr3i6i0i3ac2l5ri8ln1a51nd3n90k016wnx";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dashpay";
|
||||
repo= "dash";
|
||||
rev = "v${version}";
|
||||
sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm
|
||||
boost zlib miniupnpc protobuf qt4 qrencode utillinux ];
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ glib openssl db48 yasm boost zlib libevent
|
||||
miniupnpc protobuf qrencode utillinux ];
|
||||
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
|
||||
++ optional enable_Upnp "--enable-upnp-default"
|
||||
++ optional disable_Wallet "--disable-wallet"
|
||||
++ optional disable_Daemon "--disable-daemon"
|
||||
;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
version = "0.12.0.55";
|
||||
meta = {
|
||||
description = "A decentralized key/value registration and transfer system";
|
||||
longDescription = ''
|
||||
Dash (DASH) is an open sourced, privacy-centric digital currency
|
||||
|
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-mac-app=$$out/Applications"
|
||||
];
|
||||
|
||||
CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
|
||||
CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
|
||||
LDFLAGS = "-O3 -L${ncurses.out}/lib";
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "1.30";
|
||||
version = "1.30.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -9,12 +11,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://download.geany.org/${name}.tar.bz2";
|
||||
sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d";
|
||||
sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
|
||||
|
||||
buildInputs = [ gtk2 which pkgconfig intltool file ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
buildInputs = [ gtk2 which file ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
@ -47,9 +50,9 @@ stdenv.mkDerivation rec {
|
|||
- Simple project management
|
||||
- Plugin interface
|
||||
'';
|
||||
homepage = "http://www.geany.org/";
|
||||
homepage = http://www.geany.org/;
|
||||
license = "GPL";
|
||||
maintainers = [ stdenv.lib.maintainers.bbenoist ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ maintainers.bbenoist ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,15 +1,20 @@
|
|||
{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
|
||||
gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
|
||||
librsvg, gst_all_1, autoreconfHook, makeWrapper }:
|
||||
stdenv.mkDerivation {
|
||||
name = "ahoviewer-1.4.6";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ahoviewer-${version}";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahodesuka";
|
||||
repo = "ahoviewer";
|
||||
rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa";
|
||||
sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb";
|
||||
rev = version;
|
||||
sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
|
||||
buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
|
||||
libsecret curl unrar libzip librsvg
|
||||
|
@ -18,18 +23,21 @@ stdenv.mkDerivation {
|
|||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base ];
|
||||
|
||||
postPatch = ''patchShebangs version.sh'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ahoviewer \
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
||||
'';
|
||||
meta = {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/ahodesuka/ahoviewer";
|
||||
description = "A GTK2 image viewer, manga reader, and booru browser";
|
||||
maintainers = [ stdenv.lib.maintainers.skrzyp ];
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ];
|
||||
maintainers = [ maintainers.skrzyp ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.allBut [ "darwin" "cygwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{stdenv, fetchurl, jre}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "alchemy-007";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "alchemy-${version}";
|
||||
version = "008";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://al.chemy.org/files/Alchemy-007.tar.gz;
|
||||
sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b";
|
||||
url = "http://al.chemy.org/files/Alchemy-${version}.tar.gz";
|
||||
sha256 = "0449bvdccgx1jqnws1bckzs4nv2d230523qs0jx015gi81s1q7li";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -20,7 +22,7 @@ stdenv.mkDerivation {
|
|||
chmod +x $out/bin/alchemy
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Drawing application";
|
||||
longDescription = ''
|
||||
Alchemy is an open drawing project aimed at exploring how we can sketch,
|
||||
|
@ -31,8 +33,8 @@ stdenv.mkDerivation {
|
|||
an expanded range of ideas and possibilities in a serendipitous way.
|
||||
'';
|
||||
homepage = http://al.chemy.org/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }:
|
||||
{ stdenv, fetchurl, pkgconfig
|
||||
, djvulibre, qt4, xorg, libtiff }:
|
||||
|
||||
let
|
||||
qt = qt4;
|
||||
# TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "djview-4.10.5";
|
||||
name = "djview-${version}";
|
||||
version = "4.10.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/djvu/${name}.tar.gz";
|
||||
sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0";
|
||||
sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ djvulibre qt xorg.libXt libtiff ];
|
||||
buildInputs = [ djvulibre qt4 xorg.libXt libtiff ];
|
||||
|
||||
passthru = {
|
||||
mozillaPlugin = "/lib/netscape/plugins";
|
||||
|
@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://djvu.sourceforge.net/djview4.html;
|
||||
description = "A portable DjVu viewer and browser plugin";
|
||||
license = licenses.gpl2;
|
||||
inherit (qt.meta) platforms;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,10 +1,14 @@
|
|||
{ stdenv, fetchurl, cmake, qt4 }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fontmatrix-0.6.0";
|
||||
src = fetchurl {
|
||||
url = "http://fontmatrix.be/archives/${name}-Source.tar.gz";
|
||||
sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c";
|
||||
name = "fontmatrix-${version}";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fontmatrix";
|
||||
repo = "fontmatrix";
|
||||
rev = "v${version}";
|
||||
sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
@ -13,10 +17,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
|
||||
homepage = http://fontmatrix.be/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
homepage = http://github.com/fontmatrix/fontmatrix;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3
|
||||
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
|
||||
, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book
|
||||
, intltool, itstool, makeWrapper, pkgconfig, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glabels-${version}";
|
||||
version = "3.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimevins";
|
||||
repo = "glabels";
|
||||
rev = "glabels-3_2_1";
|
||||
sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
|
||||
sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
|
||||
buildInputs = [
|
||||
autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools
|
||||
barcode gtk3 gtk_doc gnome3.yelp_tools
|
||||
gnome3.gnome_common gnome3.gsettings_desktop_schemas
|
||||
intltool itstool libxml2 librsvg libe-book libtool
|
||||
makeWrapper pkgconfig
|
||||
itstool libxml2 librsvg libe-book libtool
|
||||
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
|
|||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
description = "Create labels and business cards";
|
||||
homepage = http://glabels.org/;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
name = "jpegoptim-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz";
|
||||
sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93";
|
||||
sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849";
|
||||
};
|
||||
|
||||
# There are no checks, it seems.
|
||||
|
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ libjpeg ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Optimize JPEG files";
|
||||
homepage = http://www.kokkonen.net/tjko/projects.html ;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.aristid ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.aristid ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,22 +3,22 @@ To use aditional parts libraries
|
|||
set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
|
||||
*/
|
||||
|
||||
{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }:
|
||||
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "leocad-${version}";
|
||||
version = "0.81";
|
||||
version = "17.02";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.leocad.org/tags/${name}";
|
||||
sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "leozide";
|
||||
repo = "leocad";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 qmake4Hook zlib ];
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
buildInputs = [ qt4 zlib ];
|
||||
postPatch = ''
|
||||
sed '1i#include <cmath>' -i common/camera.cpp
|
||||
substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan("
|
||||
export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,20 +1,24 @@
|
|||
{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
||||
{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
||||
, opencolorio, openexr, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openimageio-${version}";
|
||||
version = "1.6.11";
|
||||
version = "1.7.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
||||
sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenImageIO";
|
||||
repo = "oiio";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr
|
||||
boost ilmbase libjpeg libpng
|
||||
libtiff opencolorio openexr
|
||||
unzip
|
||||
];
|
||||
|
||||
|
|
|
@ -17,5 +17,6 @@ stdenv.mkDerivation {
|
|||
homepage = https://github.com/neeasade/colort;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.neeasade ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emem";
|
||||
version = "0.2.42";
|
||||
version = "0.2.43";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit jdk;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
|
||||
sha256 = "0zm3sqgbiaj44nkgkjiifxwwyrcjs42nry6zmbg3dnnpd0v82v8j";
|
||||
sha256 = "0p3v28vjqyx961sfsd1h2cg2g2q0v03qd87dppbxqp7g5ppls91x";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase" ];
|
||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
cp $src $out/share/java/${pname}.jar
|
||||
|
||||
cat > $out/bin/${pname} <<EOF
|
||||
cat > $out/bin/${pname} << EOF
|
||||
#! $SHELL
|
||||
$jdk/bin/java -jar $out/share/java/${pname}.jar "\$@"
|
||||
EOF
|
||||
|
|
29
pkgs/applications/misc/mpvc/default.nix
Normal file
29
pkgs/applications/misc/mpvc/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, socat, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpvc-unstable-2017-03-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wildefyr";
|
||||
repo = "mpvc";
|
||||
rev = "aea5c661455248cde7ac9ddba5f63cc790d26512";
|
||||
sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"
|
||||
'';
|
||||
|
||||
buildInputs = [ socat makeWrapper ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A mpc-like control interface for mpv";
|
||||
homepage = https://github.com/wildefyr/mpvc;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.neeasade ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
27
pkgs/applications/misc/xrq/default.nix
Normal file
27
pkgs/applications/misc/xrq/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchFromGitHub, libX11}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xrq-unstable-2016-01-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arianon";
|
||||
repo = "xrq";
|
||||
rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9";
|
||||
sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX=$out install
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
meta = {
|
||||
description = "X utility for querying xrdb";
|
||||
homepage = https://github.com/arianon/xrq;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
};
|
||||
}
|
|
@ -11,7 +11,7 @@ let
|
|||
|
||||
in nodePackages.buildNodePackage rec {
|
||||
name = "shout-${version}";
|
||||
version = "0.51.1";
|
||||
version = "0.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erming";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }:
|
||||
{ stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "owncloud-client-${version}";
|
||||
|
@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ qt4 qtkeychain sqlite];
|
||||
buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-UCMAKE_INSTALL_LIBDIR"
|
||||
"-UCMAKE_INSTALL_LIBDIR"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "rclone-${version}";
|
||||
version = "1.35";
|
||||
version = "1.36";
|
||||
|
||||
goPackagePath = "github.com/ncw/rclone";
|
||||
|
||||
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "ncw";
|
||||
repo = "rclone";
|
||||
rev = "v${version}";
|
||||
sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i";
|
||||
sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
|
||||
{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rapidsvn-0.12.0-1";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rapidsvn-${version}";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;
|
||||
sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg";
|
||||
url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
|
||||
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
|
||||
};
|
||||
|
||||
buildInputs = [ wxGTK subversion apr aprutil python ];
|
||||
|
@ -13,6 +14,10 @@ stdenv.mkDerivation {
|
|||
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
|
||||
"--with-svn-lib=${subversion.out}/lib" ];
|
||||
|
||||
patches = [
|
||||
./fix-build.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Multi-platform GUI front-end for the Subversion revision system";
|
||||
homepage = http://rapidsvn.tigris.org/;
|
||||
|
|
122
pkgs/applications/version-management/rapidsvn/fix-build.patch
Normal file
122
pkgs/applications/version-management/rapidsvn/fix-build.patch
Normal file
|
@ -0,0 +1,122 @@
|
|||
--- a/src/svncpp/client_ls.cpp
|
||||
+++ b/src/svncpp/client_ls.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "svn_client.h"
|
||||
#include "svn_path.h"
|
||||
#include "svn_sorts.h"
|
||||
+#include "svn_version.h"
|
||||
//#include "svn_utf.h"
|
||||
|
||||
// svncpp
|
||||
@@ -35,6 +36,7 @@
|
||||
#include "m_is_empty.hpp"
|
||||
|
||||
|
||||
+#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
|
||||
static int
|
||||
compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
|
||||
{
|
||||
@@ -84,6 +86,72 @@ namespace svn
|
||||
}
|
||||
}
|
||||
|
||||
+#else
|
||||
+
|
||||
+#include <algorithm>
|
||||
+
|
||||
+static svn_error_t* store_entry(
|
||||
+ void *baton,
|
||||
+ const char *path,
|
||||
+ const svn_dirent_t *dirent,
|
||||
+ const svn_lock_t *,
|
||||
+ const char *abs_path,
|
||||
+ const char *,
|
||||
+ const char *,
|
||||
+ apr_pool_t *scratch_pool)
|
||||
+{
|
||||
+ svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
|
||||
+ if (path[0] == '\0') {
|
||||
+ if (dirent->kind == svn_node_file) {
|
||||
+ // for compatibility with svn_client_ls behaviour, listing a file
|
||||
+ // stores that file name
|
||||
+ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
|
||||
+ }
|
||||
+ } else {
|
||||
+ entries->push_back(svn::DirEntry(path, dirent));
|
||||
+ }
|
||||
+ return SVN_NO_ERROR;
|
||||
+}
|
||||
+
|
||||
+static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
|
||||
+{
|
||||
+ return svn_path_compare_paths(a.name(), b.name()) < 0;
|
||||
+}
|
||||
+
|
||||
+namespace svn
|
||||
+{
|
||||
+ DirEntries
|
||||
+ Client::list(const char * pathOrUrl,
|
||||
+ svn_opt_revision_t * revision,
|
||||
+ bool recurse) throw(ClientException)
|
||||
+ {
|
||||
+ Pool pool;
|
||||
+ DirEntries entries;
|
||||
+
|
||||
+ svn_error_t * error =
|
||||
+ svn_client_list3(pathOrUrl,
|
||||
+ revision,
|
||||
+ revision,
|
||||
+ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
|
||||
+ SVN_DIRENT_ALL,
|
||||
+ FALSE, // fetch locks
|
||||
+ FALSE, // include externals
|
||||
+ &store_entry,
|
||||
+ &entries,
|
||||
+ *m_context,
|
||||
+ pool);
|
||||
+
|
||||
+ if (error != SVN_NO_ERROR)
|
||||
+ throw ClientException(error);
|
||||
+
|
||||
+ std::sort(entries.begin(), entries.end(), &sort_by_path);
|
||||
+
|
||||
+ return entries;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
/* -----------------------------------------------------------------
|
||||
* local variables:
|
||||
* eval: (load-file "../../rapidsvn-dev.el")
|
||||
--- a/src/svncpp/dirent.cpp 2017-03-19 15:48:58.956827337 +0100
|
||||
+++ b/src/svncpp/dirent.cpp 2017-03-19 15:50:19.111527279 +0100
|
||||
@@ -47,7 +47,7 @@
|
||||
{
|
||||
}
|
||||
|
||||
- Data(const char * _name, svn_dirent_t * dirEntry)
|
||||
+ Data(const char * _name, const svn_dirent_t * dirEntry)
|
||||
: name(_name), kind(dirEntry->kind), size(dirEntry->size),
|
||||
hasProps(dirEntry->has_props != 0),
|
||||
createdRev(dirEntry->created_rev), time(dirEntry->time)
|
||||
@@ -78,7 +78,7 @@
|
||||
{
|
||||
}
|
||||
|
||||
- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
|
||||
+ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
|
||||
: m(new Data(name, DirEntry))
|
||||
{
|
||||
}
|
||||
--- a/include/svncpp/dirent.hpp 2017-03-19 15:50:54.860506116 +0100
|
||||
+++ b/include/svncpp/dirent.hpp 2017-03-19 15:50:58.314407598 +0100
|
||||
@@ -41,7 +41,7 @@
|
||||
/**
|
||||
* constructor for existing @a svn_dirent_t entries
|
||||
*/
|
||||
- DirEntry(const char * name, svn_dirent_t * dirEntry);
|
||||
+ DirEntry(const char * name, const svn_dirent_t * dirEntry);
|
||||
|
||||
/**
|
||||
* copy constructor
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
|
||||
{ stdenv, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
|
||||
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
|
||||
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
|
||||
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
|
||||
|
@ -9,10 +9,13 @@
|
|||
|
||||
with luaPackages; stdenv.mkDerivation rec {
|
||||
name = "awesome-${version}";
|
||||
version = "4.0";
|
||||
src = fetchurl {
|
||||
url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
|
||||
sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awesomewm";
|
||||
repo = "awesome";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -22,8 +25,10 @@ with luaPackages; stdenv.mkDerivation rec {
|
|||
imagemagick
|
||||
makeWrapper
|
||||
pkgconfig
|
||||
xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
|
||||
xmlto docbook_xml_dtd_45
|
||||
docbook_xsl findXMLCatalogs
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ hicolor_icon_theme ];
|
||||
buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection
|
||||
git lgi libpthreadstubs libstartup_notification
|
||||
|
|
26
pkgs/applications/window-managers/bevelbar/default.nix
Normal file
26
pkgs/applications/window-managers/bevelbar/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bevelbar-${version}";
|
||||
version = "16.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vain";
|
||||
repo = "bevelbar";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXrandr libXft ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
installFlags = [ "prefix=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An X11 status bar with fancy schmancy 1985-ish beveled borders";
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.neeasade ];
|
||||
};
|
||||
}
|
|
@ -1,64 +0,0 @@
|
|||
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
||||
, makeWrapper, gnused, gawk }:
|
||||
|
||||
let version = "14B04"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "erlang-" + version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
|
||||
sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
|
||||
};
|
||||
|
||||
buildInputs = [ perl gnum4 ncurses openssl makeWrapper ];
|
||||
|
||||
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
|
||||
|
||||
preConfigure = ''
|
||||
export HOME=$PWD/../
|
||||
sed -e s@/bin/pwd@pwd@g -i otp_build
|
||||
'';
|
||||
|
||||
configureFlags = "--with-ssl=${openssl.dev}";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = let
|
||||
manpages = fetchurl {
|
||||
url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
|
||||
sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545";
|
||||
};
|
||||
in ''
|
||||
tar xf "${manpages}" -C "$out/lib/erlang"
|
||||
for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
|
||||
prefix="''${i%/*}"
|
||||
ensureDir "$out/share/man/''${prefix##*/}"
|
||||
ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
|
||||
done
|
||||
'';
|
||||
|
||||
# Some erlang bin/ scripts run sed and awk
|
||||
postFixup = ''
|
||||
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
|
||||
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.erlang.org/";
|
||||
description = "Programming language used for massively scalable soft real-time systems";
|
||||
|
||||
longDescription = ''
|
||||
Erlang is a programming language used to build massively scalable
|
||||
soft real-time systems with requirements on high availability.
|
||||
Some of its uses are in telecoms, banking, e-commerce, computer
|
||||
telephony and instant messaging. Erlang's runtime system has
|
||||
built-in support for concurrency, distribution and fault
|
||||
tolerance.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
|
@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
|
|||
++ optional odbcSupport unixODBC
|
||||
++ optionals stdenv.isDarwin [ Carbon Cocoa ];
|
||||
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
prePatch = ''
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
'';
|
||||
|
||||
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, gnused, gawk, makeWrapper
|
||||
, odbcSupport ? false, unixODBC ? null
|
||||
, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
|
||||
, enableDebugInfo ? false
|
||||
, enableDebugInfo ? false
|
||||
, Carbon ? null, Cocoa ? null }:
|
||||
|
||||
assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
|
||||
|
@ -24,11 +24,16 @@ stdenv.mkDerivation rec {
|
|||
debugInfo = enableDebugInfo;
|
||||
|
||||
buildInputs =
|
||||
[ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc
|
||||
[ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc
|
||||
] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
|
||||
++ optional odbcSupport [ unixODBC ]
|
||||
++ optionals stdenv.isDarwin [ Carbon Cocoa ];
|
||||
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
prePatch = ''
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
'';
|
||||
|
||||
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -36,22 +41,22 @@ stdenv.mkDerivation rec {
|
|||
export LANG=C
|
||||
export ERL_TOP=$(pwd)
|
||||
sed -e s@/bin/pwd@pwd@g -i otp_build
|
||||
sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc
|
||||
sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc
|
||||
'';
|
||||
|
||||
configureFlags= [
|
||||
"--with-ssl=${openssl.dev}"
|
||||
"--enable-smp-support"
|
||||
"--enable-threads"
|
||||
"--enable-kernel-poll"
|
||||
"--disable-hipe"
|
||||
"${optionalString odbcSupport "--with-odbc=${unixODBC}"}"
|
||||
"${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"
|
||||
"--enable-smp-support"
|
||||
"--enable-threads"
|
||||
"--enable-kernel-poll"
|
||||
"--disable-hipe"
|
||||
"${optionalString odbcSupport "--with-odbc=${unixODBC}"}"
|
||||
"${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"
|
||||
"${optionalString stdenv.isLinux "--enable-m64-build"}"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
./otp_build autoconf
|
||||
./otp_build autoconf
|
||||
./otp_build setup -a --prefix=$out $configureFlags
|
||||
'';
|
||||
|
||||
|
@ -89,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
telephony and instant messaging. Erlang's runtime system has
|
||||
built-in support for concurrency, distribution and fault
|
||||
tolerance.
|
||||
This version of Erlang is Basho's version, forked from Ericsson's
|
||||
This version of Erlang is Basho's version, forked from Ericsson's
|
||||
repository.
|
||||
'';
|
||||
|
||||
|
|
|
@ -35,7 +35,12 @@ stdenv.mkDerivation rec {
|
|||
++ optional javacSupport openjdk
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
|
||||
|
||||
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
|
||||
patchPhase = ''
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
|
||||
sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure
|
||||
'';
|
||||
|
||||
debugInfo = enableDebugInfo;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl
|
||||
{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, perl, gnum4, ncurses, openssl
|
||||
, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper
|
||||
, Carbon, Cocoa
|
||||
, odbcSupport ? false, unixODBC ? null
|
||||
|
@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
|
||||
};
|
||||
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
prePatch = ''
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
'';
|
||||
|
||||
patches = [
|
||||
rmAndPwdPatch
|
||||
envAndCpPatch
|
||||
|
|
|
@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
|
|||
prePatch = ''
|
||||
substituteInPlace configure.in \
|
||||
--replace '`sw_vers -productVersion`' '10.10'
|
||||
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
120
pkgs/development/interpreters/guile/2.0.nix
Normal file
120
pkgs/development/interpreters/guile/2.0.nix
Normal file
|
@ -0,0 +1,120 @@
|
|||
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
|
||||
, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }:
|
||||
|
||||
# Do either a coverage analysis build or a standard build.
|
||||
(if coverageAnalysis != null
|
||||
then coverageAnalysis
|
||||
else stdenv.mkDerivation)
|
||||
|
||||
(rec {
|
||||
name = "guile-2.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/guile/${name}.tar.xz";
|
||||
sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
setOutputFlags = false; # $dev gets into the library otherwise
|
||||
|
||||
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
|
||||
buildInputs = [ readline libtool libunistring libffi ];
|
||||
propagatedBuildInputs = [ gmp boehmgc ]
|
||||
|
||||
# XXX: These ones aren't normally needed here, but since
|
||||
# `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
|
||||
# the needed `-L' flags. As for why the `.la' file lacks the `-L' flags,
|
||||
# see below.
|
||||
++ [ libtool libunistring ];
|
||||
|
||||
# A native Guile 2.0 is needed to cross-build Guile.
|
||||
selfNativeBuildInput = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
|
||||
(fetchpatch {
|
||||
# Fixes stability issues with 00-repl-server.test
|
||||
url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
|
||||
sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
|
||||
})
|
||||
] ++
|
||||
(stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
|
||||
|
||||
# Explicitly link against libgcc_s, to work around the infamous
|
||||
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
|
||||
|
||||
# don't have "libgcc_s.so.1" on darwin
|
||||
LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
|
||||
configureFlags = [ "--with-libreadline-prefix" ]
|
||||
++ stdenv.lib.optionals stdenv.isSunOS [
|
||||
# Make sure the right <gmp.h> is found, and not the incompatible
|
||||
# /usr/include/mp.h from OpenSolaris. See
|
||||
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
|
||||
# for details.
|
||||
"--with-libgmp-prefix=${gmp.dev}"
|
||||
|
||||
# Same for these (?).
|
||||
"--with-libreadline-prefix=${readline.dev}"
|
||||
"--with-libunistring-prefix=${libunistring}"
|
||||
|
||||
# See below.
|
||||
"--without-threads"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
|
||||
|
||||
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
|
||||
# why `--with-libunistring-prefix' and similar options coming from
|
||||
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
|
||||
sed -i "$out/lib/pkgconfig/guile-2.0.pc" \
|
||||
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
|
||||
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
|
||||
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
|
||||
s|includedir=$out|includedir=$dev|g
|
||||
"
|
||||
'';
|
||||
|
||||
# make check doesn't work on darwin
|
||||
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
|
||||
doCheck = false;
|
||||
|
||||
setupHook = ./setup-hook-2.0.sh;
|
||||
|
||||
crossAttrs.preConfigure =
|
||||
stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
|
||||
# On GNU, libgc depends on libpthread, but the cross linker doesn't
|
||||
# know where to find libpthread, which leads to erroneous test failures
|
||||
# in `configure', where `-pthread' and `-lpthread' aren't explicitly
|
||||
# passed. So it needs some help (XXX).
|
||||
"export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Embeddable Scheme implementation";
|
||||
homepage = http://www.gnu.org/software/guile/;
|
||||
license = stdenv.lib.licenses.lgpl3Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
GNU Guile is an implementation of the Scheme programming language, with
|
||||
support for many SRFIs, packaged for use in a wide variety of
|
||||
environments. In addition to implementing the R5RS Scheme standard
|
||||
and a large subset of R6RS, Guile includes a module system, full access
|
||||
to POSIX system calls, networking support, multiple threads, dynamic
|
||||
linking, a foreign function call interface, and powerful string
|
||||
processing.
|
||||
'';
|
||||
};
|
||||
})
|
||||
|
||||
//
|
||||
|
||||
(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
|
||||
# Work around <http://bugs.gnu.org/14201>.
|
||||
SHELL = "/bin/sh";
|
||||
CONFIG_SHELL = "/bin/sh";
|
||||
})
|
|
@ -7,11 +7,12 @@
|
|||
else stdenv.mkDerivation)
|
||||
|
||||
(rec {
|
||||
name = "guile-2.0.13";
|
||||
name = "guile-${version}";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/guile/${name}.tar.xz";
|
||||
sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
|
||||
sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
|
@ -32,12 +33,8 @@
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
|
||||
(fetchpatch {
|
||||
# Fixes stability issues with 00-repl-server.test
|
||||
url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
|
||||
sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
|
||||
})
|
||||
patches = [
|
||||
./eai_system.patch
|
||||
] ++
|
||||
(stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
|
||||
|
||||
|
@ -47,7 +44,7 @@
|
|||
# don't have "libgcc_s.so.1" on darwin
|
||||
LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
|
||||
|
||||
configureFlags = [ "--with-libreadline-prefix" ]
|
||||
configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
|
||||
++ stdenv.lib.optionals stdenv.isSunOS [
|
||||
# Make sure the right <gmp.h> is found, and not the incompatible
|
||||
# /usr/include/mp.h from OpenSolaris. See
|
||||
|
@ -56,7 +53,6 @@
|
|||
"--with-libgmp-prefix=${gmp.dev}"
|
||||
|
||||
# Same for these (?).
|
||||
"--with-libreadline-prefix=${readline.dev}"
|
||||
"--with-libunistring-prefix=${libunistring}"
|
||||
|
||||
# See below.
|
||||
|
@ -69,7 +65,7 @@
|
|||
# XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
|
||||
# why `--with-libunistring-prefix' and similar options coming from
|
||||
# `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
|
||||
sed -i "$out/lib/pkgconfig/guile-2.0.pc" \
|
||||
sed -i "$out/lib/pkgconfig/guile-2.2.pc" \
|
||||
-e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
|
||||
s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
|
||||
s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
|
||||
|
@ -81,7 +77,7 @@
|
|||
# On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
|
||||
doCheck = false;
|
||||
|
||||
setupHook = ./setup-hook-2.0.sh;
|
||||
setupHook = ./setup-hook-2.2.sh;
|
||||
|
||||
crossAttrs.preConfigure =
|
||||
stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
|
||||
|
@ -96,7 +92,7 @@
|
|||
description = "Embeddable Scheme implementation";
|
||||
homepage = http://www.gnu.org/software/guile/;
|
||||
license = stdenv.lib.licenses.lgpl3Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
|
@ -111,10 +107,3 @@
|
|||
};
|
||||
})
|
||||
|
||||
//
|
||||
|
||||
(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
|
||||
# Work around <http://bugs.gnu.org/14201>.
|
||||
SHELL = "/bin/sh";
|
||||
CONFIG_SHELL = "/bin/sh";
|
||||
})
|
||||
|
|
13
pkgs/development/interpreters/guile/setup-hook-2.2.sh
Normal file
13
pkgs/development/interpreters/guile/setup-hook-2.2.sh
Normal file
|
@ -0,0 +1,13 @@
|
|||
addGuileLibPath () {
|
||||
if test -d "$1/share/guile/site/2.2"
|
||||
then
|
||||
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"
|
||||
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"
|
||||
elif test -d "$1/share/guile/site"
|
||||
then
|
||||
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
|
||||
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
|
||||
fi
|
||||
}
|
||||
|
||||
envHooks+=(addGuileLibPath)
|
|
@ -1,24 +1,25 @@
|
|||
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.700.0";
|
||||
version = "7.800.1";
|
||||
name = "armadillo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr";
|
||||
sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake openblasCompat superlu hdf5 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ openblasCompat superlu hdf5 ];
|
||||
|
||||
cmakeFlags = [ "-DDETECT_HDF5=ON" ];
|
||||
|
||||
patches = [ ./use-unix-config-on-OS-X.patch ];
|
||||
patches = [ ./use-unix-config-on-OS-X.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ linear algebra library";
|
||||
homepage = http://arma.sourceforge.net;
|
||||
license = licenses.mpl20;
|
||||
license = licenses.apl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ juliendehos knedlsepp ];
|
||||
};
|
||||
|
|
|
@ -1,24 +1,21 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cfitsio-3.21";
|
||||
stdenv.mkDerivation {
|
||||
name = "cfitsio-3.41";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz;
|
||||
sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i";
|
||||
url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz";
|
||||
sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5";
|
||||
};
|
||||
|
||||
# Shared-only build
|
||||
buildFlags = "shared";
|
||||
patchPhase =
|
||||
'' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
|
||||
patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://heasarc.gsfc.nasa.gov/fitsio/;
|
||||
|
||||
description = "Library for reading and writing FITS data files";
|
||||
|
||||
longDescription =
|
||||
'' CFITSIO is a library of C and Fortran subroutines for reading and
|
||||
writing data files in FITS (Flexible Image Transport System) data
|
||||
|
@ -28,9 +25,8 @@ stdenv.mkDerivation {
|
|||
advanced features for manipulating and filtering the information in
|
||||
FITS files.
|
||||
'';
|
||||
|
||||
# Permissive BSD-style license.
|
||||
license = "permissive";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
{stdenv, fetchurl, libp11, pkgconfig, openssl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "engine_pkcs11-0.1.8";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz"
|
||||
"http://www.openadk.org/distfiles/${name}.tar.gz"
|
||||
];
|
||||
sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy";
|
||||
};
|
||||
|
||||
buildInputs = [ libp11 pkgconfig openssl ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.opensc-project.org/engine_pkcs11/;
|
||||
license = stdenv.lib.licenses.bsdOriginal;
|
||||
description = "Engine for OpenSSL to use smart cards in PKCS#11 format";
|
||||
};
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libevdev-1.4.6";
|
||||
name = "libevdev-1.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
|
||||
sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv";
|
||||
url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
|
||||
sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
|
|
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.ulduzsoft.com/libircclient/;
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ obadz ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,16 +4,16 @@ with rustPlatform;
|
|||
|
||||
buildRustPackage rec {
|
||||
name = "clog-cli-${version}";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clog-tool";
|
||||
repo = "clog-cli";
|
||||
rev = "${version}";
|
||||
sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
|
||||
};
|
||||
|
||||
depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x";
|
||||
depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3";
|
||||
|
||||
meta = {
|
||||
description = "Generate changelogs from local git metadata";
|
||||
|
|
|
@ -34,8 +34,10 @@ stdenv.mkDerivation rec {
|
|||
cp -v *.el "$out/share/emacs/site-lisp"
|
||||
|
||||
wrapProgram $out/bin/gtags \
|
||||
--prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \
|
||||
--prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
|
||||
wrapProgram $out/bin/global \
|
||||
--prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \
|
||||
--prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
|
||||
'';
|
||||
|
||||
|
|
|
@ -88,6 +88,7 @@ let
|
|||
openalSoft
|
||||
libva
|
||||
openssl-steam
|
||||
vulkan-loader
|
||||
] ++ lib.optional newStdcpp gcc.cc;
|
||||
|
||||
ourRuntime = if runtimeOnly then []
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.10.3";
|
||||
version = "4.10.4";
|
||||
extraMeta.branch = "4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1m18hlcimxj42lbg7mc9lh3hmmwpyk6y2c92xf0svmlfpzv6ah8r";
|
||||
sha256 = "18cglngl42hcm0578hrsn962g2r1z9x6p5h9c6d3g0ac8siascqp";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.4.54";
|
||||
version = "4.4.55";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0h2b0zv7dfa8nica7cxf2ysiqdva0bb2pmhi0kz4gyhvp2cm3rjk";
|
||||
sha256 = "14inh7ps6zkvkwifqgxnwj02a7907ighdj96dv66ydckwqcmyj4j";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
|
|
@ -78,7 +78,7 @@ installPhase() {
|
|||
fi
|
||||
|
||||
# All libs except GUI-only are installed now, so fixup them.
|
||||
for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'`
|
||||
for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'`
|
||||
do
|
||||
# I'm lazy to differentiate needed libs per-library, as the closure is the same.
|
||||
# Unfortunately --shrink-rpath would strip too much.
|
||||
|
|
|
@ -43,7 +43,7 @@ let
|
|||
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
||||
|
||||
# patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
|
||||
patches = if versionOlder version "375"
|
||||
patches = if libsOnly || versionOlder version "375"
|
||||
then null
|
||||
else [ (fetchurl {
|
||||
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name= "nextcloud-${version}";
|
||||
version = "11.0.1";
|
||||
version = "11.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
|
||||
sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0";
|
||||
sha256 = "0047kfl73720w7y2r7ivzj2gqg84rcfp98svq130nd0ziyfz27jx";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100
|
||||
+++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
pkg_check_modules(BASHCOMP bash-completion)
|
||||
if (BASHCOMP_FOUND)
|
||||
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
|
||||
message("Bash completion directory: ${BASHCOMP_DIR}")
|
||||
INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
|
||||
INSTALL(CODE "
|
|
@ -0,0 +1,11 @@
|
|||
--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100
|
||||
+++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
|
||||
endif()
|
||||
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
|
||||
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
|
||||
|
||||
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
|
|
@ -2,11 +2,11 @@
|
|||
, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
name = "opkg-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
|
||||
sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr";
|
||||
sha256 = "1glkxjhsaaji172phd1gv8g0k0fs09pij6k01cl9namnac5r02vm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
|
|
|
@ -574,7 +574,9 @@ with pkgs;
|
|||
|
||||
atftp = callPackage ../tools/networking/atftp { };
|
||||
|
||||
autogen = callPackage ../development/tools/misc/autogen { };
|
||||
autogen = callPackage ../development/tools/misc/autogen {
|
||||
guile = guile_2_0;
|
||||
};
|
||||
|
||||
autojump = callPackage ../tools/misc/autojump { };
|
||||
|
||||
|
@ -3303,7 +3305,9 @@ with pkgs;
|
|||
owncloud90
|
||||
owncloud91;
|
||||
|
||||
owncloud-client = callPackage ../applications/networking/owncloud-client { };
|
||||
owncloud-client = callPackage ../applications/networking/owncloud-client {
|
||||
inherit (libsForQt5) qtkeychain;
|
||||
};
|
||||
|
||||
p2pvc = callPackage ../applications/video/p2pvc {};
|
||||
|
||||
|
@ -5790,9 +5794,12 @@ with pkgs;
|
|||
|
||||
guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
|
||||
|
||||
guile_2_0 = callPackage ../development/interpreters/guile { };
|
||||
# Needed for autogen
|
||||
guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
|
||||
|
||||
guile = guile_2_0;
|
||||
guile_2_2 = callPackage ../development/interpreters/guile { };
|
||||
|
||||
guile = guile_2_2;
|
||||
|
||||
hadoop = callPackage ../applications/networking/cluster/hadoop { };
|
||||
|
||||
|
@ -7271,8 +7278,6 @@ with pkgs;
|
|||
|
||||
enet = callPackage ../development/libraries/enet { };
|
||||
|
||||
enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { };
|
||||
|
||||
epoxy = callPackage ../development/libraries/epoxy {};
|
||||
|
||||
esdl = callPackage ../development/libraries/esdl { };
|
||||
|
@ -12878,6 +12883,8 @@ with pkgs;
|
|||
guile = guile_1_8;
|
||||
};
|
||||
|
||||
bevelbar = callPackage ../applications/window-managers/bevelbar { };
|
||||
|
||||
bibletime = callPackage ../applications/misc/bibletime { };
|
||||
|
||||
bitkeeper = callPackage ../applications/version-management/bitkeeper {
|
||||
|
@ -18324,6 +18331,8 @@ with pkgs;
|
|||
|
||||
mg = callPackage ../applications/editors/mg { };
|
||||
|
||||
mpvc = callPackage ../applications/misc/mpvc { };
|
||||
|
||||
aucdtect = callPackage ../tools/audio/aucdtect { };
|
||||
|
||||
togglesg-download = callPackage ../tools/misc/togglesg-download { };
|
||||
|
@ -18358,6 +18367,8 @@ with pkgs;
|
|||
|
||||
xulrunner = firefox-unwrapped;
|
||||
|
||||
xrq = callPackage ../applications/misc/xrq { };
|
||||
|
||||
nitrokey-app = callPackage ../tools/security/nitrokey-app { };
|
||||
|
||||
fpm2 = callPackage ../tools/security/fpm2 { };
|
||||
|
|
Loading…
Reference in a new issue