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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-08 05:59:50 -07:00
commit c9395e1e92
42 changed files with 1037 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/ec2-data.nix
View File

@ -79,8 +79,6 @@ with lib;
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
restartIfChanged = false;
};
systemd.services."print-host-key" =

9
pkgs/applications/altcoins/bitcoin.nix
View File

@ -6,13 +6,14 @@ with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.10.0";
core_version = "0.10.1";
version = core_version;
src = fetchurl {
url = [ "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz"
"mirror://sourceforge/bitcoin/Bitcoin/bitcoin-0.10.0/bitcoin-${version}.tar.gz"
url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
"mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
];
sha256 = "a516cf6d9f58a117607148405334b35d3178df1ba1c59229609d2bcd08d30624";
sha256 = "287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138";
};
buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib

22
pkgs/applications/audio/artyFX/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchgit, cairomm, cmake, jack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
stdenv.mkDerivation rec {
name = "artyFX-git-${version}";
version = "2015-05-07";
src = fetchgit {
url = "https://github.com/harryhaaren/openAV-ArtyFX.git";
rev = "3a8cb9a5e4ffaf27a497a31cc9cd6f2e79622d5b";
sha256 = "2e3f6ab6f829c0ec177e85f4e419286616cf35fb7303445caa09d3438cac27d5";
};
buildInputs = [ cairomm cmake jack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];
meta = with stdenv.lib; {
homepage = http://openavproductions.com/artyfx/;
description = "A LV2 plugin bundle of artistic realtime effects";
license = licenses.gpl2;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
};
}

94
pkgs/applications/editors/monodevelop/default.nix
View File

