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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Aycan iRiCAN 2014-06-30 00:17:11 +03:00
commit 005322ec95
40 changed files with 526 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -6,6 +6,7 @@
_1126 = "Christian Lask <mail@elfsechsundzwanzig.de>";
aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
akc = "Anders Claesson <akc@akc.is>";
algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>";

11
pkgs/applications/editors/emacs-modes/structured-haskell-mode/default.nix
View File

@ -1,15 +1,16 @@
{ cabal, emacs, haskellSrcExts }:
{ cabal, emacs, haskellMode, haskellSrcExts }:
cabal.mkDerivation (self: {
pname = "structured-haskell-mode";
version = "1.0.2";
sha256 = "1lwdhlr38y5hdr78nplplr3q0hrjhryw378f1857qh0lvp03gwl2";
version = "1.0.3";
sha256 = "0axmw8bj51q8v0wd4jp6giw9dnv0mp7kp8yd16s4nm4hcqgrh5h2";
isLibrary = false;
isExecutable = true;
buildDepends = [ haskellSrcExts ];
buildDepends = [ haskellSrcExts haskellMode ];
buildTools = [ emacs ];
postInstall = ''
emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el
emacs -L elisp -L ${haskellMode}/share/emacs/site-lisp \
--batch -f batch-byte-compile "elisp/"*.el
install -d $out/share/emacs/site-lisp
install "elisp/"*.el "elisp/"*.elc $out/share/emacs/site-lisp
'';

2
pkgs/applications/editors/vim/configurable.nix
View File

@ -21,7 +21,7 @@ composableDerivation {
# latest release
args.fetchhg {
url = "https://vim.googlecode.com/hg/";
tag = "v7-4-316";
rev = "v7-4-316";
sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
};

2
pkgs/applications/editors/vim/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = "https://vim.googlecode.com/hg/";
tag = "v7-4-316";
rev = "v7-4-316";
sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
};

2
pkgs/applications/graphics/photivo/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = "http://code.google.com/p/photivo/";
tag = "d687864489da";
rev = "d687864489da";
sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
};

10
pkgs/applications/misc/kdeconnect/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, gettext, kdelibs, makeWrapper, qca2, qca2_ossl, qjson }:
{ stdenv, fetchurl, gettext, kdelibs, libXtst, makeWrapper, qca2, qca2_ossl, qjson }:
stdenv.mkDerivation rec {
name = "kdeconnect-${version}";
version = "0.5.2.1";
version = "0.7";
src = fetchurl {
url = "http://download.kde.org/unstable/kdeconnect/0.5.2/src/kdeconnect-kde-${version}.tar.xz";
sha256 = "0g632ha7xcqf839c4h0dz5637bz6gnn2gz76dc0qq09zbrq49i08";
url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
sha256 = "0a8g3avg9x5j07cf3c16i4w65q3fn1cbs8zxgq0vl14rzdy09q2j";
};
buildInputs = [ gettext kdelibs makeWrapper qca2 qca2_ossl qjson ];
buildInputs = [ gettext kdelibs libXtst makeWrapper qca2 qca2_ossl qjson ];
postInstall = ''
wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins

2
pkgs/applications/misc/ocropus/default.nix
View File

@ -40,7 +40,7 @@ pythonPackages.buildPythonPackage rec {
src = fetchhg {
url = "https://code.google.com/p/ocropus.ocropy";
tag = "a6e0fbd820ce";
rev = "a6e0fbd820ce";
sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";
};

4
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -5,13 +5,13 @@ stdenv.mkDerivation rec {
src = fetchbzr {
url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable";
revision = 4024;
rev = 4024;
sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5";
};
srcLibrary = fetchbzr {
url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
revision = 293;
rev = 293;
sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i";
};

2
pkgs/applications/science/logic/abc/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = "https://bitbucket.org/alanmi/abc";
tag = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9";
rev = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9";
sha256 = "0ahrqg718y7xpv939f6x8w1kqh7wsja4pw8hca7j67j0qjdgb4lm";
};

2
pkgs/applications/science/math/glsurf/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchdarcs {
url = "http://lama.univ-savoie.fr/~raffalli/GlSurf";
tag = "3.3";
rev = "3.3";
sha256 = ""; md5="";
};

2
pkgs/applications/window-managers/tabbed/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = http://hg.suckless.org/tabbed;
tag = "d7542a6f6dc5";
rev = "d7542a6f6dc5";
sha256 = "1963jsazfmh5k7923c1mfwppz1xbh48z16j0sa64fiscq22as2gj";
};

4
pkgs/build-support/cabal/default.nix
View File

@ -82,9 +82,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
# the default download location for Cabal packages is Hackage,
# you still have to specify the checksum
src = fetchurl {
# cannot use mirrors system because of subtly different directory structures
urls = ["http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz"
"http://hdiff.luite.com/packages/archive/${self.pname}/${self.fname}.tar.gz"];
url = "mirror://hackage/${self.pname}/${self.fname}.tar.gz";
inherit (self) sha256;
};

4
pkgs/build-support/fetchbzr/builder.sh
View File

@ -1,9 +1,9 @@
source "$stdenv/setup"
header "exporting \`$url' (revision $revision) into \`$out'"
header "exporting \`$url' (revision $rev) into \`$out'"
# Perform a lightweight checkout so that we don't end up importing
# all the repository's history.
bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
stopNest

4
pkgs/build-support/fetchbzr/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, bazaar }:
{ url, revision, sha256 }:
{ url, rev, sha256 }:
stdenv.mkDerivation {
name = "bzr-export";
@ -11,5 +11,5 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = sha256;
inherit url revision;
inherit url rev;
}

