diff options
author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/misc | |
parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
download | nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.gz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.bz2 nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.lz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.xz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.zst nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/drivers/gutenprint/default.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/emulators/VisualBoyAdvance/default.nix | 3 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/stable.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/unstable.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/slock/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/solfege/default.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/uboot/guruplug.nix | 2 |
7 files changed, 24 insertions, 19 deletions
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 79b819c12a7..ebec9867a61 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,9 +1,9 @@ # this package was called gimp-print in the past { fetchurl, stdenv, pkgconfig, composableDerivation, cups -, libtiff, libpng, openssl, gimp }: +, libtiff, libpng, makeWrapper, openssl, gimp }: let - version = "5.2.7"; + version = "5.2.9"; inherit (composableDerivation) edf wwf; in @@ -12,11 +12,11 @@ composableDerivation.composableDerivation {} { src = fetchurl { url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; - sha256 = "1lgf7d9vsszv0bzgsd8j3x5smby1lpk07d8x7isv1sz34y98jk0i"; + sha256 = "185wai9hk0z0144hpxn5mqncy6xikc4bdv49vxqh5lrjdzqf89sb"; }; # gimp, gui is still not working (TODO) - buildInputs = [ openssl pkgconfig ]; + buildInputs = [ makeWrapper openssl pkgconfig ]; configureFlags = ["--enable-static-genppd"]; NIX_CFLAGS_COMPILE="-include stdio.h"; @@ -37,6 +37,10 @@ composableDerivation.composableDerivation {} { installPhase = '' eval "make install $installArgs" + mkdir -p $out/lib/cups + ln -s $out/filter $out/lib/cups/ + wrapProgram $out/filter/rastertogutenprint.5.2 --prefix LD_LIBRARY_PATH : $out/lib + wrapProgram $out/sbin/cups-genppd.5.2 --prefix LD_LIBRARY_PATH : $out/lib ''; meta = { diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 95f7d9433f9..942bf2c2184 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -13,11 +13,12 @@ stdenv.mkDerivation { sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp ''; buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - + meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; + broken = true; }; } diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix index 9c1f7fd24ae..a9e0aacba26 100644 --- a/pkgs/misc/emulators/wine/stable.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -6,13 +6,13 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -let - version = "1.6"; +let + version = "1.6.1"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1"; + sha256 = "0k1qb8hhaf5mbb3jk0a37jx93mvlxpk5c4dslxhalp2mic42rg6m"; }; gecko = fetchurl { diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 02ce076ce0f..2c649900034 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.4"; + version = "1.7.7"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0sb9zfrvlrjx1icfb94clgac239i9yfhyv48zv9iddgmvdjk8ysi"; + sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi"; }; gecko = fetchurl { diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index b33ca25fb10..c88be58abb2 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "slock-1.0"; + name = "slock-1.1"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9"; + sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0"; }; buildInputs = [ xproto libX11 libXext ]; installFlags = "DESTDIR=\${out} PREFIX="; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 0449f72c997..b40ebe84bcb 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "solfege-3.22.0"; + name = "solfege-3.22.2"; src = fetchurl { url = "mirror://sourceforge/solfege/${name}.tar.gz"; - sha256 = "10klrhdb1n67xd4bndk6z6idyf0pvwz7hcdg9ibalms7ywl3b23x"; + sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; buildInputs = [ pkgconfig python pygtk gettext texinfo @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$out/gdk-pixbuf.loaders" ''; - meta = { + meta = with stdenv.lib; { description = "Ear training program"; homepage = http://www.solfege.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index b1f4cab7b73..258ba999bf8 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -10,7 +10,7 @@ let rev = "f106056095049c2c748c2a2797e5353295240e04"; in stdenv.mkDerivation { - name = "uboot-guruplug-0.0pre${rev}"; + name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "git://git.denx.de/u-boot-marvell.git"; |