@ -4,49 +4,84 @@
}:
stdenv.mkDerivation rec {
version = "5.7.0.660";
revision = "6a74f9bdb90d9415b597064d815c9be38b401fee";
version = "5.9.0.431";
revision = "7560726734fc7267de2fa9abed2509968deefaa8";
name = "monodevelop-${version}";
srcs = [
(fetchurl {
url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
sha256 = "0i9fpjkcys991dhxh02zf9imar3aj6fldk9ymy09vmr10f4d7vbf";
})
(fetchurl {
url = "https://launchpadlibrarian.net/153448659/NUnit-2.6.3.zip";
sha256 = "0vzbziq44zy7fyyhb44mf9ypfi7gvs17rxpg8c9d9lvvdpkshhcp";
})
(fetchurl {
url = "https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip";
sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
})
(fetchgit {
url = "https://github.com/mono/nuget-binary.git";
rev = "ecb27dd49384d70b6c861d28763906f2b25b7c8";
sha256 = "0dj0yglgwn07xw2crr66vl0vcgnr6m041pynyq0kdd0z8nlp92ki";
})
];
src = fetchurl {
url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn";
};
sourceRoot = "monodevelop-5.7";
srcNugetBinary = fetchgit {
url = "https://github.com/mono/nuget-binary.git";
rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047";
sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3";
};
srcNUnit = fetchurl {
url = "https://www.nuget.org/api/v2/package/NUnit/2.6.3";
sha256 = "0bb16i4ggwz32wkxsh485wf014cqqzhbyx0b3wbpmqjw7p4canph";
};
srcNUnitRunners = fetchurl {
url = "https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3";
sha256 = "0qwx1i9lxkp9pijj2bsczzgsamz651hngkxraqjap1v4m7d09a3b";
};
srcNUnit2510 = fetchurl {
url = "http://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip";
sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
};
srcNugetSystemWebMvcExtensions = fetchurl {
url = https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9;
sha256 = "19wi662m8primpimzifv8k560m6ymm73z0mf1r8ixl0xqag1hx6j";
};
srcNugetMicrosoftAspNetMvc = fetchurl {
url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2;
sha256 = "1jwfmz42kw2yb1g2hgp2h34fc4wx6s8z71da3mw5i4ivs25w9n2b";
};
srcNugetMicrosoftAspNetRazor = fetchurl {
url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2;
sha256 = "1db3apn4vzz1bx6q5fyv6nyx0drz095xgazqbw60qnhfs7z45axd";
};
srcNugetMicrosoftAspNetWebPages = fetchurl {
url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2;
sha256 = "17fwb5yj165sql80i47zirjnm0gr4n8ypz408mz7p8a1n40r4i5l";
};
srcNugetMicrosoftWebInfrastructure = fetchurl {
url = https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0;
sha256 = "1mxl9dri5729d0jl84gkpqifqf4xzb6aw1rzcfh6l0r24bix9afn";
};
postPatch = ''
# From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19
# it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included
# (?), so download it and put it in the right place in the tree
mkdir -v -p packages/NUnit.2.6.3/lib
cp -vfR ../NUnit-2.6.3/bin/framework/* packages/NUnit.2.6.3/lib
mkdir -v -p packages/NUnit.Runners.2.6.3/tools/lib
cp -vfR ../NUnit-2.6.3/bin/lib/* packages/NUnit.Runners.2.6.3/tools/lib
mkdir packages
unzip ${srcNUnit} -d packages/NUnit.2.6.3
unzip ${srcNUnitRunners} -d packages/NUnit.Runners.2.6.3
# cecil needs NUnit 2.5.10 - this is also missing from the tar
cp -vfR ../NUnit-2.5.10.11092/bin/net-2.0/framework/* external/cecil/Test/libs/nunit-2.5.10
unzip -j ${srcNUnit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\*
# the tar doesn't include the nuget binary, so grab it from github and copy it
# into the right place
cp -vfR ../nuget-binary-*/* external/nuget-binary/
'';
cp -vfR ${srcNugetBinary}/* external/nuget-binary/
# AspNet plugin requires these packages
unzip ${srcNugetSystemWebMvcExtensions} -d packages/System.Web.Mvc.Extensions.Mvc.4.1.0.9
unzip ${srcNugetMicrosoftAspNetMvc} -d packages/Microsoft.AspNet.Mvc.5.2.2
unzip ${srcNugetMicrosoftAspNetRazor} -d packages/Microsoft.AspNet.Razor.3.2.2
unzip ${srcNugetMicrosoftAspNetWebPages} -d packages/Microsoft.AspNet.WebPages.3.2.2
unzip ${srcNugetMicrosoftWebInfrastructure} -d packages/Microsoft.Web.Infrastructure.1.0.0.0
'';
buildInputs = [
autoconf automake pkgconfig shared_mime_info intltool
@ -54,6 +89,7 @@ stdenv.mkDerivation rec {
];
preConfigure = "patchShebangs ./configure";
preBuild = ''
cat > ./buildinfo <<EOF
Release ID: ${version}

8
pkgs/applications/office/libreoffice/default.nix
View File

@ -24,7 +24,7 @@ let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "4";
minor = "4";
patch = "2";
patch = "3";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@ -80,14 +80,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "0m1a09vzgh5mz0dgx2ji3fwmsqr7xymr0hhrrhf75nd1dr0blv2s";
sha256 = "17wfnbwcp7c5cx06c88gmprscfz05qyb5587m72xs6hzr741ygir";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "06i2c143dpqm4w1a9nba0gn1ayrvrhdrcm2kydzapvljgljqswkh";
sha256 = "09im7shbka9dfdh6mq31xq106khlyyw6rr1ij69smlkq0kg463g1";
};
};
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0dif783zbh9qb4636mm055clwwsv8j6pmb8msi9lr183drnaw73x";
sha256 = "0rl9x01ngxwnqwzxkrqy4vks4rb024m75z0w4zidwyp0az0m8qdd";
};
# Openoffice will open libcups dynamically, so we link it directly

2
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View File

@ -30,7 +30,7 @@ pythonPackages.buildPythonPackage rec {
homepage = https://github.com/git-cola/git-cola;
description = "A sleek and powerful Git GUI";
license = licenses.gpl2;
platforms = platforms.all;
platforms = platforms.linux;
maintainers = [ maintainers.bobvanderlinden ];
};
}

2
pkgs/build-support/grsecurity/default.nix
View File

@ -33,7 +33,7 @@ let
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_3_19 test-patch;
else mkKernel pkgs.linux_4_0 test-patch;
## -- grsecurity configuration ---------------------------------------------

3
pkgs/build-support/vm/default.nix
View File

@ -113,6 +113,9 @@ rec {
mkdir -p /fs/dev
mount -o bind /dev /fs/dev
mkdir -p /fs/dev /fs/dev/shm
mount -t tmpfs -o "mode=1777" none /fs/dev/shm
echo "mounting Nix store..."
mkdir -p /fs/nix/store
mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose

10
pkgs/development/compilers/mono/default.nix
View File

@ -6,10 +6,10 @@ let
in
stdenv.mkDerivation rec {
name = "mono-${version}";
version = "3.12.1";
version = "4.0.1";
src = fetchurl {
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x";
sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz";
};
buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
'';
#Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
#Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
#http://www.mono-project.com/Config_DllMap
# Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
# Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
# http://www.mono-project.com/Config_DllMap
postBuild = ''
find . -name 'config' -type f | while read i; do
sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -808,10 +808,10 @@ self: super: {
temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
# https://github.com/ivanperez-keera/Yampa/issues/10
Yampa = dontCheck super.Yampa;
# https://github.com/adamwalker/sdr/issues/1
sdr = dontCheck super.sdr;
# Reported upstream by e-mail.
smaoin = dontCheck super.smaoin;
}

4
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
View File

@ -54,8 +54,8 @@ self: super: {
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
# We have no working cabal-install at the moment.
cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
cabal-install = self.cabal-install_1_18_0_8;
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
cabal-install = self.cabal-install_1_18_1_0;
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;

4
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
View File

@ -48,8 +48,8 @@ self: super: {
# Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
cabal-install = self.cabal-install_1_18_0_8;
cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; };
cabal-install = self.cabal-install_1_18_1_0;
# Needs Cabal >= 1.18.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };

14
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -189,13 +189,6 @@ self: super: {
brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
# Updated Cabal file from Hackage tightened version bounds for some reason.
edit-distance = let pkg = appendPatch super.edit-distance ./edit-distance-fix-boundaries.patch;
in appendPatch pkg (pkgs.fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/batterseapower/edit-distance/pull/3.patch";
sha256 = "0v47pa5ymh9f23bqpkdv3k7vnb6h3ssccdmjdylhs2ybarqzrcwh";
});
# https://github.com/BNFC/bnfc/issues/137
BNFC = markBrokenVersion "2.7.1" super.BNFC;
cubical = dontDistribute super.cubical;
@ -314,7 +307,7 @@ self: super: {
annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
@ -330,8 +323,13 @@ self: super: {
wreq-sb = dontDistribute (dontCheck super.wreq-sb);
hipbot = dontDistribute super.hipbot;
bitcoin-api = dontDistribute super.bitcoin-api;
bitcoin-api-extra = dontDistribute super.bitcoin-api-extra;
# https://github.com/HugoDaniel/RFC3339/issues/14
timerep = dontCheck super.timerep;
# Ugly hack that triggers a rebuild to fix the broken package on Hydra.
cabal-lenses = appendConfigureFlag super.cabal-lenses "-fignore-me-1";
text = appendConfigureFlag super.text "-fignore-me-1";
}

4
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
View File

@ -45,8 +45,8 @@ self: super: {
# Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
cabal-install = self.cabal-install_1_18_0_8;
cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; };
cabal-install = self.cabal-install_1_18_1_0;
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;

1001
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/libraries/SDL/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
in [ libcap ]
in stdenv.lib.optional stdenv.isLinux libcap
++ (stdenv.lib.optional notMingw audiofile);
nativeBuildInputs = [ pkgconfig ] ++

1
pkgs/development/libraries/SDL2/default.nix
View File

@ -19,6 +19,7 @@ let
--disable-oss --disable-x11-shared
--disable-pulseaudio-shared --disable-alsa-shared
${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
${if (!x11Support) then "--without-x" else ""}
'';
in
stdenv.mkDerivation rec {

2
pkgs/development/libraries/SDL2_gfx/default.nix
View File

@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.bjg ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/libraries/SDL2_image/default.nix
View File

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
meta = {
description = "SDL image library";
homepage = "http://www.libsdl.org/projects/SDL_image/";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/libraries/SDL_gfx/default.nix
View File

@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.bjg ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

4
pkgs/development/libraries/gnutls/3.3.nix
View File

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3.14";
version = "3.3.15";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
sha256 = "1117j71ng66syddw10yazrniqkd326hcigx2hfcw4s86rk0kqanv";
sha256 = "166nynb055vlh6dm1gaqwpcnf4mp7ks8lz2yvm7dlsrkbh3swj5m";
};
})

28
pkgs/development/libraries/libcrafter/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
stdenv.mkDerivation rec {
name = "libcrafter-${version}";
version = "0.3";
src = fetchzip {
url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
sha256 = "04lpmshh4wb1dav03p6rnskpd1zmmvhv80xwn8v7l8faps5gvjp4";
};
preConfigure = "cd libcrafter";
configureScript = "./autogen.sh";
configureFlags = [ "--with-libpcap=yes" ];
buildInputs = [ autoconf automake libtool ];
propagatedBuildInputs = [ libpcap ];
meta = {
homepage = https://github.com/pellegre/libcrafter;
description = "High level C++ network packet sniffing and crafting library";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.lethalman ];
};
}

37
pkgs/development/libraries/libpsl/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub, autoreconfHook, icu, libxslt, pkgconfig }:
let version = "0.7.1"; in
stdenv.mkDerivation rec {
name = "libpsl-${version}";
src = fetchFromGitHub {
sha256 = "0hbsidbmwgpg0h48wh2pzsq59j8az7naz3s5q3yqn99yyjji2vgw";
rev = name;
repo = "libpsl";
owner = "rockdaboot";
};
meta = with stdenv.lib; {
inherit version;
description = "C library for the Publix Suffix List";
longDescription = ''
libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
is a domain name under which Internet users can directly register own
names. Browsers and other web clients can use it to avoid privacy-leaking
"supercookies" and "super domain" certificates, for highlighting parts of
the domain in a user interface or sorting domain lists by site.
'';
homepage = http://rockdaboot.github.io/libpsl/;
license = with licenses; mit;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoreconfHook icu libxslt pkgconfig ];
configureFlags = "--disable-static --enable-man";
enableParallelBuilding = true;
doCheck = true;
}

24
pkgs/development/libraries/libsass/default.nix
View File

@ -1,27 +1,25 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }:
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libsass-${version}";
version = "3.1.0";
version = "3.2.2";
src = fetchFromGitHub {
owner = "sass";
repo = "libsass";
rev = version;
sha256 = "1k9a6hiybqk7xx4k2cb9vhdqskrrzhi60dvwp3gx39jhjqjfl96p";
src = fetchurl {
url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
sha256 = "022rvsnqslds1ss6ls1x1w93mrhq7nigd00wjlnd07qhfqpbnwax";
};
preConfigure = ''
autoreconf --force --install
patchPhase = ''
export LIBSASS_VERSION=${version}
'';
buildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
meta = with stdenv.lib; {
description = "A C/C++ implementation of a Sass compiler";
license = licenses.mit;
homepage = https://github.com/sass/libsass;
license = licenses.mit;
maintainers = with maintainers; [ offline ];
platforms = with platforms; unix;
platforms = platforms.unix;
};
}

17
pkgs/development/libraries/libsexy/default.nix
View File

@ -1,17 +1,24 @@
{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk, pango
{ stdenv, fetchurl, pkgconfig
, glib, gtk, libxml2, pango
}:
stdenv.mkDerivation {
name = "libsexy-0.1.11";
#builder = ./builder.sh;
src = fetchurl {
url = http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz;
sha256 = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e";
};
buildInputs = [ pkgconfig libxml2 glib gtk pango
];
nativeBuildInputs = [ pkgconfig ];
#configureFlags="";
buildInputs = [ glib gtk libxml2 pango ];
meta = with stdenv.lib; {
description = "A collection of GTK+ widgets";
homepahe = http://blog.chipx86.com/tag/libsexy/;
license = licenses.lgpl21;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

28
pkgs/development/tools/sassc/default.nix
View File

@ -1,32 +1,26 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libsass }:
{ stdenv, fetchurl, autoreconfHook, libsass }:
stdenv.mkDerivation rec {
name = "sassc";
version = "3.1.0";
name = "sassc-${version}";
version = "3.2.1";
src = fetchFromGitHub {
owner = "sass";
repo = "sassc";
rev = version;
sha256 = "0lpilmsir9b9292a4b8kq3zzg5cfh031p0krgam5rmsn39i6ivs4";
src = fetchurl {
url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
sha256 = "18pp7ylcwfvfagvnpw660cdvv7cjl7pl9v8x7xr05fp2l6133rxw";
};
preConfigure = ''
export SASSC_VERSION="3.1.0"
autoreconf --force --install
patchPhase = ''
export SASSC_VERSION=${version}
'';
buildInputs = [ autoconf automake libtool libsass ];
nativeBuildInputs = [ autoreconfHook ];
installPhase = ''
mkdir -p $out/bin
cp sassc $out/bin/
'';
buildInputs = [ libsass ];
meta = with stdenv.lib; {
description = "A front-end for libsass";
license = licenses.mit;
homepage = https://github.com/sass/sassc/;
license = licenses.mit;
maintainers = with maintainers; [ pjones ];
platforms = platforms.unix;
};

43
pkgs/os-specific/linux/kernel/btrfs-fix-deadlock.patch
View File

@ -1,43 +0,0 @@
From 9c4f61f01d269815bb7c37be3ede59c5587747c6 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Fri, 2 Jan 2015 19:12:57 +0100
Subject: btrfs: simplify insert_orphan_item
We can search and add the orphan item in one go,
btrfs_insert_orphan_item will find out if the item already exists.
Signed-off-by: David Sterba <dsterba@suse.cz>
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 5be45c1..25a1c36 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1254,21 +1254,13 @@ out:
}
static int insert_orphan_item(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, u64 offset)
+ struct btrfs_root *root, u64 ino)
{
int ret;
- struct btrfs_path *path;
-
- path = btrfs_alloc_path();
- if (!path)
- return -ENOMEM;
- ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID,
- offset, BTRFS_ORPHAN_ITEM_KEY, NULL);
- if (ret > 0)
- ret = btrfs_insert_orphan_item(trans, root, offset);
-
- btrfs_free_path(path);
+ ret = btrfs_insert_orphan_item(trans, root, ino);
+ if (ret == -EEXIST)
+ ret = 0;
return ret;
}
--
cgit v0.10.2

4
pkgs/os-specific/linux/kernel/linux-3.10.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.10.76";
version = "3.10.77";
extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0v4blm026fg4hk5ddh25b1fjhnk2yak2hpj4cz4wiq7yr84dr8p5";
sha256 = "1vx2sg0pab3b3rflwhxrimwx18azqayys8zidzr6sv0x7ir9bc31";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.12.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.12.40";
version = "3.12.42";
extraMeta.branch = "3.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1cdivv1n0r057y2wq38ci00im8z24jrnvyz5vwhmnzv0l4qzbhw5";
sha256 = "0vp6yllal2gcyng1kklp9n8r18fhcb1m1ssavjbcbfax5chi7w5s";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.14.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14.40";
version = "3.14.41";
# Remember to update grsecurity!
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1w5j53ny5vahp1ipj16x0ahjb5yj6q859jsdshblymvwrbkcr29a";
sha256 = "0qghsf648nvzsh2x44x3w0d8lciml8rj6dvglqvmq1zcg492k8i2";
};
features.iwlwifi = true;

11
pkgs/os-specific/linux/kernel/linux-3.18.nix
View File

@ -1,21 +1,14 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.18.12";
version = "3.18.13";
extraMeta.branch = "3.18";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "06wfgg00vc5a2vvmg158ipbmigx803hdp3lhf4kv25p4sdmvbsl2";
sha256 = "043bqjvbamzi201csgnw7hsf8810qm0dn7x9p0kc7s9p9jnyq79n";
};
# FIXME: remove with the next point release.
kernelPatches = args.kernelPatches ++
[ { name = "btrfs-fix-deadlock";
patch = ./btrfs-fix-deadlock.patch;
}
];
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;

5
pkgs/os-specific/linux/kernel/linux-3.19.nix
View File

@ -1,13 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.19.6";
# Remember to update grsecurity!
version = "3.19.7";
extraMeta.branch = "3.19";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1kqn796vwkmhj2qkv56nj7anpmxx1hxv47cf44fcmx9n1afry8j4";
sha256 = "0xd38f7g5yfn0b6b2l4qr022f9hcr82ddbysjs4npbgk5ms7341k";
};
features.iwlwifi = true;

5
pkgs/os-specific/linux/kernel/linux-4.0.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "4.0.1";
version = "4.0.2";
# Remember to update grsecurity!
extraMeta.branch = "4.0";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ggj26p1bm5v5kaviz6brfkjk32f8rib1mh61ns77gjlx5vsvc7z";
sha256 = "1jq4583wwqmwqkqlkck57fxw18xszng92b6ma3avf0djd11b2izz";
};
features.iwlwifi = true;

12
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -65,17 +65,17 @@ rec {
};
grsecurity_stable = grsecPatch
{ kversion = "3.14.40";
revision = "201504302118";
{ kversion = "3.14.41";
revision = "201505072056";
branch = "stable";
sha256 = "154ivf42ib93f8shh2b2qcqhppd1c6vbjfiazgigr006q638429i";
sha256 = "1fgi63y61mjmxj0mq2a24lwq0i0186kyvcdsjflw48adwjm6v0kg";
};
grsecurity_unstable = grsecPatch
{ kversion = "3.19.6";
revision = "201504302119";
{ kversion = "4.0.2";
revision = "201505072057";
branch = "test";
sha256 = "03yj8011i6mkf33npa7all0c33r95mgiic6zjg494x56279s701s";
sha256 = "0njvgd6n9z35hyxnligb8aq9shxzbwrkrdvpbxc0qxmwya0midv2";
};
grsec_fix_path =

4
pkgs/servers/sql/mariadb/default.nix
View File

@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "mariadb-${version}";
version = "10.0.17";
version = "10.0.18";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww";
sha256 = "1xcs391cm0vnl9bvx1470v8z4d77zqv16n6iaqi12jm0ma8fwvv8";
};
buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]

2
pkgs/tools/filesystems/s3fs/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
stdenv.mkDerivation {
name = "sshfs-fuse-1.78";
name = "s3fs-fuse-1.78";
src = fetchurl {
url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz;
sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n";

44
pkgs/tools/graphics/diagrams-builder/default.nix Normal file
View File

@ -0,0 +1,44 @@
/*
If user need access to more haskell package for building his
diagrams, he simply has to pass these package through the
extra packages function as follow in `config.nix`:
~~~
diagrams-builder.override {
extraPackages = self : [myHaskellPackage];
}
­~~~
*/
{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
let
# Used same technique as for the yiCustom package.
wrappedGhc = ghcWithPackages
(self: [ diagrams-builder ] ++ extraPackages self);
ghcVersion = wrappedGhc.version;
exeWrapper = backend : ''
makeWrapper \
"${diagrams-builder}/bin/diagrams-builder-${backend}" "$out/bin/diagrams-builder-${backend}" \
--set NIX_GHC ${wrappedGhc}/bin/ghc \
--set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
'';
backends = ["svg" "cairo" "ps"];
in
stdenv.mkDerivation {
name = "diagrams-builder";
buildInputs = [ makeWrapper ];
buildCommand = with stdenv.lib;
concatStrings (intersperse "\n" (map exeWrapper backends));
# Will be faster to build the wrapper locally then to fetch it from a binary cache.
preferLocalBuild = true;
meta = diagrams-builder.meta;
}

24
pkgs/tools/misc/tmux/default.nix
View File

@ -1,24 +1,26 @@
{stdenv, fetchurl, ncurses, libevent, pkgconfig}:
{ stdenv, fetchurl, ncurses, libevent, pkgconfig }:
stdenv.mkDerivation rec {
pname = "tmux";
version = "1.9a";
name = "${pname}-${version}";
name = "tmux-2.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "1x9k4wfd4l5jg6fh7xkr3yyilizha6ka8m5b1nr0kw8wj0mv5qy5";
url = "mirror://sourceforge/tmux/${name}.tar.gz";
sha256 = "0qnkda8kb747vmbldjpb23ksv9pq3s65xhh1ja5rdsmh8r24npvr";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses libevent ];
postInstall =
''
mkdir -p $out/etc/bash_completion.d
cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
'';
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
];
postInstall = ''
mkdir -p $out/etc/bash_completion.d
cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
'';
meta = {
homepage = http://tmux.sourceforge.net/;

31
pkgs/tools/networking/tracebox/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
stdenv.mkDerivation rec {
name = "tracebox-${version}";
version = "0.2";
src = fetchzip {
url = "https://github.com/tracebox/tracebox/archive/v${version}.zip";
sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns";
};
buildInputs = [ autoreconfHook libcrafter lua ];
configureFlags = [ "--with-lua=yes" ];
NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ];
preAutoreconf = ''
substituteInPlace Makefile.am --replace "noinst" ""
sed '/noinst/d' -i configure.ac
sed '/libcrafter/d' -i src/tracebox/Makefile.am
'';
meta = with stdenv.lib; {
homepage = http://www.tracebox.org/;
description = "A middlebox detection tool";
license = stdenv.lib.licenses.gpl2;
maintainers = [ maintainers.lethalman ];
platforms = platforms.linux;
};
}

10
pkgs/tools/networking/wget/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gettext, libidn, pkgconfig
, perl, perlPackages, LWP, python3
, libiconv, gnutls ? null }:
, libiconv, libpsl, gnutls ? null }:
stdenv.mkDerivation rec {
name = "wget-1.16.3";
@ -25,16 +25,14 @@ stdenv.mkDerivation rec {
export LIBS="-liconv -lintl"
'';
nativeBuildInputs = [ gettext ];
buildInputs = [ libidn libiconv pkgconfig ]
nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ libidn libiconv libpsl ]
++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (gnutls != null) gnutls
++ stdenv.lib.optional stdenv.isDarwin perl;
configureFlags =
if gnutls != null
then "--with-ssl=gnutls"
else "--without-ssl";
if gnutls != null then "--with-ssl=gnutls" else "--without-ssl";
doCheck = (perl != null && python3 != null && !stdenv.isDarwin);

19
pkgs/top-level/all-packages.nix
View File

@ -560,6 +560,10 @@ let
arp-scan = callPackage ../tools/misc/arp-scan { };
artyFX = callPackage ../applications/audio/artyFX {
inherit (xlibs) libpthreadstubs;
};
ascii = callPackage ../tools/text/ascii { };
asymptote = callPackage ../tools/graphics/asymptote {
@ -786,6 +790,10 @@ let
ddate = callPackage ../tools/misc/ddate { };
diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
inherit (haskellngPackages) ghcWithPackages diagrams-builder;
};
direnv = callPackage ../tools/misc/direnv { };
discount = callPackage ../tools/text/discount { };
@ -2959,6 +2967,8 @@ let
traceroute = callPackage ../tools/networking/traceroute { };
tracebox = callPackage ../tools/networking/tracebox { };
trash-cli = callPackage ../tools/misc/trash-cli { };
trickle = callPackage ../tools/networking/trickle {};
@ -6415,6 +6425,8 @@ let
libchardet = callPackage ../development/libraries/libchardet { };
libcrafter = callPackage ../development/libraries/libcrafter { };
libuchardet = callPackage ../development/libraries/libuchardet { };
libchop = callPackage ../development/libraries/libchop { };
@ -6865,6 +6877,8 @@ let
libpseudo = callPackage ../development/libraries/libpseudo { };
libpsl = callPackage ../development/libraries/libpsl { };
libpst = callPackage ../development/libraries/libpst { };
libpwquality = callPackage ../development/libraries/libpwquality { };
@ -7616,11 +7630,6 @@ let
alsaSupport = (!stdenv.isDarwin);
x11Support = true;
pulseaudioSupport = (!stdenv.isDarwin);
# resolve the unrecognized -fpascal-strings option error
stdenv = if stdenv.isDarwin
then clangStdenv
else stdenv;
};
SDL_gfx = callPackage ../development/libraries/SDL_gfx { };

11
pkgs/top-level/python-packages.nix
View File

@ -8502,13 +8502,12 @@ let
powerline = buildPythonPackage rec {
rev = "db80fc95ed01d2c559c4bdc7da8514ed3cc7fcd9";
name = "powerline-beta_${rev}";
rev = "8164f42fb924f38dc5b9dd6d32063e8c3d41e504";
name = "powerline-2.1";
src = pkgs.fetchurl {
url = "https://github.com/Lokaltog/powerline/tarball/${rev}";
url = "https://github.com/powerline/powerline/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "1csd4vasy0avwfxrpdr61plj6k1nzf36f6qvd9kl15s3lnspsfaz";
sha256 = "0xrasj1lh9ypz1q6q4k997rfym9r16bclfbpzjqj8qfkp4i62lz6";
};
propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];
@ -8533,7 +8532,7 @@ let
'';
meta = with stdenv.lib; {
homepage = https://github.com/Lokaltog/powerline;
homepage = https://github.com/powerline/powerline;
description = "The ultimate statusline/prompt utility";
license = licenses.mit;
maintainers = with maintainers; [ lovek323 ];