6
pkgs/build-support/fetchdarcs/builder.sh
View File

@ -2,9 +2,9 @@ source $stdenv/setup
tagtext=""
tagflags=""
if test -n "$tag"; then
tagtext="(tag $tag) "
tagflags="--tag=$tag"
if test -n "$rev"; then
tagtext="(tag $rev) "
tagflags="--tag=$rev"
elif test -n "$context"; then
tagtext="(context) "
tagflags="--context=$context"

4
pkgs/build-support/fetchdarcs/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, darcs, nix}: {url, tag ? null, context ? null, md5 ? "", sha256 ? ""}:
{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
stdenv.mkDerivation {
name = "fetchdarcs";
@ -9,5 +9,5 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256;
inherit url tag context;
inherit url rev context;
}

4
pkgs/build-support/fetchhg/builder.sh
View File

@ -1,9 +1,9 @@
source $stdenv/setup
header "getting $url${tag:+ ($tag)} into $out"
header "getting $url${rev:+ ($rev)} into $out"
hg clone --insecure "$url" hg-clone
hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out
hg archive -q -y ${rev:+-r "$rev"} --cwd hg-clone $out
rm -f $out/.hg_archival.txt
stopNest

4
pkgs/build-support/fetchhg/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, mercurial, nix}: {name ? null, url, tag ? null, md5 ? null, sha256 ? null}:
{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null}:
# TODO: statically check if mercurial as the https support if the url starts woth https.
stdenv.mkDerivation {
@ -13,6 +13,6 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = if md5 != null then md5 else sha256;
inherit url tag;
inherit url rev;
preferLocalBuild = true;
}

18
pkgs/build-support/kernel/paths-from-graph.pl
View File

