From a0e21fd1ca2db70064cb65e0c1c99872c2ddf6ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 21:07:57 +0100 Subject: Mark more packages as broken --- pkgs/misc/emulators/VisualBoyAdvance/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/misc') 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; }; } -- cgit 1.4.1 From 78c76daf1643ce0e38e51211b8f7792711f1e7ed Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sat, 9 Nov 2013 23:02:37 +0100 Subject: gutenprint: upgrade to 5.2.9 --- pkgs/misc/drivers/gutenprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 79b819c12a7..9a1c46e922b 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -3,7 +3,7 @@ , libtiff, libpng, openssl, gimp }: let - version = "5.2.7"; + version = "5.2.9"; inherit (composableDerivation) edf wwf; in @@ -12,7 +12,7 @@ composableDerivation.composableDerivation {} { src = fetchurl { url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; - sha256 = "1lgf7d9vsszv0bzgsd8j3x5smby1lpk07d8x7isv1sz34y98jk0i"; + sha256 = "185wai9hk0z0144hpxn5mqncy6xikc4bdv49vxqh5lrjdzqf89sb"; }; # gimp, gui is still not working (TODO) -- cgit 1.4.1 From 80e2706e51cad94cefa7c020e84455e7664b8602 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 10 Nov 2013 00:32:17 +0100 Subject: gutenprint: fix the cupsd driver --- pkgs/misc/drivers/gutenprint/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 9a1c46e922b..77b3a22f464 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,6 +1,6 @@ # 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.9"; @@ -16,7 +16,7 @@ composableDerivation.composableDerivation {} { }; # 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,9 @@ 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 ''; meta = { -- cgit 1.4.1 From 72aae985ae0ae8972859a3fbb9b45d4cb86f2822 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 10 Nov 2013 16:27:02 +0100 Subject: gutenprint: wrap sbin/cups-genppd.5.2 This is used to generate ppd files for cups: $ cups-genppd.5.2 -M | grep p50 canon-cp500 escp2-p50 $ cups-genppd.5.2 -p . escp2-p50 This will create the relevant ppd file in the current directory. This can then be used by cups after setting services.drivers.drivers = [pkgs.gutenprint]; and configuring the printer to use this ppd e.g. via the web interface on http://localhost:631 --- pkgs/misc/drivers/gutenprint/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 77b3a22f464..ebec9867a61 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -40,6 +40,7 @@ composableDerivation.composableDerivation {} { 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 = { -- cgit 1.4.1 From 829b29153b66e32e30d213ed115911c1f1a8d9a6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 13 Nov 2013 12:45:40 +0200 Subject: clean up git revision handling in several packages --- pkgs/applications/misc/dunst/default.nix | 2 +- pkgs/applications/networking/remote/freerdp/unstable.nix | 2 +- pkgs/misc/uboot/guruplug.nix | 2 +- pkgs/os-specific/linux/mcelog/default.nix | 2 +- pkgs/tools/backup/bup/default.nix | 6 ++++-- pkgs/tools/networking/cjdns/default.nix | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index cb594e494db..1b61d75ddf2 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; - name = "dunst-${rev}"; + name = "dunst-0-${stdenv.lib.strings.substring 0 7 rev}"; # 1.0.0 release doesn't include 100% CPU fix # https://github.com/knopwob/dunst/issues/98 diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index ef8ddf8b0e3..cce3d23d194 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -25,7 +25,7 @@ assert printerSupport -> cups != null; let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in stdenv.mkDerivation rec { - name = "freerdp-1.1pre${rev}"; + name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; 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"; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b60b6134fdd..5c36bb09781 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -10,7 +10,7 @@ let rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2"; - version = "1.0pre-${rev}"; + version = "1.0pre-${stdenv.lib.strings.substring 0 7 rev}"; sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7"; in stdenv.mkDerivation { diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e683df5a7fe..54b089bd08e 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -3,14 +3,16 @@ assert par2Support -> par2cmdline != null; +let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in + with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.25-rc1-107-g96c6fa2"; + name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/bup/bup.git"; - rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; + inherit rev; sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; }; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index a76e351efc4..ffe22a93d0d 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -4,7 +4,7 @@ let rev = "f7b02ac0cc"; in stdenv.mkDerivation { - name = "cjdns-git-20130620-${rev}"; + name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/cjdelisle/cjdns.git"; -- cgit 1.4.1 From b5356f7f275e6fb15c6fda0ce65de26de98a87d0 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 16 Nov 2013 18:08:43 +0100 Subject: wine: (stable) bugfix update 1.6 -> 1.6.1 Tested on a couple of apps. --- pkgs/misc/emulators/wine/stable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') 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 { -- cgit 1.4.1 From 2a78fadf337bf3e7b4ea07be135e7b238a591cc7 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 24 Nov 2013 13:23:50 +0100 Subject: solfege: update 3.22 -> 3.22.2 (latest stable) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: Solfege 3.22.2, October 6, 2013 * Updated Esperanto, Portugese and Turkish translations to the users manual * Updated Spannish and Turkish messages * distribute solfege/tests/lesson-files/* * help/C/scales/modes.html are never translated. So we must link to the C-locale file in every translation. * gettext tweaks to make the test suite work both when run as "test.py" and "test.py test_lessonfile". There is still something wrong because we have to disable the test to run debuild * distribute solfege/tests/lib/* and solfege/test/include/* Solfege 3.22.1, September 16, 2013 * Adjust some of the short interval names used when selecting intervals to practise: u->P1 4->P4, 5->P5, tt->TT, p11->P11, p12->P12, tt8->d12. Added long name for intervals from Eleventh to Double Octave. * Fix the bug where we could not select the Default profile * Updated Esperanto, Spannish, Polish, Turkish, Vietnamese, Norwegian bokmål, Brazilian Portugese and Vietnamese translations. --- pkgs/misc/solfege/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 0449f72c997..bc20759db5e 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 -- cgit 1.4.1 From 8347ff8a2152b80df1923b4c1a54e2197dc10046 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 24 Nov 2013 13:27:24 +0100 Subject: solfege: refactor meta attributes --- pkgs/misc/solfege/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index bc20759db5e..b40ebe84bcb 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -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 ]; }; } -- cgit 1.4.1 From 435cffee5bbd4643d6b9c875da3852949f7d260c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:48:43 +0400 Subject: Update unstable Wine to 1.7.7 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') 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 { -- cgit 1.4.1 From 03d64a90414957b121c28a2a918de5c0a9fa864a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:23:35 +0200 Subject: slock: update from 1.0 to 1.1 --- pkgs/misc/screensavers/slock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') 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="; -- cgit 1.4.1