Merge remote-tracking branch 'origin/master' into x-updates
This commit is contained in:
Eelco Dolstra
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:
|
||||
|
||||
pythonPackages.buildPythonPackage {
|
||||
name = "obnam-1.1";
|
||||
name = "obnam-1.2";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl rec {
|
||||
url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.1.orig.tar.gz";
|
||||
sha256 = "763693e5ea4e8d6a63b1a16c2aacd5fe0dc97abc687c8f0dde5840f77d549349";
|
||||
url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.2.orig.tar.gz";
|
||||
sha256 = "33457452726d5c393d98c565b8e1ab3ac11276cc42bf67c4eee6c4e4ac9976d6";
|
||||
};
|
||||
|
||||
buildInputs = [ pythonPackages.sphinx attr ];
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
|
||||
, FileDesktopEntry, libxslt, docbook_xsl, python, setuptools, makeWrapper
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.12.4";
|
||||
name = "debian-devscripts-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.gz";
|
||||
sha256 = "34bcbec78bd4fe34d9f1326b9d1477ff2410e20e2dca6b7bfbf2bf92dbb83904";
|
||||
};
|
||||
buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile
|
||||
FileDesktopEntry libxslt python setuptools makeWrapper ];
|
||||
preConfigure = ''
|
||||
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
|
||||
sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
|
||||
sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
|
||||
tgtpy="$out/lib/${python.libPrefix}/site-packages"
|
||||
mkdir -p "$tgtpy"
|
||||
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
|
||||
sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
|
||||
sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
|
||||
'';
|
||||
postInstall = ''
|
||||
for i in "$out/bin"/*; do
|
||||
wrapProgram "$i" \
|
||||
--prefix PERL5LIB : "$PERL5LIB" \
|
||||
--prefix PERL5LIB : "$out/share/devscripts"
|
||||
done
|
||||
'';
|
||||
meta = {
|
||||
description = ''Debian package maintenance scripts'';
|
||||
license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only...
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
};
|
||||
}
|
||||
@@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchurl, gnu_efi, unzip }:
|
||||
|
||||
let version = "0.2.3"; in
|
||||
let version = "0.4.5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "refind-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/refind/refind-src-${version}.zip";
|
||||
sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf";
|
||||
sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ];
|
||||
buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" "LOCAL_CFLAGS=-I${gnu_efi}/include" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
install -v -m644 refind/refind.efi refind.conf-sample $out
|
||||
install -v -m644 refind/refind*.efi refind.conf-sample $out
|
||||
mv -v icons $out
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nss-myhostname-0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0pointer.de/lennart/projects/nss-myhostname/${name}.tar.gz";
|
||||
sha256 = "1wnawxklsv3z796l752j7a21gvj2615fk12qr1bir3apipm499rb";
|
||||
};
|
||||
|
||||
patches = [ ./nscd-segfault.patch ./ignore-ipv6-link-local.patch ];
|
||||
|
||||
meta = {
|
||||
description = "Name Service Switch module ensuring that the hostname always resolves to a valid address";
|
||||
homepage = http://0pointer.de/lennart/projects/nss-myhostname/;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
--- nss-myhostname-0.3/netlink.c 2011-05-09 08:56:34.344579140 -0400
|
||||
+++ nss-myhostname-0.3-new/netlink.c 2012-10-06 23:52:10.577755588 -0400
|
||||
@@ -179,6 +179,10 @@
|
||||
ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
|
||||
continue;
|
||||
|
||||
+ if (ifaddrmsg->ifa_family == AF_INET6 &&
|
||||
+ ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
|
||||
+ continue;
|
||||
+
|
||||
if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
|
||||
continue;
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
--- nss-myhostname-0.3/nss-myhostname.c 2011-05-09 09:01:27.421581560 -0400
|
||||
+++ nss-myhostname-0.3-new/nss-myhostname.c 2012-10-06 23:40:09.836894004 -0400
|
||||
@@ -177,7 +177,11 @@
|
||||
/* Verify the size matches */
|
||||
assert(idx == ms);
|
||||
|
||||
- *pat = r_tuple_prev;
|
||||
+ /* Nscd expects us to store the first record in **pat. */
|
||||
+ if (*pat)
|
||||
+ **pat = *r_tuple_prev;
|
||||
+ else
|
||||
+ *pat = r_tuple_prev;
|
||||
|
||||
if (ttlp)
|
||||
*ttlp = 0;
|
||||
@@ -0,0 +1,23 @@
|
||||
{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cabal-install";
|
||||
version = "1.16.0";
|
||||
sha256 = "0yg8h028sixvzx42v1spjyx4qfhpsar38cvz9188m62rac8ak8az";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
Cabal filepath HTTP mtl network random time zlib
|
||||
];
|
||||
postInstall = ''
|
||||
mkdir $out/etc
|
||||
mv bash-completion $out/etc/bash_completion.d
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/cabal/";
|
||||
description = "The command-line interface for Cabal and Hackage";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@@ -1,16 +1,16 @@
|
||||
{stdenv, fetchurl, perl, zlib, bzip2}:
|
||||
{stdenv, fetchurl, perl, zlib, bzip2, xz}:
|
||||
|
||||
let version = "1.14.29"; in
|
||||
let version = "1.16.8"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dpkg-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.gz";
|
||||
sha256 = "0cynms4vziy957r4zskybbid87sz99vrfy8d999vlhxgc74c2zpa";
|
||||
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
|
||||
sha256 = "4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa";
|
||||
};
|
||||
|
||||
configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg";
|
||||
configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg ";
|
||||
|
||||
preConfigure = ''
|
||||
# Can't use substitute pending resolution of NIXPKGS-89.
|
||||
@@ -24,11 +24,12 @@ stdenv.mkDerivation {
|
||||
chmod +x $TMPDIR/dpkg
|
||||
PATH=$TMPDIR:$PATH
|
||||
|
||||
substituteInPlace src/Makefile.in --replace "install-data-local:" "disabled:"
|
||||
substituteInPlace dpkg-split/Makefile.in --replace "install-data-local:" "disabled:"
|
||||
for i in $(find . -name Makefile.in); do
|
||||
substituteInPlace $i --replace "install-data-local:" "disabled:" ;
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ perl zlib bzip2 ];
|
||||
buildInputs = [ perl zlib bzip2 xz ];
|
||||
|
||||
meta = {
|
||||
description = "The Debian package manager";
|
||||
|
||||
Reference in New Issue
Block a user