@ -1,9 +1,27 @@
# Parses a /nix/store/*-closure file and prints
# various information.
# By default, the nodes in the graph are printed to stdout.
# If the environment variable printManifest is set,
# then the graph is written as a manifest.
# If printRegistration is set, then the graph is written
# as a registration file for a manifest is written
# in the `nix-store --load-db' format.
use strict;
use File::Basename;
my %storePaths;
my %refs;
# Each argument on the command line is a graph file.
# The graph file contains line-triples and a variable
# number of references:
# <store-path>
# <deriver>
# <count>
# <ref-#1>
# ...
# <ref-#count>
foreach my $graph (@ARGV) {
open GRAPH, "<$graph" or die;

14
pkgs/development/libraries/haskell/SHA2/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, aes, monadsTf, transformers }:
cabal.mkDerivation (self: {
pname = "SHA2";
version = "0.2.5";
sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
buildDepends = [ aes monadsTf transformers ];
meta = {
description = "Fast, incremental SHA hashing for bytestrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

16
pkgs/development/libraries/haskell/command-qq/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ cabal, doctest, hspec, text }:
cabal.mkDerivation (self: {
pname = "command-qq";
version = "0.3.0.0";
sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
buildDepends = [ text ];
testDepends = [ doctest hspec text ];
doCheck = false;
meta = {
homepage = "http://biegunka.github.io/command-qq/";
description = "Quasiquoters for external commands";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

15
pkgs/development/libraries/haskell/deepseq-generics/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, deepseq, HUnit, testFramework, testFrameworkHunit }:
cabal.mkDerivation (self: {
pname = "deepseq-generics";
version = "0.1.1.1";
sha256 = "1icc2gxsbnjjl150msnyysvr9r14kb6s2gm3izrj5a3mwf6l7s08";
buildDepends = [ deepseq ];
testDepends = [ deepseq HUnit testFramework testFrameworkHunit ];
meta = {
homepage = "https://github.com/hvr/deepseq-generics";
description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

2
pkgs/development/lisp-modules/lisp-packages.nix
View File

@ -37,7 +37,7 @@ let lispPackages = rec {
src = pkgs.fetchdarcs {
url = "http://common-lisp.net/project/iterate/darcs/iterate";
sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w";
tag=version;
rev = version;
};
overrides = x: {
configurePhase="buildPhase(){ true; }";

37
pkgs/development/tools/ocaml/cppo/default.nix Normal file
View File

@ -0,0 +1,37 @@
{stdenv, fetchurl, ocaml, findlib}:
let
pname = "cppo";
version = "0.9.4";
webpage = "http://mjambon.com/${pname}.html";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
sha256 = "1m7cbja7cf74l45plqnmjrjjz55v8x65rvx0ikk9mg1ak8lcmvxa";
};
buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = ''
mkdir $out/bin
'';
meta = {
description = "The C preprocessor for OCaml";
longDescription = ''
Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
'';
homepage = "${webpage}";
license = "bsd";
};
}

16
pkgs/development/tools/packer/deps.nix
View File

@ -15,7 +15,7 @@ let
root = "code.google.com/p/go.crypto";
src = fetchhg {
url = "http://code.google.com/p/go.crypto";
tag = "199";
rev = "199";
sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh";
};
}
@ -23,7 +23,7 @@ let
root = "code.google.com/p/goauth2";
src = fetchhg {
url = "http://code.google.com/p/goauth2";
tag = "67";
rev = "67";
sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah";
};
}
@ -31,7 +31,7 @@ let
root = "code.google.com/p/google-api-go-client";
src = fetchhg {
url = "http://code.google.com/p/google-api-go-client";
tag = "111";
rev = "111";
sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16";
};
}
@ -39,7 +39,7 @@ let
root = "code.google.com/p/gosshold";
src = fetchhg {
url = "http://code.google.com/p/gosshold";
tag = "2";
rev = "2";
sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8";
};
}
@ -65,7 +65,7 @@ let
root = "launchpad.net/tomb";
src = fetchbzr {
url = "https://launchpad.net/tomb";
revision = "17";
rev = "17";
sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0";
};
}
@ -82,7 +82,7 @@ let
root = "code.google.com/p/goprotobuf";
src = fetchhg {
url = "http://code.google.com/p/goprotobuf";
tag = "246";
rev = "246";
sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4";
};
}
@ -135,7 +135,7 @@ let
root = "launchpad.net/gocheck";
src = fetchbzr {
url = "https://launchpad.net/gocheck";
revision = "87";
rev = "87";
sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
};
}
@ -278,7 +278,7 @@ let
root = "launchpad.net/mgo";
src = fetchbzr {
url = "https://launchpad.net/mgo";
revision = "2";
rev = "2";
sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
};
}

