diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 38d972aa2434..37dc56585d9e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -9,13 +9,13 @@ , rsync, SafeSemaphore, SHA, stm, text, time, transformers , unixCompat, utf8String, uuid, wai, waiLogger, warp, which , xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm -, yesodStatic +, yesodStatic, fetchurl, perl }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20130827"; - sha256 = "07kfp0d2wg3p8s0v2100r4giw5ay1il5j15lrah43fk2rrszgm5z"; + version = "4.20130909"; + sha256 = "0rqbaz4hqfv1nxks62bx282vsvv7vzaxxz1576wk93f659rd06jp"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -29,7 +29,7 @@ cabal.mkDerivation (self: { uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic ]; - buildTools = [ bup curl git gnupg1 lsof openssh rsync which ]; + buildTools = [ bup curl git gnupg1 lsof openssh rsync which perl ]; configureFlags = "-fS3 -fWebDAV -fInotify @@ -49,6 +49,9 @@ cabal.mkDerivation (self: { cp dist/build/git-annex/git-annex git-annex ./git-annex test ''; + patches = [ (fetchurl { url = "https://github.com/joeyh/git-annex/commit/e4d0b2f180627472b017af8bcfc2ae3fc04d6767.patch"; + sha256 = "08lz0zq5y3b3wgi1vbzka7kyihkhzjv02pmq8ab02674yrqrnr5k"; }) + ]; meta = { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix new file mode 100644 index 000000000000..8756c4835b29 --- /dev/null +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -0,0 +1,84 @@ +{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, +bashInteractive, xz, shadow, gawk, less, buildEnv}: +{name, pkgs ? [], profile ? ""}: + +let + basePkgs = [ glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar gzip bzip2 +bashInteractive xz shadow gawk less ]; + + # Compose a global profile for the chroot environment + profilePkg = stdenv.mkDerivation { + name = "${name}-chrootenv-profile"; + buildCommand = '' + mkdir -p $out/etc + cat >> $out/etc/profile << "EOF" + export PS1='${name}-chrootenv:\u@\h:\w\$ ' + ${profile} + EOF + ''; + }; + + paths = basePkgs ++ [ profilePkg ] ++ pkgs; + + # Composes a /usr like directory structure + staticUsrProfile = buildEnv { + name = "system-profile"; + inherit paths; + }; + + # References to shell scripts that set up or tear down the environment + initSh = ./init.sh.in; + mountSh = ./mount.sh.in; + loadSh = ./load.sh.in; + umountSh = ./umount.sh.in; + destroySh = ./destroy.sh.in; +in +stdenv.mkDerivation { + name = "${name}-chrootenv"; + buildCommand = '' + mkdir -p $out/sw + cd $out/sw + + for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var} + do + if [ -x "$i" ] + then + ln -s "$i" + fi + done + + ln -s ${staticUsrProfile} usr + + cd .. + + mkdir -p bin + cd bin + + sed -e "s|@chrootEnv@|$out|g" \ + -e "s|@name@|${name}|g" \ + -e "s|@shell@|${stdenv.shell}|g" \ + ${initSh} > init-${name}-chrootenv + chmod +x init-${name}-chrootenv + + sed -e "s|@shell@|${stdenv.shell}|g" \ + -e "s|@name@|${name}|g" \ + ${mountSh} > mount-${name}-chrootenv + chmod +x mount-${name}-chrootenv + + sed -e "s|@shell@|${stdenv.shell}|g" \ + -e "s|@name@|${name}|g" \ + ${loadSh} > load-${name}-chrootenv + chmod +x load-${name}-chrootenv + + sed -e "s|@shell@|${stdenv.shell}|g" \ + -e "s|@name@|${name}|g" \ + ${umountSh} > umount-${name}-chrootenv + chmod +x umount-${name}-chrootenv + + sed -e "s|@chrootEnv@|$out|g" \ + -e "s|@shell@|${stdenv.shell}|g" \ + -e "s|@name@|${name}|g" \ + ${destroySh} > destroy-${name}-chrootenv + chmod +x destroy-${name}-chrootenv + ''; +} diff --git a/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in b/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in new file mode 100644 index 000000000000..30b51cb5068f --- /dev/null +++ b/pkgs/build-support/build-fhs-chrootenv/destroy.sh.in @@ -0,0 +1,21 @@ +#! @shell@ -e + +chrootenvDest=/run/chrootenv/@name@ + +# Remove bind mount points +rmdir $chrootenvDest/{dev,nix/store,nix,proc,sys,host-etc,home,var,run} + +# Remove symlinks to the software that should be part of the chroot system profile +for i in @chrootEnv@/sw/* +do + if [ "$i" != "@chrootEnv@/sw/etc" ] && [ "$i" != "@chrootEnv@/sw/var" ] + then + rm $chrootenvDest/$(basename $i) + fi +done + +# Remove the remaining folders +rm -Rf $chrootenvDest/{etc,root,tmp} + +# Remove the chroot environment folder +rmdir $chrootenvDest diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in new file mode 100644 index 000000000000..2dfa95219c85 --- /dev/null +++ b/pkgs/build-support/build-fhs-chrootenv/init.sh.in @@ -0,0 +1,48 @@ +#! @shell@ -e + +chrootenvDest=/run/chrootenv/@name@ + +# Create some mount points for stuff that must be bind mounted +mkdir -p $chrootenvDest/{nix/store,dev,proc,sys,host-etc,home,var,run} + +# Symlink the software that should be part of the chroot system profile +for i in @chrootEnv@/sw/* +do + if [ "$i" != "@chrootEnv@/sw/etc" ] && [ "$i" != "@chrootEnv@/sw/var" ] + then + ln -s "$i" "$chrootenvDest" + fi +done + +# Symlink the contents of the chroot software's /etc + +mkdir $chrootenvDest/etc + +for i in @chrootEnv@/sw/etc/* +do + ln -s "$i" $chrootenvDest/etc +done + +# Symlink some NSS stuff +ln -s ../host-etc/passwd $chrootenvDest/etc/passwd +ln -s ../host-etc/group $chrootenvDest/etc/group +ln -s ../host-etc/shadow $chrootenvDest/etc/shadow +ln -s ../host-etc/hosts $chrootenvDest/etc/hosts +ln -s ../host-etc/resolv.conf $chrootenvDest/etc/resolv.conf +ln -s ../host-etc/nsswitch.conf $chrootenvDest/etc/nsswitch.conf + +# Symlink PAM stuff +rm $chrootenvDest/etc/pam.d +ln -s ../host-etc/static/pam.d $chrootenvDest/etc/pam.d + +# Symlink Font stuff +mkdir $chrootenvDest/etc/fonts +ln -s ../../host-etc/static/fonts/fonts.conf $chrootenvDest/etc/fonts +mkdir $chrootenvDest/etc/fonts/conf.d +ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fonts/conf.d + +# Create root folder +mkdir $chrootenvDest/root + +# Create tmp folder +mkdir -m1777 $chrootenvDest/tmp diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in new file mode 100644 index 000000000000..8d3f464186b7 --- /dev/null +++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in @@ -0,0 +1,6 @@ +#! @shell@ -e + +chrootenvDest=/run/chrootenv/@name@ + +# Enter the LFS chroot environment +chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in new file mode 100644 index 000000000000..68459cca2560 --- /dev/null +++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in @@ -0,0 +1,23 @@ +#! @shell@ -e + +chrootenvDest=/run/chrootenv/@name@ + +# Bind mount the Nix store +mount --bind /nix/store $chrootenvDest/nix/store + +# Bind mount some kernel related stuff +mount --bind /dev $chrootenvDest/dev +mount --bind /dev/pts $chrootenvDest/dev/pts +mount --bind /dev/shm $chrootenvDest/dev/shm +mount --bind /proc $chrootenvDest/proc +mount --bind /sys $chrootenvDest/sys + +# Bind mount home directories +mount --bind /home $chrootenvDest/home + +# Bind mount state directories +mount --bind /var $chrootenvDest/var +mount --bind /run $chrootenvDest/run + +# Bind mount the host system's /etc +mount --bind /etc $chrootenvDest/host-etc diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in new file mode 100644 index 000000000000..29d631fbd90b --- /dev/null +++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in @@ -0,0 +1,6 @@ +#! @shell@ -e + +chrootenvDest=/run/chrootenv/@name@ + +# Unmount all bind mounts +umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run} diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index e36924f63fed..804c48383178 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,6 +1,6 @@ -{ cabal, binary, Cabal, filepath, gmp, happy, haskeline +{ cabal, binary, boehmgc, Cabal, filepath, gmp, happy, haskeline , languageJava, libffi, llvmGeneral, mtl, parsec, split, text -, transformers, vector, vectorBinaryInstances, boehmgc +, transformers, vector, vectorBinaryInstances }: cabal.mkDerivation (self: { @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { parsec split text transformers vector vectorBinaryInstances ]; buildTools = [ happy ]; - extraLibraries = [ gmp boehmgc ]; + extraLibraries = [ boehmgc gmp ]; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index e8db962d9c4f..a2dae290f447 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -3,14 +3,14 @@ fontconfig }: let - version = "6.2.6"; + version = "6.4.1"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "0ii14ghmky91kkh017khahl00s4igkz03b5gy6y0vhv179sz04ll"; + sha256 = "1szqqwypqfd0qr3sk0qlip1ar22kpqgba6b44klmr1aag0lrahs8"; }; buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index f9a48468df31..44e407105690 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchurl }: - +{ stdenv, fetchurl, readline, gmp, zlib }: + stdenv.mkDerivation rec { - name = "yap-5.1.1"; + version = "6.2.2"; + name = "yap-${version}"; src = fetchurl { - url = "mirror://sourceforge/yap/Yap-5.1.1.tar.gz"; - sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya"; + url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; + sha256 = "0l6p0vy667wws64cvwf74ssl6h9gypjzrsl3b2d32hs422186pzi"; }; - meta = { + buildInputs = [ readline gmp zlib ]; + + meta = { + homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; - homepage = http://yap.sourceforge.net/; license = "artistic"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 87a7f879be8d..b39da46e4a26 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "freetds-0.91"; src = fetchurl { - url = ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-stable.tgz; + url = ftp://ftp.astron.com/pub/freetds/stable/freetds-stable.tgz; sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 31bdba716b90..76424d79d7ad 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.8.2"; + name = "gtk+-3.8.4"; src = fetchurl { url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz"; - sha256 = "15zjmyky4yw70ipi12dllira4av8wjpw5f7g9kbrbpx12nf0ra0w"; + sha256 = "1qlj0qdhkp8j5xiris4l4xnx47g4pbk4qnj3nf8rwa82fwb610xh"; }; enableParallelBuilding = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - maintainers = with stdenv.lib.maintainers; [urkud raskin]; + maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index 28d8def56cf4..f7386f2776bc 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.11.4"; - sha256 = "1z9jswg5c2wp9k2lfp0yx7mvw6iiyizm72s552lgjn8i3slq8481"; + version = "0.12.0"; + sha256 = "0gz66j0091k18yy81kn3vcadjg8lrqdfxibjbzwyhi64m894f13w"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index cdf929d80274..8d31acb399f8 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -1,13 +1,13 @@ -{ cabal, hashable, liftedBase, ReadArgs, systemFilepath, text +{ cabal, hashable, liftedBase, ReadArgs, safe, systemFilepath, text , transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.5.0"; - sha256 = "1nrfibvvh5vzzr2jz5hipsj29b7ml6d90ijlr917n9aq200w14ar"; + version = "0.3.6.0"; + sha256 = "1sm89mva8vkhqp230g965b0k4n3g0c8w4sfsad8m1wh434g3k732"; buildDepends = [ - hashable liftedBase ReadArgs systemFilepath text transformers + hashable liftedBase ReadArgs safe systemFilepath text transformers unorderedContainers vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index 12118a375402..e80d2130ebd8 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-tests"; - version = "0.0.4"; - sha256 = "1c725zj94d6n33wldyzlm1qd32a0ais0w221ykpgs49rrd6hrpbh"; + version = "0.0.7"; + sha256 = "1qlb3qr6hnla0aayyjmi5r7m7w5vy1wx8yd9cl9cpzr8wviy4lch"; buildDepends = [ byteable cryptoCipherTypes HUnit mtl QuickCheck securemem testFramework testFrameworkHunit testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index f1665950a554..ca029910c9db 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-types"; - version = "0.0.4"; - sha256 = "0ipwplw1mn6amjxk2i5sksxvfsnf2fv8rnrgyncl21mp1gbnq7h0"; + version = "0.0.5"; + sha256 = "1n0sam5lldhzlcp6ihjika52pb5d12g6r9ln84s7zk7nv59lpqjl"; buildDepends = [ byteable securemem ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index efa63bdc0b7e..2b000724f122 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "0.7.1"; - sha256 = "0rdpp26zvimdhdw0jpw6w606jkzkqdx0pq4051fkyk2mldwk9ipj"; + version = "0.7.1.1"; + sha256 = "1fkrdds3p7ghjjscw5fmsjk8s5l31bz9a9z2qf3xwa1kp8p4d16d"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 50afb16f2823..4ce518c4061a 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.7"; - sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j"; + version = "0.7.1"; + sha256 = "1ig7a0ns458aqk9yxya7djdd40x3iyd1lycjygdl3zgl2pjpdva7"; buildDepends = [ active colour dataDefaultClass diagramsCore fingertree intervals monoidExtras newtype NumInstances semigroups vectorSpace diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 644037e946ee..320b9b481a60 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "0.7"; - sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x"; + version = "0.8.0.1"; + sha256 = "0ar7z46759s75fff0132mf51q53fvp2fkyqhw8b3lszsxvqs4r7y"; buildDepends = [ blazeSvg cmdargs colour diagramsCore diagramsLib filepath monoidExtras mtl split time vectorSpace diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 6d9caf6e6b63..57dab8852fdd 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.7.2"; - sha256 = "0f0l5kzkpn957v7ibaxz9bxmjmbjaw50z2xs23g2w06zwnxii90h"; + version = "1.7.2.1"; + sha256 = "12khyg6ixk2rkbvxjbi210w57cais1s142v337kpcp3dfk6440bk"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 6d6ac6b3fd0e..cbdc05f93e36 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.4.5"; - sha256 = "04b459x60dspd827k6ccikkm4j0cl7phcprvsdcqbc78yjf7vqpg"; + version = "1.9.5"; + sha256 = "01xmm63cbdm20wp6bpp3052zfpqmvglcq33skhy92cqkpgvd7f8y"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix new file mode 100644 index 000000000000..6993a7108d37 --- /dev/null +++ b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix @@ -0,0 +1,19 @@ +{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +}: + +cabal.mkDerivation (self: { + pname = "llvm-general-pure"; + version = "3.3.8.1"; + sha256 = "1izn30pka7z60dr73c3mhr5i8n2fb0yvpdgg66r7c5qf1m5bmqbx"; + buildDepends = [ mtl parsec setenv transformers ]; + testDepends = [ + HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + description = "Pure Haskell LLVM functionality (no FFI)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix index 16d9859aae22..fd7ee4849d9d 100644 --- a/pkgs/development/libraries/haskell/llvm-general/default.nix +++ b/pkgs/development/libraries/haskell/llvm-general/default.nix @@ -1,16 +1,18 @@ -{ cabal, HUnit, llvmConfig, mtl, parsec, QuickCheck, setenv -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, transformers +{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec +, QuickCheck, setenv, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, transformers, utf8String }: cabal.mkDerivation (self: { pname = "llvm-general"; - version = "3.3.5.0"; - sha256 = "15zrav7339jn6p75g1d7h3qkr1wyal1jzfs8xy73kckw2fzn4nlf"; - buildDepends = [ mtl parsec setenv text transformers ]; + version = "3.3.8.1"; + sha256 = "1w9wqi9mj673s0bm3j4a5kapl5f65sy8mwjbw7ydism6j5jmxhpk"; + buildDepends = [ + llvmGeneralPure mtl parsec setenv transformers utf8String + ]; testDepends = [ - HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 + HUnit llvmGeneralPure mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 ]; buildTools = [ llvmConfig ]; meta = { diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 3e9be2c5e587..2d6b846e7066 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.12.0.1"; - sha256 = "1sq4yxi231ka8rzwsihqziibs7amvl27ycr018wymm3yz36vsy7c"; + version = "0.13.0.0"; + sha256 = "16f8dd81wj81h0jcqnrlr2d6mjc7q2r436qf8z320d6wpzih2djy"; buildDepends = [ primitive time vector ]; testDepends = [ HUnit QuickCheck statistics testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index f9fa750b4b3a..9f89ae83ec60 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,15 +1,15 @@ -{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual -, cryptohash, HUnit, postgresqlLibpq, text, time, transformers -, vector +{ cabal, aeson, attoparsec, base16Bytestring, blazeBuilder +, blazeTextual, cryptohash, HUnit, postgresqlLibpq, text, time +, transformers, vector }: cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.3.6.0"; - sha256 = "1qszr3k7cihizbaq3naj134gavkpamk8q3g02rsilzvn0ivq8wb8"; + version = "0.3.7.1"; + sha256 = "1xrgwpg58srmzv1d0jdknyh5vwdq2c40fyqy0wvgppisxzq469wh"; buildDepends = [ - attoparsec blazeBuilder blazeTextual postgresqlLibpq text time - transformers vector + aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text + time transformers vector ]; testDepends = [ base16Bytestring cryptohash HUnit text time vector diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index b93adda166c7..089151a31ac9 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.0"; - sha256 = "03m6fi8dbc69i6mafyq2xxdmqp1zm0akfilahvjd7cknf4qhdyq7"; + version = "0.13.0.1"; + sha256 = "16v2x9gnkfwz87y7p727nbp4sn7xln7sn5n72ldxfdrnclyixxjk"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 4632d599a2e6..3f2842844443 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.3.0.0"; - sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8"; + version = "0.3.0.2"; + sha256 = "1m9vanwzlw61fbdcy7qvv2prmbax5y9dsl52dldcf5zr7vip2hpb"; buildDepends = [ hashable unorderedContainers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index ec0612ae1170..2d0dd397a08c 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,23 +1,23 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup , cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed , hspec, httpDate, httpTypes, mimeTypes, network, systemFileio -, systemFilepath, text, time, transformers, unixCompat, wai -, waiTest +, systemFilepath, text, time, transformers, unixCompat +, unorderedContainers, wai, waiTest, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.1.4"; - sha256 = "1457643xkigqnacg1fw25jp9kjqiy55d22ll8fml07bxs37hlr63"; + version = "1.3.2.1"; + sha256 = "1iw2b53p08c38fdh3d0js9j8lyy0i8qszp3jd736kzxxiig6ah79"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time - transformers unixCompat wai + transformers unixCompat unorderedContainers wai zlib ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers - unixCompat wai waiTest + unixCompat wai waiTest zlib ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index c437b5b86244..bdc299939196 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.2.1"; - sha256 = "1f3zdqywak54f2s11v26iyzb3svb0mdpfskxhps30jmkji2ph2iz"; + version = "1.2.3"; + sha256 = "1hnppb36acr18prra702r9hdbs803zfvaj8krq4idlvwb6g7l0d8"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 3afb8747547c..b260a6e4188e 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.3.2"; - sha256 = "10q4xjhcrskz3h0nay2vxfz2b3c2d532bvbggl2615aih05zdhwc"; + version = "1.2.3.3"; + sha256 = "13cbahj7kjxvw0p92sza72fyh47by5qna6ym9lsvka0y8fk7jf6w"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index bd2d0d97b2f0..153d361f4dd0 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.4.2"; - sha256 = "0zrhqh3phla8p7fjv30n4ypicbd6x6rwkrhpag79p1w4wwvkjxnn"; + version = "1.2.4.3"; + sha256 = "0p4bgpa1xb4s7yma16lw74gwm5865npdcc0djg1i4xp57q4d3dh6"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index aca42bfce6ca..878e3c9ebce1 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.2.1"; - sha256 = "0lybrw244y2ca1jvz218jh2kfypj4wblpdvk4n8wllll79dm3pq7"; + version = "1.3.2.2"; + sha256 = "1dqhpzkhg9wcdd9djynrjixpp28rj8iy9pfipx250bry7yq77rv2"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index ec24f1fca970..6702cdec9c1c 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,10 +3,10 @@ assert zlib != null; let - version = "1.6.3"; - sha256 = "0i8gz8mbkygc0ny7aa2i2wiavysxy6fdaphl52l49fb3hv9w1v65"; - patch_src = fetchurl { - url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; + version = "1.6.4"; + sha256 = "15pqany43q2hzaxqn84p9dba071xmvqi8h1bhnjxnxdf3g64zayg"; + patch_src = fetchurl { # not released yet, hopefully OK + url = "mirror://sourceforge/libpng-apng/libpng-1.6.3-apng.patch.gz"; sha256 = "0fjnb6cgbj2c7ggl0qzcnliml2ylrjxzigp89vw0hxq221k5mlsx"; }; whenPatched = stdenv.lib.optionalString apngSupport; @@ -27,10 +27,11 @@ in stdenv.mkDerivation rec { passthru = { inherit zlib; }; - meta = { + meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = http://www.libpng.org/pub/png/libpng.html; license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a361f06e4ba9..4fa5ee9e74ae 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -24,6 +24,7 @@ else let version = "9.1.6"; + # this is the default search path for DRI drivers (note: X server introduces an overriding env var) driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in stdenv.mkDerivation { @@ -134,6 +135,8 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" fi done + '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' + substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" ''; #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 24896aa58266..0d298558e5ee 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.0-7952-g439b0e9"; + name = "gnulib-0.0-8015-gf0aab22"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "439b0e925f9ffb6fe58481717def708af96a9321"; - sha256 = "0xvnqn3323w0wnd1p7dhkcd4mihfh2dby88kv2dsclszppd9g4dc"; + rev = "f0aab227265173908ecaa2353de6cf791cec3304"; + sha256 = "162i39wvrmjhkg8w07i92vg9l0f0lk57zl1ynf0lvs70rkdd8a82"; }; buildPhase = ":"; diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index efdc65c389e6..70a8cfd5d6ce 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.0.2"; - sha256 = "05dlrx4wfadv798098bclkmsmm6f226n9rqp19ajdwaa11x5mf8d"; + version = "0.7.0.4"; + sha256 = "0h34bqiig4d7xk514gl0zk119xbl2i3x5h2hvylbrzq1mrdc6xnk"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 7574500dbbb2..133e1c381940 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -3,11 +3,11 @@ let edf = composableDerivation.edf; in composableDerivation.composableDerivation {} rec { - name="avrdude-5.10"; + name="avrdude-5.11"; src = fetchurl { url = "mirror://savannah/avrdude/${name}.tar.gz"; - sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41"; + sha256 = "1mwmslqysak25a3x61pj97wygqgk79s5qpp50xzay6yb1zrz85v3"; }; configureFlags = [ "--disable-dependency-tracking" ]; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 80a7fe489259..b447cf918cf1 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchurl, gtk, pkgconfig}: stdenv.mkDerivation { - name = "gtkdialog-0.7.9"; + name = "gtkdialog-0.8.3"; src = fetchurl { - url = ftp://linux.pte.hu/pub/gtkdialog/gtkdialog-0.7.9.tar.gz; - sha256 = "142k8fnh1b8jclm7my2rhk7n8j1b0xh76b2gg712r738r94qwka2"; + url = http://gtkdialog.googlecode.com/files/gtkdialog-0.8.3.tar.gz; + sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; buildInputs = [ gtk pkgconfig ]; meta = { - homepage = http://linux.pte.hu/~pipas/gtkdialog/; + homepage = http://gtkdialog.googlecode.com/; description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; license = "GPLv2+"; }; diff --git a/pkgs/development/tools/parsing/happy/1.18.11.nix b/pkgs/development/tools/parsing/happy/1.18.11.nix new file mode 100644 index 000000000000..41f6d5c49a4b --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.18.11.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, perl }: + +cabal.mkDerivation (self: { + pname = "happy"; + version = "1.18.11"; + sha256 = "1hssiihzl7xipmn5bz71q30wbq2sj92lh2f7z4jarckhldwcqfi9"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix new file mode 100644 index 000000000000..2173d12666e5 --- /dev/null +++ b/pkgs/games/steam/chrootenv.nix @@ -0,0 +1,12 @@ +{ buildFHSChrootEnv, steam +, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib +}: + +buildFHSChrootEnv { + name = "steam"; + pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib ]; + profile = '' + export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib + export FONTCONFIG_FILE=/etc/fonts/fonts.conf + ''; +} diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 1e8c0db90455..80be4ec85957 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc +/*{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio @@ -97,3 +97,28 @@ stdenv.mkDerivation rec { license = "unfree"; }; } +*/ + +{stdenv, fetchurl, dpkg}: + +stdenv.mkDerivation { + name = "steam-1.0.0.42"; + src = fetchurl { + url = http://repo.steampowered.com/steam/archive/precise/steam-launcher_1.0.0.42_all.deb; + sha256 = "1jyvk0h1z78sdpvl4hs1kdvr6z2kwamf09vjgjx1f6j04kgqrfbw"; + }; + buildInputs = [ dpkg ]; + unpackPhase = "true"; + installPhase = '' + mkdir -p $out + dpkg -x $src $out + cp -av $out/usr/* $out + rm -Rf $out/usr + ''; + + meta = { + description = "A digital distribution platform"; + homepage = http://store.steampowered.com/; + license = "unfree"; + }; +} diff --git a/pkgs/os-specific/darwin/setfile/default.nix b/pkgs/os-specific/darwin/setfile/default.nix index 94320c94bc0c..98dd6b3e2e72 100644 --- a/pkgs/os-specific/darwin/setfile/default.nix +++ b/pkgs/os-specific/darwin/setfile/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Set attributes of files and directories"; homepage = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html"; - license = licenses.unfree; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.darwin; @@ -32,4 +31,3 @@ stdenv.mkDerivation { ''; }; } - diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 7597a9c695ec..46c9108ec08a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.50"; + version = "3.2.51"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68"; + sha256 = "1x1yk07ihfbrhsycmd44h9fn6ajg6akwgsxxdi2rk5cs8g706s63"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 5bcb8aaf2506..33494a65f23e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.60"; + version = "3.4.61"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "16pg9sdsf5nwp1lc583dcbn1ay67b7yb55xg8cgv63bvmh4h3vrb"; + sha256 = "1izjmpcb2ww1pj5nyxgnx4v5ghl0d173w2s6py89ai4yqzqamhnf"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 561cdc8f9576..73533104ca9a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -131,11 +131,11 @@ rec { patch = ./mips-ext3-n32.patch; }; - grsecurity_2_9_1_3_2_50 = - { name = "grsecurity-2.9.1-3.2.50"; + grsecurity_2_9_1_3_2_51 = + { name = "grsecurity-2.9.1-3.2.51"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch; - sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n"; + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.51-201309101928.patch; + sha256 = "90f9ddc74d56f4525b8faa8505a95f45c23a2e763c7519ba5ae953069a51aca2"; }; }; diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 0feba1b1c319..09594a5c59eb 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, zlib, xz}: +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "kexec-tools-2.0.4"; -stdenv.mkDerivation { - name = "kexectools-2.0.3"; - src = fetchurl { - url = http://horms.net/projects/kexec/kexec-tools/kexec-tools-2.0.3.tar.xz; - sha256 = "1ac6szvm6pdhn5b8ba5l06rx09rylsqhgv1l6wmy4b5b1hrbip52"; + url = "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"; + sha256 = "1ikqm4w125h060dsvg9brri6ma51qn76mjjff6s1bss6sw0apxg5"; }; - buildInputs = [ xz zlib ]; - + buildInputs = [ zlib ]; + meta = { - homepage = http://horms.net/projects/kexec/kexec-tools/; - description = "Tools related to the kexec linux feature"; + homepage = http://horms.net/projects/kexec/kexec-tools; + description = "Tools related to the kexec Linux feature"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix new file mode 100644 index 000000000000..86ff9ec8fae5 --- /dev/null +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, unzip, jre }: + +stdenv.mkDerivation rec { + name = "ditaa-0.9"; + + src = fetchurl { + name = "${name}.zip"; + url = "mirror://sourceforge/project/ditaa/ditaa/0.9/ditaa0_9.zip"; + sha256 = "12g6k3hacvyw3s9pijli7vfnkspyp37qkr29qgbmq1hbp0ryk2fn"; + }; + + buildInputs = [ unzip ]; + + phases = [ "installPhase" ]; + + installPhase = '' + unzip "$src" + + mkdir -p "$out/bin" + mkdir -p "$out/lib" + mkdir -p "$out/share/ditaa" + + cp dita*.jar "$out/lib/ditaa.jar" + cp COPYING HISTORY "$out/share/ditaa" + + cat > "$out/bin/ditaa" << EOF + #!${stdenv.shell} + exec ${jre}/bin/java -jar "$out/lib/ditaa.jar" "\$@" + EOF + + chmod a+x "$out/bin/ditaa" + ''; + + meta = with stdenv.lib; { + description = "Convert ascii art diagrams into proper bitmap graphics"; + homepage = http://ditaa.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 5ac059070801..df4917e803d0 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage { src = fetchurl { url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; name = "fail2ban-${version}.zip"; - sha256 = "1linfz5qxmm4225lzi9vawsa79y41d3rcdahvrzlyqlhb02ipd55"; + sha256 = "0lbanfshr8kasa1bb7861w3mrm2d0c1bvv4s5703265s8zp5m284"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch b/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch new file mode 100644 index 000000000000..addf00796a8a --- /dev/null +++ b/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch @@ -0,0 +1,25 @@ +From 4ef50d76a2da61be60fea448690e24f35bc37299 Mon Sep 17 00:00:00 2001 +From: Peter Simons +Date: Wed, 11 Sep 2013 17:19:29 +0200 +Subject: [PATCH] Run tcpcryptd under uid 93 instead of 666. + +--- + user/src/linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/user/src/linux.c b/user/src/linux.c +index b51e6b2..8199193 100644 +--- a/user/src/linux.c ++++ b/user/src/linux.c +@@ -198,7 +198,7 @@ void linux_drop_privs(void) + + cap_free(caps); + +- if (setuid(666) == -1) ++ if (setuid(93) == -1) + err(1, "setuid()"); + + caps = cap_init(); +-- +1.8.3.4 + diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 3026ed66d72f..17c6993826d8 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv +{ fetchurl, stdenv, autoconf, automake, libtool , openssl, libcap, libnfnetlink, libnetfilter_queue }: @@ -14,9 +14,13 @@ stdenv.mkDerivation rec { name = "${name}.tar.gz"; }; - buildInputs = [ openssl libcap libnfnetlink libnetfilter_queue ]; + dontStrip = true; - preConfigure = "cd user"; + buildInputs = [ autoconf automake libtool openssl libcap libnfnetlink libnetfilter_queue ]; + + patches = [ ./0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch ]; + + preConfigure = "cd user; autoreconf -i"; meta = { homepage = "http://tcpcrypt.org/"; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix new file mode 100644 index 000000000000..10822f1809fb --- /dev/null +++ b/pkgs/tools/text/poedit/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, wxGTK29, boost }: + +stdenv.mkDerivation rec { + name = "poedit-1.5.7"; + + src = fetchurl { + url = "http://prdownloads.sourceforge.net/poedit/${name}.tar.gz"; + sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4"; + }; + + buildInputs = [ wxGTK29 boost ]; + + meta = with stdenv.lib; { + description = "Cross-platform gettext catalogs (.po files) editor"; + homepage = http://www.poedit.net/; + license = licenses.mit; + platforms = with platforms; unix; + maintainers = with maintainers; [ iElectric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9b023d4f70f..95ff09d7b7b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -266,6 +266,12 @@ let buildEnv = import ../build-support/buildenv { inherit (pkgs) runCommand perl; }; + + buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { + inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; + inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; + inherit less buildEnv; + }; dotnetenv = import ../build-support/dotnetenv { inherit stdenv; @@ -533,6 +539,8 @@ let catdoc = callPackage ../tools/text/catdoc { }; + ditaa = callPackage ../tools/graphics/ditaa { }; + dlx = callPackage ../misc/emulators/dlx { }; eggdrop = callPackage ../tools/networking/eggdrop { }; @@ -1540,6 +1548,8 @@ let podiff = callPackage ../tools/text/podiff { }; + poedit = callPackage ../tools/text/poedit { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; @@ -6499,7 +6509,7 @@ let }; linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_51 ]; })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); linux_3_2_apparmor = lowPrio (linux_3_2.override { @@ -9157,6 +9167,10 @@ let stardust = callPackage ../games/stardust {}; steam = callPackage_i686 ../games/steam {}; + + steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix { + zenity = gnome2.zenity; + }; stuntrally = callPackage ../games/stuntrally { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9cbca4bd9d63..41be5715a672 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_1; alex = self.alex_3_0_5; haddock = self.haddock_2_13_2; - happy = self.happy_1_18_10; + happy = self.happy_1_18_11; primitive = self.primitive_0_5_0_1; # semi-official, but specified }; @@ -1379,6 +1379,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmConfig = pkgs.llvm; }; + llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; + lrucache = callPackage ../development/libraries/haskell/lrucache {}; ltk = callPackage ../development/libraries/haskell/ltk {}; @@ -2334,7 +2336,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {}; happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; - happy = self.happy_1_18_10; + happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; + happy = self.happy_1_18_11; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb77e11babd0..dea65b5fe513 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3793,14 +3793,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; - pip = buildPythonPackage { - name = "pip-1.2.1"; + pip = buildPythonPackage rec { + version = "1.4.1"; + name = "pip-${version}"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz"; - md5 = "db8a6d8a4564d3dc7f337ebed67b1a85"; + url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; + sha256 = "0knhj3c1nqqzxgqin8l0gzy6nzsbcxinyr0cbp1j99hi8xahcyjf"; }; buildInputs = [ mock scripttest virtualenv nose ]; # ValueError: Working directory tests not found, or not a directory + # see https://github.com/pypa/pip/issues/92 doCheck = false; };