swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'channel-nixos' into python

Browse source
This commit is contained in:
Florian Friesdorf 2013-01-09 22:18:38 +01:00
parent 1b110436bf fdf11fdb7e
commit 06ca1e4768
35 changed files with 407 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "2.0.5";
version = "2.0.5.1";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
sha256 = "00pv2d9p8j1p6x87kalbn1bgxg9l4zqh65zcajrnh10a76isv6nk";
sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n";
};
configureFlags = [

176
pkgs/applications/networking/browsers/firefox/18.0.nix Normal file
View file

@ -0,0 +1,176 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0";
xulVersion = "18.0"; # this attribute is used by other packages
src = fetchurl {
urls = [
# It is better to use this url for official releases, to take load off Mozilla's ftp server.
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57";
};
commonConfigureFlags =
[ "--enable-optimize"
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
# "--with-system-jpeg" # Too old in nixpkgs
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
# "--with-system-nss" # Too old in nixpkgs
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
#installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
rm xulrunner
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
for i in $out/lib/$libDir/*.so; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
done
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
makeFlags = [
"SYSTEM_LIBXUL=1"
];
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View file

@ -13,6 +13,7 @@
, libXrender
, libXcursor
, libXt
, libvdpau
, gtk
, glib
, pango
@ -78,6 +79,7 @@ stdenv.mkDerivation {
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
];
buildPhase = ":";

32
pkgs/applications/science/misc/boinc/default.nix
View file

@ -1,18 +1,20 @@
{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl,
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl,
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
stdenv.mkDerivation rec {
name = "boinc-6.12.39";
name = "boinc-7.0.44";
src = fetchsvn {
url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
rev = 24341;
sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
src = fetchgit {
url = "git://boinc.berkeley.edu/boinc.git";
rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
};
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ];
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11
libxcb xcbutil
];
postConfigure = ''
sed -i -e s,/etc,$out/etc, client/scripts/Makefile
@ -27,17 +29,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = "--disable-server --disable-fast-install";
postInstall = "
# Remove a leading rpath to /tmp/... I don't know how it got there
# I could not manage to get rid of that through autotools.
for a in $out/bin/*; do
RPATH=$(patchelf --print-rpath $a)
NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://')
patchelf --set-rpath $out/lib:$NEWRPATH $a
done
";
configureFlags = "--disable-server";
meta = {
description = "Free software for distributed and grid computing";

4
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View file

@ -12,14 +12,14 @@
}:
let
version = "3.20130102";
version = "3.20130107";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "0aga3i7rzq21vyj2wq87n4yl5aljzxc69vbzw43nxx9sr2f3xyh5";
sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
name = "git-annex-${version}.tar.gz";
};

4
pkgs/applications/window-managers/xmonad/xmonad-extras.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmonad-extras";
version = "0.10.1.2";
sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay";
version = "0.11";
sha256 = "09r64z09mfdz86k7v5c6zds9ng0fjcp44kd8f5qg1sz40yblrny5";
buildDepends = [
hint libmpd mtl network parsec random regexPosix split X11 xmonad
xmonadContrib

4
pkgs/development/libraries/haskell/active/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "active";
version = "0.1.0.2";
sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674";
version = "0.1.0.3";
sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi";
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
jailbreak = true;
meta = {

4
pkgs/development/libraries/haskell/diagrams/core.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "0.6";
sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778";
version = "0.6.0.1";
sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa";
buildDepends = [
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints

4
pkgs/development/libraries/haskell/diagrams/lib.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "0.6";
sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf";
version = "0.6.0.1";
sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
buildDepends = [
active colour dataDefault diagramsCore monoidExtras newtype
NumInstances semigroups vectorSpace

14
pkgs/development/libraries/haskell/dimensional-tf/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, numtypeTf, time }:
cabal.mkDerivation (self: {
pname = "dimensional-tf";
version = "0.1.1";
sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci";
buildDepends = [ numtypeTf time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
description = "Statically checked physical dimensions, implemented using type families";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/dual-tree/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dual-tree";
version = "0.1.0.0";
sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167";
version = "0.1.0.1";
sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
buildDepends = [ monoidExtras newtype semigroups ];
jailbreak = true;
meta = {

14
pkgs/development/libraries/haskell/lens/default.nix
View file

@ -1,16 +1,16 @@
{ cabal, comonad, comonadsFd, comonadTransformers, filepath
, hashable, mtl, parallel, semigroups, split, text, transformers
, unorderedContainers, vector
, hashable, mtl, nats, parallel, semigroups, split, text
, transformers, transformersCompat, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "lens";
version = "3.7.2";
sha256 = "14kc9yhq7niv49gpdcl55priwnvisawa9jsp8hnplk48p11i2xs3";
version = "3.7.3";
sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz";
buildDepends = [
comonad comonadsFd comonadTransformers filepath hashable mtl
parallel semigroups split text transformers unorderedContainers
vector
comonad comonadsFd comonadTransformers filepath hashable mtl nats
parallel semigroups split text transformers transformersCompat
unorderedContainers vector
];
patchPhase = ''
sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal

4
pkgs/development/libraries/haskell/monoid-extras/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.2.2.1";
sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary";
version = "0.2.2.2";
sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
buildDepends = [ semigroups ];
jailbreak = true;
meta = {

6
pkgs/development/libraries/haskell/multiarg/default.nix
View file

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.6.0.0";
sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y";
version = "0.8.0.0";
sha256 = "17zfrm9zjf7c8g7q9vqj1srk0g766ifhwqp7gm4ql890541q5lv5";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";
description = "Combinators to build command line parsers";
license = self.stdenv.lib.licenses.mit;
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};

12
pkgs/development/libraries/haskell/nat/default.nix Normal file
View file

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "nat";
version = "0.3";
sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
meta = {
description = "Lazy binary natural numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/naturals/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "naturals";
version = "0.2.0.2";
sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
meta = {
homepage = "frigidcode.com";
description = "Constructors and related functions for natural numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/numtype-tf/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "numtype-tf";
version = "0.1";
sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v";
meta = {
homepage = "http://dimensional.googlecode.com/";
description = "Type-level (low cardinality) integers, implemented using type families";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

12
pkgs/development/libraries/haskell/type-level-natural-number/default.nix Normal file
View file

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "type-level-natural-number";
version = "1.1.1";
sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw";
meta = {
description = "Simple, Haskell 2010-compatible type level natural numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/warp/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.6";
sha256 = "0aw5m7apj7l6fjb0w59bmgiy4j0rmdwjil4ppgp5qz2q2njqbbnj";
version = "1.3.7";
sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libX11 }:
stdenv.mkDerivation rec {
name = "libvdpau-0.4.1";
name = "libvdpau-0.5";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "16zmmbawfnvrxjqvgfwxjfd1wh3vyz2cmvxza6cgf4j9qs36y6q6";
sha256 = "0k2ydz4yp7zynlkpd1llfwax30xndwbca36z83ah1i4ldjw2gfhx";
};
buildInputs = [ pkgconfig libX11 ];

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

@ -37,6 +37,7 @@
runHook postCheck
''
, preInstall ? ""
, postInstall ? ""
, ... } @ attrs:
@ -61,7 +62,7 @@ python.stdenv.mkDerivation (attrs // {
${preConfigure}
'';
installPhase = ''
installPhase = preInstall + ''
mkdir -p "$out/lib/${python.libPrefix}/site-packages"
echo "installing \`${name}' with \`easy_install'..."

11
pkgs/games/bsdgames/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ncurses, openssl, flex, bison, miscfiles}:
{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}:
stdenv.mkDerivation {
name = "bsd-games-2.17";
@ -26,12 +26,19 @@ stdenv.mkDerivation {
bsd_games_cfg_fortune_dir=$out/share/games/fortune
bsd_games_cfg_quiz_dir=$out/share/games/quiz
bsd_games_cfg_gamesdir=$out/bin
bsd_games_cfg_sbindir=$out/bin
bsd_games_cfg_usrbindir=$out/bin
bsd_games_cfg_libexecdir=$out/lib/games/dm
bsd_games_cfg_docdir=$out/share/doc/bsd-games
bsd_games_cfg_sharedir=$out/share/games
bsd_games_cfg_varlibdir=.
bsd_games_cfg_non_interactive=y
bsd_games_cfg_no_build_dirs="dab hack phantasia sail"
bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words
bsd_games_cfg_pager=${less}
EOF
sed -e s/getline/sdgames_local_getline/g -i $(grep getline -rl .)
sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .)
'';
postConfigure = ''

2
pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
View file

@ -1,7 +1,7 @@
From 0085f49cd0ba889e3db9102f328f6044ae3a2c18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:44:33 +0100
Subject: [PATCH 1/5] Make "systemctl daemon-reexec" do the right thing on
Subject: [PATCH 1/6] Make "systemctl daemon-reexec" do the right thing on
NixOS
---

2
pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
View file

@ -1,7 +1,7 @@
From 2b0a9106d3aabb365af0cc34b595a1e697120f37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:45:01 +0100
Subject: [PATCH 2/5] Ignore duplicate paths in "systemctl start"
Subject: [PATCH 2/6] Ignore duplicate paths in "systemctl start"
---
src/systemctl/systemctl.c | 7 +++++--

2
pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
View file

@ -1,7 +1,7 @@
From a013beb84f135cebf1c8c9363d5676c1c0a6be7a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:46:30 +0100
Subject: [PATCH 3/5] Start device units for uninitialised encrypted devices
Subject: [PATCH 3/6] Start device units for uninitialised encrypted devices
This is necessary because the NixOS service that initialises the
filesystem depends on the appearance of the device unit. Also, this

2
pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
View file

@ -1,7 +1,7 @@
From b40d8783f94666035baae567882c0d4be82cda01 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:48:19 +0100
Subject: [PATCH 4/5] Set switch-to-configuration hints for some units
Subject: [PATCH 4/6] Set switch-to-configuration hints for some units
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2
pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
View file

@ -1,7 +1,7 @@
From c5c8ac3a0420fb42ba2f629368fd5bd6ea1e753b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:56:03 +0100
Subject: [PATCH 5/5] sysinit.target: Drop the dependency on local-fs.target
Subject: [PATCH 5/6] sysinit.target: Drop the dependency on local-fs.target
and swap.target
Having all services with DefaultDependencies=yes depend on

38
pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch Normal file
View file

@ -0,0 +1,38 @@
From d3caa154098e215145679f38fa92a8bd482107be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 18:36:28 +0100
Subject: [PATCH 6/6] Don't call "plymouth quit"
NixOS doesn't use Plymouth (yet).
---
units/emergency.service.in | 1 -
units/rescue.service.m4.in | 1 -
2 files changed, 2 deletions(-)
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 442f0e0..6b7eafd 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -15,7 +15,6 @@ Before=shutdown.target
[Service]
Environment=HOME=/root
WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth quit
ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
ExecStart=-/sbin/sulogin
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index 269797a..2c640f4 100644
--- a/units/rescue.service.m4.in
+++ b/units/rescue.service.m4.in
@@ -16,7 +16,6 @@ Before=shutdown.target
[Service]
Environment=HOME=/root
WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth quit
ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
ExecStart=-/sbin/sulogin
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
--
1.8.0.1

10
pkgs/os-specific/linux/systemd/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux
, glib, kbd, libxslt, coreutils, libgcrypt
, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
}:
assert stdenv.gcc.libc or null != null;
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
./0003-Start-device-units-for-uninitialised-encrypted-devic.patch
./0004-Set-switch-to-configuration-hints-for-some-units.patch
./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
./0006-Don-t-call-plymouth-quit.patch
];
buildInputs =
@ -42,14 +43,17 @@ stdenv.mkDerivation rec {
preConfigure =
''
# FIXME: patch this in systemd properly (and send upstream).
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c; do
# FIXME: use sulogin from util-linux once updated.
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in; do
test -e $i
substituteInPlace $i \
--replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount \
--replace /sbin/swapon ${utillinux}/sbin/swapon \
--replace /sbin/swapoff ${utillinux}/sbin/swapoff \
--replace /sbin/fsck ${utillinux}/sbin/fsck
--replace /sbin/fsck ${utillinux}/sbin/fsck \
--replace /bin/echo ${coreutils}/bin/echo \
--replace /sbin/sulogin ${sysvtools}/sbin/sulogin
done
substituteInPlace src/journal/catalog.c \

11
pkgs/os-specific/linux/sysvinit/default.nix
View file

@ -4,12 +4,12 @@ let version = "2.88dsf"; in
stdenv.mkDerivation {
name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
src = fetchurl {
url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.bz2";
sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0";
};
prePatch = ''
# Patch some minimal hard references, so halt/shutdown work
sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h
@ -27,16 +27,17 @@ stdenv.mkDerivation {
'';
postInstall = stdenv.lib.optionalString withoutInitTools
''
''
mv $out/sbin/killall5 $out/bin
ln -sf killall5 $out/bin/pidof
rm -rf $out/sbin
shopt -s extglob
rm -rf $out/sbin/!(sulogin)
rm -rf $out/include
rm -rf $out/share/man/man5
rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1}
'';
meta = {
homepage = http://www.nongnu.org/sysvinit/;
description = "Utilities related to booting and shutdown";

36
pkgs/tools/networking/dd-agent/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ stdenv, fetchgit, python, sysstat }:
stdenv.mkDerivation rec {
name = "dd-agent-ab14fde6f9";
src = fetchgit {
url = git://github.com/DataDog/dd-agent.git;
rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770";
sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5";
};
buildInputs = [ python ];
postUnpack = "export sourceRoot=$sourceRoot/packaging";
makeFlags = [ "BUILD=$(out)" ];
installTargets = [ "install_base" "install_full" ];
postInstall = ''
mv $out/usr/* $out
rmdir $out/usr
'';
meta = {
description = "Event collector for the DataDog analysis service";
homepage = http://www.datadoghq.com;
maintainers = [ stdenv.lib.maintainers.shlevy ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}

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

@ -6782,6 +6782,8 @@ let
inherit (gnome) GConf libglade;
};
"dd-agent" = callPackage ../tools/networking/dd-agent { };
dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome) libart_lgpl libgnomeui;
};
@ -7077,6 +7079,13 @@ let
firefox17Wrapper = lowPrio (wrapFirefox { browser = firefox17Pkgs.firefox; });
firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
};
firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; });
flac = callPackage ../applications/audio/flac { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {

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

@ -711,6 +711,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dimensional = callPackage ../development/libraries/haskell/dimensional {};
dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {};
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
@ -1242,8 +1244,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
nat = callPackage ../development/libraries/haskell/nat {};
nats = callPackage ../development/libraries/haskell/nats {};
naturals = callPackage ../development/libraries/haskell/naturals {};
netlist = callPackage ../development/libraries/haskell/netlist {};
netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {};
@ -1281,6 +1287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
numtype = callPackage ../development/libraries/haskell/numtype {};
numtypeTf = callPackage ../development/libraries/haskell/numtype-tf {};
OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
ObjectName = callPackage ../development/libraries/haskell/ObjectName {};
@ -1686,6 +1694,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
typeEquality = callPackage ../development/libraries/haskell/type-equality {};
typeLlevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {};
unbound = callPackage ../development/libraries/haskell/unbound {};
uniplate = callPackage ../development/libraries/haskell/uniplate {};

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

@ -2599,7 +2599,6 @@ let pythonPackages = python.modules // rec {
sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd";
};
preInstallPhases = "preInstall";
preInstall = ''
cp ${x_ignore_nofocus}/* .
sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c

1
pkgs/top-level/release.nix
View file

@ -352,6 +352,7 @@ with (import ./release-lib.nix);
firefox36Pkgs.firefox = linux;
firefox17Pkgs.firefox = linux;
firefox18Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;