2
pkgs/games/dwarf-therapist/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = "https://code.google.com/r/splintermind-attributes/";
tag = rev;
inherit rev;
sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z";
};

36
pkgs/games/openspades/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,
SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
assert withOpenal -> openal != null;
stdenv.mkDerivation rec {
name = "openspades-${version}";
version = "0.0.12";
src = fetchurl {
url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz";
sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";
};
nativeBuildInputs =
with stdenv.lib;
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
++ optional withOpenal openal;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ];
# OpenAL is loaded dynamicly
postInstall =
if withOpenal then ''
wrapProgram "$out/bin/openspades" \
--prefix LD_LIBRARY_PATH : "${openal}/lib"
''
else null;
meta = with stdenv.lib; {
description = "OpenSpades is a compatible client of Ace of Spades 0.75";
homepage = "https://github.com/yvt/openspades/";
license = licenses.gpl3;
platforms = platforms.linux;
};
}

2
pkgs/games/opentyrian/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = "https://opentyrian.googlecode.com/hg/";
tag = "13ef8ce47362";
rev = "13ef8ce47362";
md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0";
};

61
pkgs/servers/http/nix-binary-cache/default.nix Normal file
View File

@ -0,0 +1,61 @@
{stdenv, fetchurl
, coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl
, lighttpd, iproute }:
stdenv.mkDerivation rec {
version = "2014-06-29-1";
name = "nix-binary-cache-${version}";
phases = ["installPhase"];
installPhase = ''
mkdir -p "$out/bin"
substitute "${./nix-binary-cache.cgi.in}" "$out"/bin/nix-binary-cache.cgi \
--replace @out@ "$out/bin" \
--replace @shell@ "${stdenv.shell}" \
--replace @coreutils@ "${coreutils}/bin" \
--replace @findutils@ "${findutils}/bin" \
--replace @nix@ "${nix}/bin" \
--replace @xz@ "${xz}/bin" \
--replace @bzip2@ "${bzip2}/bin" \
--replace @gnused@ "${gnused}/bin" \
--replace @gnugrep@ "${gnugrep}/bin" \
--replace @openssl@ "${openssl}/bin" \
--replace @lighttpd@ "${lighttpd}/sbin" \
--replace @iproute@ "${iproute}/sbin" \
--replace "xXxXx" "xXxXx"
chmod a+x "$out/bin/nix-binary-cache.cgi"
substitute "${./nix-binary-cache-start.in}" "$out"/bin/nix-binary-cache-start \
--replace @out@ "$out/bin" \
--replace @shell@ "${stdenv.shell}" \
--replace @coreutils@ "${coreutils}/bin" \
--replace @findutils@ "${findutils}/bin" \
--replace @nix@ "${nix}/bin" \
--replace @xz@ "${xz}/bin" \
--replace @bzip2@ "${bzip2}/bin" \
--replace @gnused@ "${gnused}/bin" \
--replace @gnugrep@ "${gnugrep}/bin" \
--replace @openssl@ "${openssl}/bin" \
--replace @lighttpd@ "${lighttpd}/sbin" \
--replace @iproute@ "${iproute}/sbin" \
--replace "xXxXx" "xXxXx"
chmod a+x "$out/bin/nix-binary-cache-start"
'';
meta = {
description = ''A set of scripts to serve the Nix store as a binary cache'';
longDescription = ''
This package installs a CGI script that serves Nix store path in the
binary cache format. It also installs a launcher called
nix-binary-cache-start that can be run without any setup to launch
a binary cache and get the example arguments for its usage.
'';
maintainers = [stdenv.lib.maintainers.raskin];
license = stdenv.lib.licenses.gpl2Plus;
inherit version;
platforms = stdenv.lib.platforms.all;
hydraPlatforms = [];
};
}

