diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/btrfsprogs/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/fortune/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/misc/refind/default.nix | 34 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 18 |
4 files changed, 65 insertions, 15 deletions
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 68139f416ebb4..75f155fd0ddfd 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -3,9 +3,9 @@ let fetchurl = a.fetchurl; fetchgit = a.fetchgit; - version = a.lib.attrByPath ["version"] "0.19" a; + version = a.lib.attrByPath ["version"] "0.19-20120328" a; buildInputs = with a; [ - zlib libuuid acl attr + zlib libuuid acl attr e2fsprogs ]; in @@ -14,8 +14,8 @@ assert a.libuuid != null; rec { srcDrv = fetchgit { url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ; - rev="fdb6c0402337d9607c7a39155088eaf033742752" ; - sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ; + rev="1957076ab4fefa47b6efed3da541bc974c83eed7"; + sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1"; }; src = srcDrv + "/"; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix new file mode 100644 index 0000000000000..8e44b0998a2bf --- /dev/null +++ b/pkgs/tools/misc/fortune/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, recode }: + +stdenv.mkDerivation { + name = "fortune-mod_1.99.1"; + src = fetchurl { + url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz; + sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw"; + }; + buildInputs = [recode]; + preConfigure = '' + sed -i "s|/usr/|$out/|" Makefile + ''; + postInstall = '' + ln -s $out/games/fortune $out/bin/fortune + ''; + + meta = { + description = "fortune is a simple program that displays a pseudorandom message from a database of quotations that first appeared in Version 7 Unix."; + }; +} diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix new file mode 100644 index 0000000000000..bd0a7040adff7 --- /dev/null +++ b/pkgs/tools/misc/refind/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gnu_efi, unzip }: + +let version = "0.2.3"; in + +stdenv.mkDerivation { + name = "refind-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/refind/refind-src-${version}.zip"; + sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf"; + }; + + buildInputs = [ unzip ]; + + buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ]; + + installPhase = '' + mkdir -pv $out + install -v -m644 refind/refind.efi refind.conf-sample $out + mv -v icons $out + ''; + + meta = { + description = "An EFI boot manager"; + + homepage = http://www.rodsbooks.com/refind/; + + license = "GPLv3+"; + + maintainers = with stdenv.lib.maintainers; [ shlevy ]; + + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index f3ef69dd03d93..d32917c3bb774 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,20 +5,19 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre2614_005d1e4"; + name = "nix-1.0pre2632_b8fb0ce"; src = fetchurl { - url = "http://hydra.nixos.org/build/2230618/download/4/${name}.tar.bz2"; - sha256 = "47a4ff811f0d23d1c0176bc1fbb828edf16906568b0cbf5942b912ed2d2c1b44"; + url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2"; + sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da"; }; buildNativeInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl boehmgc ]; + buildInputs = [ curl openssl boehmgc bzip2 sqlite ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-bzip2=${bzip2} --with-sqlite=${sqlite} --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --disable-init-state @@ -30,11 +29,10 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv} - --enable-gc --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system @@ -44,11 +42,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + installCheckPhase = "make installcheck"; - # Hack to get the check to succeed on Darwin. - phases = stdenv.lib.optionalString stdenv.isDarwin - "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; + postPhases = [ "installCheckPhase" ]; meta = { description = "The Nix Deployment System"; |