105
pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in Normal file
View File

@ -0,0 +1,105 @@
#! @shell@
parse_opts () {
while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do
case "$1" in
--store-dir)
shift;
echo "STORE_DIR='$1'"
shift;
;;
--priority)
shift;
echo "PRIORITY=$1";
shift;
;;
--compression)
shift;
echo "COMPRESSION=$1";
shift;
;;
--key)
shift;
echo "KEY=${1#*:}"
echo "KEYNAME=${1%%:*}"
shift;
;;
--nix-remote)
shift;
echo "NIX_REMOTE=$1"
shift;
;;
--mass-query)
shift;
echo "MASS_QUERY=$1"
shift;
;;
--port)
shift;
echo "PORT=$1"
shift;
;;
--help)
cat <<EOF >&2
"$0": start the Nix binary cache serving the Nix store dynamically.
Recognized options:
--port server port
--store-dir served Nix store
--priority binary cache priority
--mass-query 0 or 1 - whether binary cache expects queries for nix-env -qas
--compression compression to use: bzip2 or xz
--key name:/path/to/key - key to use for narinfo signing
--nix-remote 'daemon' or empty string '' - whether to use daemon for store
operations
--help show help and exit
EOF
exit 1;
;;
*) shift ;;
esac;
done
}
workingdir="$(@coreutils@/mktemp -d)"
cd "$workingdir"
PORT=8080
(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@"
) > nix-binary-cache.conf || exit
. "$workingdir/nix-binary-cache.conf"
echo "
server.port = $PORT
server.modules = ( \"mod_cgi\", \"mod_setenv\", )
server.document-root = \"$workingdir\"
cgi.assign = ( \".cgi\" => \"@shell@\" )
setenv.add-request-header = ( \"NIX_BINARY_CACHE_CONFIG\" => \"$workingdir/nix-binary-cache.conf\" )
" > lighttpd.conf
cp @out@/nix-binary-cache.cgi .
cp @out@/nix-binary-cache.cgi ./nix-bc.cgi
ip="$(@iproute@/ip a | @gnugrep@/grep 'inet .* scope global' | @coreutils@/head -n 1)"
ip="${ip%%/*}"
ip="${ip##* }"
url="http://$ip:$PORT/nix-bc.cgi?"
echo "Working directory: $workingdir"
echo
echo "Address of the binary cache: $url"
echo
echo "Usage example: NIX_REMOTE= nix-store --option binary-caches '$url'"
echo
echo
@lighttpd@/lighttpd -D -f "$workingdir/lighttpd.conf"
cd /
@coreutils@/rm -rf "$workingdir"

97
pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in Normal file
View File

@ -0,0 +1,97 @@
#! @shell@
STORE_DIR="${NIX_STORE_DIR:-/nix/store}"
MASS_QUERY=0
PRIORITY=75
COMPRESSION=bzip2
KEY=
KEYNAME=na
export NIX_REMOTE=daemon
config="${NIX_BINARY_CACHE_CONFIG:-${HTTP_NIX_BINARY_CACHE_CONFIG:-/etc/nix/nix-binary-cache.cgi.conf}}"
config="$(cd "$(@coreutils@/dirname "$config")";
@coreutils@/pwd)/$(@coreutils@/basename "$config")"
@coreutils@/test -e "$config" && . "$config"
header(){
echo "Content-Type: text/plain; charset=utf-8"
echo
}
clean_path() {
@gnused@/sed -re "s@^$STORE_DIR/?@@" | @findutils@/xargs
}
storeq(){
@nix@/nix-store -q "$@"
}
sign(){
test -n "$1" &&
@coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' |
@openssl@/openssl rsautl -sign -inkey "$@" | @coreutils@/base64 -w 0
}
case "$QUERY_STRING" in
"")
header
echo "Hello, this is a dynamically-generated Nix binary cache"
;;
/debug)
header
set
;;
/nix-cache-info)
header
echo "StoreDir: $STORE_DIR"
echo "WantMassQuery: $MASS_QUERY"
echo "Priority: $PRIORITY"
;;
*.narinfo)
hash=${QUERY_STRING%.narinfo}
hash=${hash#/}
path="$(echo "$STORE_DIR/$hash-"* )"
if [ -n "$path" ] && [ -e "$path" ]; then
header
info="$(
echo "StorePath: $path"
echo "URL: $(@coreutils@/basename "$path"
).nar.$COMPRESSION"
echo "Compression: $COMPRESSION"
echo "NarHash: $(storeq --hash "$path")"
echo "NarSize: $(storeq --size "$path")"
echo "References: $(storeq --references "$path" |
@coreutils@/tac | clean_path )"
echo "Deriver: $(storeq --deriver "$path" |
clean_path )"
)"
signature="$(echo "$info" | sign "$KEY")"
echo "$info"
echo "Signature: 1;$KEYNAME;$signature"
else
exit 1
fi
;;
*.nar.xz)
path="$STORE_DIR${QUERY_STRING%.nar.xz}"
if [ -n "$path" ] && [ -e "$path" ]; then
header
@nix@/nix-store --dump "$path" | @xz@/xz
else
exit 1
fi
;;
*.nar.bzip2)
path="$STORE_DIR${QUERY_STRING%.nar.bzip2}"
echo "$path" >&2;
if [ -n "$path" ] && [ -e "$path" ]; then
header
@nix@/nix-store --dump "$path" | @bzip2@/bzip2
else
exit 1
fi
;;
esac

2
pkgs/servers/nsq/deps.nix
View File

@ -6,7 +6,7 @@ let
root = "code.google.com/p/snappy-go";
src = fetchhg {
url = "http://code.google.com/p/snappy-go";
tag = "14";
rev = "14";
sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7";
};
}

8
pkgs/servers/serfdom/deps.nix
View File

@ -6,7 +6,7 @@ let
root = "code.google.com/p/go.net";
src = fetchhg {
url = "http://code.google.com/p/go.net";
tag = "134";
rev = "134";
sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv";
};
}
@ -14,7 +14,7 @@ let
root = "code.google.com/p/go.text";
src = fetchhg {
url = "http://code.google.com/p/go.text";
tag = "85";
rev = "85";
sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr";
};
}
@ -157,7 +157,7 @@ let
root = "launchpad.net/gocheck";
src = fetchbzr {
url = "https://launchpad.net/gocheck";
revision = "87";
rev = "87";
sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
};
}
@ -165,7 +165,7 @@ let
root = "launchpad.net/mgo";
src = fetchbzr {
url = "https://launchpad.net/mgo";
revision = "2";
rev = "2";
sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
};
}

37
pkgs/tools/filesystems/ceph/default.nix Normal file
View File

@ -0,0 +1,37 @@
{stdenv, fetchgit, atomicops ? null, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat,
fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool,
libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}:
stdenv.mkDerivation rec {
baseName="ceph";
version="0.79";
name="${baseName}-${version}";
buildInputs = [
fuse linuxHeaders pkgconfig atomicops autoconf automake boost btrfsProgs cryptopp expat
fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig
python snappy which xfsprogs.lib xz
];
preConfigure = ''
./autogen.sh
'';
installFlags = "DESTDIR=\${out}";
enableParallelBuilding = true;
src = fetchgit {
url = "https://github.com/ceph/ceph";
rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";
sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";
};
meta = {
inherit version;
description = "Distributed storage system";
maintainers = [
stdenv.lib.maintainers.ak
];
platforms = with stdenv.lib.platforms;
linux;
};
}

17
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -12,11 +12,26 @@ stdenv.mkDerivation rec {
sed -i s,/bin/bash,`type -P bash`, install-sh
'';
outputs = ["out" "lib"];
postInstall = ''
(cd include; make install-dev)
# The make install-dev target is broken when --disable-shared
mkdir -p $lib/lib $lib/include
cp ./libhandle/.libs/libhandle.a \
./libxcmd/.libs/libxcmd.a \
./libxlog/.libs/libxlog.a \
./libxfs/.libs/libxfs.a $lib/lib
mv $out/include/* $lib/include
'';
enableParallelBuilding = true;
buildInputs = [ libtool gettext libuuid ];
configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared";
preConfigure = ''
configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$out/lib"
configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib"
'';
disableStatic = false;

6
pkgs/tools/misc/ngrok/default.nix
View File

@ -30,16 +30,16 @@ let
url = "https://launchpad.net/goyaml";
sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj";
# Branch: "branch:lp:goyaml"
revision = 47;
rev = 47;
};
log4go = fetchhg {
url = "https://code.google.com/p/log4go/";
tag = "c3294304d93f";
rev = "c3294304d93f";
sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p";
};
osext = fetchhg {
url = "https://bitbucket.org/kardianos/osext";
tag = "364fb57";
rev = "364fb57";
sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws";
};
in stdenv.mkDerivation rec {

2
pkgs/tools/security/meo/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchhg {
url = http://oss.stamfest.net/hg/meo;
tag = "b48e5f16cff8";
rev = "b48e5f16cff8";
sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq";
};

2
pkgs/tools/system/storebrowse/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# This source has license BSD
srcGoSqlite = fetchhg {
url = "https://code.google.com/p/gosqlite/";
tag = "5baefb109e18";
rev = "5baefb109e18";
sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk";
};

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

@ -737,6 +737,8 @@ let
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
ceph = callPackage ../tools/filesystems/ceph { };
cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex ffmpeg;
};
@ -3175,6 +3177,8 @@ let
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
cppo = callPackage ../development/tools/ocaml/cppo { };
cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
deriving = callPackage ../development/tools/ocaml/deriving { };
@ -5780,6 +5784,8 @@ let
ffmpeg = ffmpeg_0_10;
};
openspades = callPackage ../games/openspades {};
openssl = callPackage ../development/libraries/openssl {
fetchurl = fetchurlBoot;
cryptodevHeaders = linuxPackages.cryptodev.override {
@ -6746,6 +6752,8 @@ let
ngircd = callPackage ../servers/irc/ngircd { };
nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};
nsd = callPackage ../servers/dns/nsd { };
nsq = callPackage ../servers/nsq { };

13
pkgs/top-level/haskell-packages.nix
View File

@ -587,6 +587,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {};
deepseq = null; # core package since ghc >= 7.4.x
deepseqGenerics = callPackage ../development/libraries/haskell/deepseq-generics {};
deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
derive = callPackage ../development/libraries/haskell/derive {};
@ -2090,6 +2092,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
SHA = callPackage ../development/libraries/haskell/SHA {};
SHA2 = callPackage ../development/libraries/haskell/SHA2 {};
shake = callPackage ../development/libraries/haskell/shake {};
shakespeare = callPackage ../development/libraries/haskell/shakespeare {};
@ -2799,9 +2803,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {
Cabal = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version
then null
else self.Cabal_1_18_1_3;
Cabal = self.Cabal_1_20_0_1;
cabalLenses = self.cabalLenses.override {
Cabal = self.Cabal_1_20_0_1;
};
};
cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};
@ -2822,6 +2827,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
codex = callPackage ../development/tools/haskell/codex {};
commandQq = callPackage ../development/libraries/haskell/command-qq {};
gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};