dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons 2013-02-24 19:27:08 +01:00
commit 5f32207dfc
57 changed files with 474 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/audio/ardour/ardour3.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python, serd, sord, sratom, suil }:
let
# Ardour 3 Beta 5
rev = "13072";
# Ardour 3 RC2
rev = "14092";
in
stdenv.mkDerivation {
@ -16,35 +16,36 @@ stdenv.mkDerivation {
src = fetchsvn {
url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
inherit rev;
sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736";
sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg";
};
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec
flac glib glibmm gtk gtkmm jackaudio libgnomecanvas
libgnomecanvasmm liblo libmad libogg librdf librdf_raptor
librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid
libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord
sratom suil
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil
];
patchPhase = ''
printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
'';
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
postInstall = ''
mkdir -pv $out/gtk-2.0/2.10.0/engines
mv lib/ardour3/libclearlooks.so $out/gtk-2.0/2.10.0/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk-2.0
'';
# For the custom ardour clearlooks gtk-engine to work, it must be
# moved to a directory called "engines" and added to GTK_PATH
installPhase = ''
python waf install
mkdir -pv $out/gtk2/engines
mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
'';
meta = with stdenv.lib; {
description = "Multi-track hard disk recording software";

4
pkgs/applications/audio/calf/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "calf-${version}";
version = "0.0.19-rc7";
version = "0.0.19";
src = fetchurl {
url = "mirror://sourceforge/calf/${name}.tar.gz";
sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
sha256 = "1v1cjbxv5wg6rsa2nfz1f8r7cykcpx6jm5ccqmzx866dggiff1hi";
};
buildInputs = [

27
pkgs/applications/audio/mda-lv2/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "mda-lv2-${version}";
version = "1.0.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1dbgvpz9qvlwsfkq9c0dx45bm223wwrzgiddlyln1agpns3qbf0f";
};
buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/mda-lv2/;
description = "An LV2 port of the MDA plugins by Paul Kellett";
license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

7
pkgs/applications/misc/girara/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
stdenv.mkDerivation rec {
name = "girara-0.1.4";
name = "girara-0.1.5";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739";
sha256 = "1hfi3jmx8ydvrqm3h6p6py2csavh7xx0223vxyca51kjl9mfnbld";
};
buildInputs = [ pkgconfig gtk gettext ];
@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
girara is a library that implements a GTK+ based VIM-like user interface
that focuses on simplicity and minimalism.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

15
pkgs/applications/misc/grip/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
, curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation {
name = "grip-3.2.0";
stdenv.mkDerivation rec {
name = "grip-3.3.1";
src = fetchurl {
url = http://prdownloads.sourceforge.net/grip/grip-3.2.0.tar.gz;
sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
url = "mirror://sourceforge/grip/${name}.tar.gz";
sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
};
buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia
@ -14,9 +14,10 @@ stdenv.mkDerivation {
meta = {
description = "GTK+-based audio CD player/ripper";
homepage = http://nostatic.org/grip;
homepage = "http://nostatic.org/grip";
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.marcweber ];
#platforms = args.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
};
}

7
pkgs/applications/misc/zathura/core/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "0.2.1";
version = "0.2.2";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790";
sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5";
};
buildInputs = [ pkgconfig gtk girara gettext ];
@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://pwmt.org/projects/zathura/;
description = "A core component for zathura PDF viewer";
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
# Set lower priority in order to provide user with a wrapper script called
# 'zathura' instead of real zathura executable. The wrapper will build

4
pkgs/applications/misc/zathura/default.nix
View File

@ -34,7 +34,9 @@ rec {
is an application that provides a minimalistic and space saving interface
as well as an easy usage that mainly focuses on keyboard interaction.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
};
}

3
pkgs/applications/misc/zathura/djvu/default.nix
View File

@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
The zathura-djvu plugin adds DjVu support to zathura by using the
djvulibre library.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

8
pkgs/applications/misc/zathura/pdf-poppler/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
stdenv.mkDerivation rec {
name = "zathura-pdf-poppler-0.2.1";
version = "0.2.2";
name = "zathura-pdf-poppler-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd";
sha256 = "0px59f0bnmb9992n3c9iyzcwd6w7vg8ga069vc8qj4726ljml4c7";
};
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
The zathura-pdf-poppler plugin adds PDF support to zathura by
using the poppler rendering engine.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

3
pkgs/applications/misc/zathura/ps/default.nix
View File

@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
The zathura-ps plugin adds PS support to zathura by using the
libspectre library.
'';
license = "free";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

12
pkgs/applications/networking/browsers/firefox/18.0.nix → pkgs/applications/networking/browsers/firefox/19.0.nix
View File

@ -1,6 +1,6 @@
{ 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
, freetype, fontconfig, file, alsaLib, nspr, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0.2";
firefoxVersion = "19.0";
xulVersion = "18.0.2"; # this attribute is used by other packages
xulVersion = "19.0"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# 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 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
sha1 = "816d64e8c9432349cd208fd181d210c54f985351";
};
commonConfigureFlags =
@ -60,7 +60,7 @@ rec {
[ 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
alsaLib nspr libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
@ -125,7 +125,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];

3
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -3,7 +3,6 @@
, zlib
, alsaLib
, curl
, nss
, nspr
, fontconfig
, freetype
@ -77,7 +76,7 @@ stdenv.mkDerivation {
};
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
[ zlib alsaLib curl nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
libvdpau
];

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -49,7 +49,7 @@ rec {
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob;
SafeSemaphore networkProtocolXmpp async dns DAV uuid Glob;
};
qgit = import ./qgit {

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

@ -8,7 +8,7 @@
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
, transformers, transformersBase, utf8String, wai, waiLogger, warp
, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
, networkPprotocolXmpp, async, dns, DAV, uuid, Glob
, networkProtocolXmpp, async, dns, DAV, uuid, Glob
}:
let
@ -30,7 +30,7 @@ stdenv.mkDerivation {
httpTypes IfElse json liftedBase MissingH monadControl mtl network
networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
transformers transformersBase utf8String wai waiLogger warp yesod
yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
yesodDefault yesodStatic testpack SafeSemaphore networkProtocolXmpp
async dns DAV uuid Glob ];
checkTarget = "test";

14
pkgs/build-support/cabal/default.nix
View File

@ -99,6 +99,7 @@
eval "$preConfigure"
${lib.optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
for i in Setup.hs Setup.lhs; do
test -f $i && ghc --make $i
done
@ -114,6 +115,9 @@
done
done
test -z "$doCheck" || configureFlags+=" --enable-tests"
echo "configure flags: $libraryProfiling $splitObjects $extraLibDirs $configureFlags"
./Setup configure --verbose --prefix="$out" $libraryProfiling $splitObjects $extraLibDirs $configureFlags
eval "$postConfigure"
@ -131,6 +135,16 @@
eval "$postBuild"
'';
checkPhase = ''
if [ -n "$doCheck" ]; then
eval "$preCheck"
./Setup test
eval "$postCheck"
fi
'';
# installs via Cabal; creates a registration file for nix-support
# so that the package can be used in other Haskell-builds; also
# adds all propagated build inputs to the user environment packages

8
pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libart_lgpl-2.3.20";
stdenv.mkDerivation rec {
name = "libart_lgpl-2.3.21";
src = fetchurl {
url = mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2;
sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym";
url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2";
sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx";
};
}

128
pkgs/development/interpreters/ruby/generated.nix
View File

@ -13,17 +13,17 @@ g: # Get dependencies from patched gems
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
autotest_rails = g.autotest_rails_4_1_2;
aws_sdk = g.aws_sdk_1_8_1_2;
aws_sdk = g.aws_sdk_1_8_3;
builder = g.builder_3_1_4;
buildr = g.buildr_1_4_9;
bundler = g.bundler_1_2_3;
buildr = g.buildr_1_4_10;
bundler = g.bundler_1_2_4;
childprocess = g.childprocess_0_3_8;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_1_3;
erubis = g.erubis_2_7_0;
eventmachine = g.eventmachine_1_0_0;
fakes3 = g.fakes3_0_1_5;
ffi = g.ffi_1_3_1;
ffi = g.ffi_1_4_0;
foreman = g.foreman_0_61_0;
highline = g.highline_1_6_2;
hike = g.hike_1_2_1;
@ -31,17 +31,20 @@ g: # Get dependencies from patched gems
i18n = g.i18n_0_6_1;
journey = g.journey_1_0_4;
jruby_pageant = g.jruby_pageant_1_1_1;
jsduck = g.jsduck_4_6_1;
json = g.json_1_7_7;
json_pure = g.json_pure_1_7_7;
libv8 = g.libv8_3_3_10_4_x86_64_linux;
macaddr = g.macaddr_1_6_1;
mail = g.mail_2_4_4;
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_5_1;
multi_json = g.multi_json_1_6_1;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_5;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_5_6;
parallel = g.parallel_0_6_2;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_5_2;
rack_cache = g.rack_cache_1_2;
@ -52,6 +55,7 @@ g: # Get dependencies from patched gems
railties = g.railties_3_2_12;
rake = g.rake_10_0_3;
rb_fsevent = g.rb_fsevent_0_9_3;
rdiscount = g.rdiscount_2_0_7;
rdoc = g.rdoc_3_12_1;
rjb = g.rjb_1_4_6;
rspec = g.rspec_2_11_0;
@ -61,21 +65,22 @@ g: # Get dependencies from patched gems
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_9;
sass = g.sass_3_2_5;
selenium_webdriver = g.selenium_webdriver_2_29_0;
selenium_webdriver = g.selenium_webdriver_2_30_0;
sinatra = g.sinatra_1_3_2;
sprockets = g.sprockets_2_2_2;
systemu = g.systemu_2_5_2;
therubyracer = g.therubyracer_0_10_2;
thin = g.thin_1_5_0;
thor = g.thor_0_17_0;
tilt = g.tilt_1_3_3;
treetop = g.treetop_1_4_12;
tzinfo = g.tzinfo_0_3_35;
uuid = g.uuid_2_3_6;
uuid = g.uuid_2_3_7;
uuidtools = g.uuidtools_2_1_3;
websocket = g.websocket_1_0_7;
xml_simple = g.xml_simple_1_1_1;
};
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gems = {
ZenTest_4_9_0 = {
basename = ''ZenTest'';
@ -171,7 +176,7 @@ installed versions.'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.12'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ];
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_6_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
};
arel_3_0_2 = {
@ -226,16 +231,16 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.ZenTest_4_9_0 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
aws_sdk_1_8_1_2 = {
aws_sdk_1_8_3 = {
basename = ''aws_sdk'';
meta = {
description = ''AWS SDK for Ruby'';
homepage = ''http://aws.amazon.com/sdkforruby'';
longDescription = ''AWS SDK for Ruby'';
};
name = ''aws-sdk-1.8.1.2'';
name = ''aws-sdk-1.8.3'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x'';
sha256 = ''0ggvwiya4swyjyswfgwhzw09hap2slz7djp0svq22y7j0xci1axy'';
};
builder_3_0_4 = {
basename = ''builder'';
@ -285,7 +290,7 @@ simple to do. Currently the following builder objects are supported:
requiredGems = [ ];
sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
};
buildr_1_4_9 = {
buildr_1_4_10 = {
basename = ''buildr'';
meta = {
description = ''Build like you code'';
@ -297,20 +302,20 @@ to do, and it takes care of the rest. But also something we can easily extend
for those one-off tasks, with a language that's a joy to use.
'';
};
name = ''buildr-1.4.9'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ];
sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az'';
name = ''buildr-1.4.10'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_2_4 ];
sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
};
bundler_1_2_3 = {
bundler_1_2_4 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://gembundler.com'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
name = ''bundler-1.2.3'';
name = ''bundler-1.2.4'';
requiredGems = [ ];
sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w'';
sha256 = ''0p90abn29wvg6ic1230f4dj7zs55r9r772b0xq02fwqd0ry3pdgl'';
};
childprocess_0_3_8 = {
basename = ''childprocess'';
@ -320,7 +325,7 @@ for those one-off tasks, with a language that's a joy to use.
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
};
name = ''childprocess-0.3.8'';
requiredGems = [ g.ffi_1_3_1 ];
requiredGems = [ g.ffi_1_4_0 ];
sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4'';
};
daemons_1_1_9 = {
@ -412,16 +417,16 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ];
sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
};
ffi_1_3_1 = {
ffi_1_4_0 = {
basename = ''ffi'';
meta = {
description = ''Ruby FFI'';
homepage = ''http://wiki.github.com/ffi/ffi'';
longDescription = ''Ruby FFI library'';
};
name = ''ffi-1.3.1'';
name = ''ffi-1.4.0'';
requiredGems = [ ];
sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb'';
sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
};
foreman_0_61_0 = {
basename = ''foreman'';
@ -513,6 +518,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
};
jsduck_4_6_1 = {
basename = ''jsduck'';
meta = {
description = ''Simple JavaScript Duckumentation generator'';
homepage = ''https://github.com/senchalabs/jsduck'';
longDescription = ''Documentation generator for Sencha JS frameworks'';
};
name = ''jsduck-4.6.1'';
requiredGems = [ g.rdiscount_2_0_7 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 ];
sha256 = ''01bws3jfsym531znwsd6qjaymf1mrsss1bj8csvj3vhnv728qbyh'';
};
json_1_7_7 = {
basename = ''json'';
meta = {
@ -546,6 +562,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
};
libv8_3_3_10_4_x86_64_linux = {
basename = ''libv8'';
meta = {
description = ''Distribution of the V8 JavaScript engine'';
homepage = ''http://github.com/fractaloop/libv8'';
longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
};
name = ''libv8-3.3.10.4-x86_64-linux'';
requiredGems = [ ];
sha256 = ''13lnmkm9z3xqyi8rlsycfd7wybv044pxcisrkyq0cx7ig91a0dmc'';
};
macaddr_1_6_1 = {
basename = ''macaddr'';
meta = {
@ -611,16 +638,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_5_1 = {
multi_json_1_6_1 = {
basename = ''multi_json'';
meta = {
description = ''A gem to provide swappable JSON backends.'';
homepage = ''http://github.com/intridea/multi_json'';
longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
};
name = ''multi_json-1.5.1'';
name = ''multi_json-1.6.1'';
requiredGems = [ ];
sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz'';
sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
};
net_sftp_2_0_5 = {
basename = ''net_sftp'';
@ -681,6 +708,16 @@ enough of it.'';
requiredGems = [ ];
sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
};
parallel_0_6_2 = {
basename = ''parallel'';
meta = {
description = ''Run any kind of code in parallel processes'';
homepage = ''http://github.com/grosser/parallel'';
};
name = ''parallel-0.6.2'';
requiredGems = [ ];
sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
};
polyglot_0_3_3 = {
basename = ''polyglot'';
meta = {
@ -787,7 +824,7 @@ request helpers feature.'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ];
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_4 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
};
railties_3_2_12 = {
@ -845,6 +882,16 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
};
rdiscount_2_0_7 = {
basename = ''rdiscount'';
meta = {
description = ''Fast Implementation of Gruber's Markdown in C'';
homepage = ''http://github.com/rtomayko/rdiscount'';
};
name = ''rdiscount-2.0.7'';
requiredGems = [ ];
sha256 = ''1cj9dn59xqjaglvzvd1ninid62xmih74az0glqqb90n2p42s2zs1'';
};
rdoc_3_12_1 = {
basename = ''rdoc'';
meta = {
@ -971,16 +1018,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k'';
};
selenium_webdriver_2_29_0 = {
selenium_webdriver_2_30_0 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.29.0'';
requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj'';
name = ''selenium-webdriver-2.30.0'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''1ybx8v9m5y8ykbdbldd1mglz0xhg30iv0708ig0vzjl2522sg6v1'';
};
sinatra_1_3_2 = {
basename = ''sinatra'';
@ -1001,7 +1048,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_3 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
systemu_2_5_2 = {
@ -1015,6 +1062,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
};
therubyracer_0_10_2 = {
basename = ''therubyracer'';
meta = {
description = ''Embed the V8 Javascript interpreter into Ruby'';
homepage = ''http://github.com/cowboyd/therubyracer'';
longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
};
name = ''therubyracer-0.10.2'';
requiredGems = [ g.libv8_3_3_10_4_x86_64_linux ];
sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
};
thin_1_5_0 = {
basename = ''thin'';
meta = {
@ -1069,7 +1127,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp'';
};
uuid_2_3_6 = {
uuid_2_3_7 = {
basename = ''uuid'';
meta = {
description = ''UUID generator'';
@ -1078,9 +1136,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
(http://www.ietf.org/rfc/rfc4122.txt).
'';
};
name = ''uuid-2.3.6'';
name = ''uuid-2.3.7'';
requiredGems = [ g.macaddr_1_6_1 ];
sha256 = ''194xznnxncfgr0nx84l11gnafvkfzr1nj1swnwas75q0ld0ri2l8'';
sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
};
uuidtools_2_1_3 = {
basename = ''uuidtools'';

0
pkgs/development/libraries/atkmm/2.22.x.nix → pkgs/development/libraries/atkmm/default.nix
View File

4
pkgs/development/libraries/audio/lilv/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
version = "0.14.2";
version = "0.16.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "0g9sg5f8xkkvsad0c6rh4j1k2b2hwsh83yg66f4qznxh43np7zlx";
sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];

4
pkgs/development/libraries/audio/lv2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lv2-${version}";
version = "1.0.0";
version = "1.4.0";
src = fetchurl {
url = "http://lv2plug.in/spec/${name}.tar.bz2";
sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5";
sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz";
};
buildInputs = [ gtk libsndfile pkgconfig python ];

4
pkgs/development/libraries/audio/sratom/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sratom-${version}";
version = "0.2.0";
version = "0.4.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "12wi0ycjnn6mlddcp476wzr6k2bb4ig1489gg8h1k7v0w7d6ry1a";
sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i";
};
buildInputs = [ lv2 pkgconfig python serd sord ];

4
pkgs/development/libraries/audio/suil/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "suil-${version}";
version = "0.6.4";
version = "0.6.10";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y";
};
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];

24
pkgs/development/libraries/glibmm/2.30.x.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.30.1";
src = fetchurl {
url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
};
nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

24
pkgs/development/libraries/glibmm/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.34.1";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
};
buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

0
pkgs/development/libraries/gtkmm/2.24.x.nix → pkgs/development/libraries/gtkmm/2.x.nix
View File

0
pkgs/development/libraries/gtkmm/3.2.x.nix → pkgs/development/libraries/gtkmm/3.x.nix
View File

1
pkgs/development/libraries/haskell/gitit/default.nix
View File

@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
zlib
];
jailbreak = true;
meta = {
homepage = "http://gitit.net";
description = "Wiki using happstack, git or darcs, and pandoc";

5
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View File

@ -6,15 +6,14 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.1.5";
sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a";
version = "7.1.6";
sha256 = "0gifq625kclam6sgblwa8a1vhxmx8saanzlrikch0l9q0l95nfwd";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
text threads time timeCompat transformers transformersBase
utf8String xhtml zlib
];
jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";

5
pkgs/development/libraries/haskell/hoogle/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hoogle";
version = "4.2.15";
sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki";
version = "4.2.16";
sha256 = "1hamwqhndrkajm4xvxxfhr2rnlmf3z2ysyfxx3y6d24jawjyqf8a";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
haskellSrcExts httpTypes parsec random safe tagsoup time
transformers uniplate wai warp
];
jailbreak = true;
meta = {
homepage = "http://www.haskell.org/hoogle/";
description = "Haskell API Search";

4
pkgs/development/libraries/haskell/network/2.4.1.0.nix → pkgs/development/libraries/haskell/network/2.4.1.2.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "network";
version = "2.4.1.0";
sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3";
version = "2.4.1.2";
sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh";
buildDepends = [ parsec ];
meta = {
homepage = "https://github.com/haskell/network";

4
pkgs/development/libraries/haskell/shakespeare-css/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
version = "1.0.2.1";
sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca";
version = "1.0.3";
sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz";
buildDepends = [ parsec shakespeare text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";

4
pkgs/development/libraries/haskell/snap/server.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
version = "0.9.3.1";
sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53";
version = "0.9.3.3";
sha256 = "1n50xyhg4rva7ifv70825177606q87ip7f9p5kf94i9kci0kmlig";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
caseInsensitive enumerator MonadCatchIOTransformers mtl network

0
pkgs/development/tools/haskell/tar/0.4.0.1.nix → pkgs/development/libraries/haskell/tar/default.nix
View File

4
pkgs/development/libraries/haskell/xmlhtml/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmlhtml";
version = "0.2.0.4";
sha256 = "1z40hkq9l6nw3hcnz6d1x0han7ynjkvbvjy8bl5mq7zmhk1xhmr6";
version = "0.2.1";
sha256 = "1nqkjbhpzr7zxpjvlxy6pync6zyarvjblcxg8igq75dyzk7qhafg";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
];

4
pkgs/development/libraries/nspr/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
let version = "4.9.4"; in
let version = "4.9.5"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "196l8123gg5knxp7pgksngfcwm9k7n3qilkl725jyzz1bg3ld43l";
sha1 = "03885e992607e2be975f6525c6764c2167fe2eff";
};
preConfigure = "cd mozilla/nsprpub";

4
pkgs/development/libraries/serd/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "serd-${version}";
version = "0.14.0";
version = "0.18.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "023gsw0nwn2fh2vp7v2gwsmdwk6658zfl1ihdvr9xbayfcv88wlg";
sha256 = "1hgajhm4iar4n2kh71pv6yr0yhipj28kds9y5mbig8izqc188gcf";
};
buildInputs = [ pcre pkgconfig python ];

4
pkgs/development/libraries/sord/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sord-${version}";
version = "0.8.0";
version = "0.12.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "0ncaplfr3wal9h8h3lafw0bhx34w046r7md74djgrysrm2h77pwr";
sha256 = "1f0wz7ynnk72hyr4jfi0lgvj90ld2va1kig8fkw30s8b903alsqj";
};
buildInputs = [ pkgconfig python serd ];

14
pkgs/development/tools/haskell/cabal-dev/default.nix
View File

@ -1,15 +1,19 @@
{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib
{ cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib, setenv
}:
cabal.mkDerivation (self: {
pname = "cabal-dev";
version = "0.9.1";
sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6";
version = "0.9.1-git";
src = fetchurl {
url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz";
sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9";
name = "${self.name}.tar.gz";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network tar transformers zlib
Cabal filepath HTTP mtl network tar transformers zlib setenv
];
buildTools = [ cabalInstall ];
meta = {

20
pkgs/development/tools/haskell/cabal2ghci/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ cabal, Cabal, cmdargs, stylishHaskell, systemFileio
, systemFilepath, text, unorderedContainers, yaml
}:
cabal.mkDerivation (self: {
pname = "cabal2ghci";
version = "0.0.1.0";
sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal cmdargs stylishHaskell systemFileio systemFilepath text
unorderedContainers yaml
];
meta = {
description = "A tool to generate .ghci file from .cabal";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/tools/haskell/tar/0.3.2.0.nix
View File

@ -1,14 +0,0 @@
{ cabal, filepath }:
cabal.mkDerivation (self: {
pname = "tar";
version = "0.3.2.0";
sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9";
buildDepends = [ filepath ];
meta = {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

68
pkgs/games/unvanquished/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ stdenv, fetchurl, cmake, mesa, SDL, libjpeg, libpng, glew, libwebp, ncurses
, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore
, makeWrapper }:
stdenv.mkDerivation rec {
name = "unvanquished-${version}";
version = "0.12.0";
src = fetchurl {
url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz";
sha256 = "0spwin0vms1zzkbgzkm423k804nqr5d54xppjbwhdnrd5fdv0gyl";
};
buildInputs = [ cmake mesa SDL libjpeg libpng glew libwebp ncurses gmp curl
nettle openal speex libogg libvorbis libtheora xvidcore
makeWrapper ];
preConfigure = ''prefix="$prefix/opt"'';
postInstall = ''
# cp -r ../main "$prefix/Unvanquished/"
mkdir -p "$out/bin"
substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell}
cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3"
makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \
--run '[ -f ~/.Unvanquished/main/md5sums ] &&
cd ~/.Unvanquished/main/ &&
md5sum --quiet -c md5sums ||
unvanquished-download-pk3' \
--run "cd '$prefix/Unvanquished'"
makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \
--run '[ -f ~/.Unvanquished/main/md5sums ] &&
cd ~/.Unvanquished/main/ &&
md5sum --quiet -c md5sums ||
unvanquished-download-pk3' \
--run "cd '$prefix/Unvanquished'"
'';
meta = {
description = "A FLOSS FPS combining RTS elements with a futuristic, sci-fi setting.";
longDescription = ''
Unvanquished is a free, open-source first-person shooter
combining real-time strategy elements with a futuristic, sci-fi
setting. It is available for Windows, Linux, and Mac OS X.
Features:
* Two teams
Play as either the technologically advanced humans or the highly
adaptable aliens, with a fresh gameplay experience on both
sides.
* Build a base
Construct and maintain your base with a variety of useful
structures, or group up with teammates to take on the other
team.
* Level up
Earn rewards for victories against the other team, whether it's
a deadly new weapon or access to a whole new alien form.
* Customize
Compatibility with Quake 3 file formats and modification tools
allows for extensive customization of the game and its
setting.
'';
homepage = http://unvanquished.net;
#license = "unknown";
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
# This package can take a lot of disk space, so unavailable from channel
#platforms = with stdenv.lib.platforms; linux;
};
}

8
pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
View File

@ -2,12 +2,12 @@
cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
stdenv.mkDerivation rec {
version = "1.1.1";
name = "oxygen-gtk-${version}";
version = "1.3.2.1";
name = "oxygen-gtk2-${version}";
src = fetchurl {
url = "mirror://kde/stable/oxygen-gtk/${version}/src/${name}.tar.bz2";
sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379";
url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi";
};
buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf

1
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -134,7 +134,6 @@ stdenv.mkDerivation {
homepage = http://www.kernel.org/;
maintainers = [
lib.maintainers.eelco
lib.maintainers.shlevy
lib.maintainers.chaoflow
];
platforms = lib.platforms.linux;

1
pkgs/os-specific/linux/kernel/linux-3.7.nix
View File

@ -78,6 +78,7 @@ let
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
CFG80211_WEXT y # Without it, ipw2200 drivers don't build
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.

1
pkgs/os-specific/linux/kernel/linux-3.8.nix
View File

@ -78,6 +78,7 @@ let
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
CFG80211_WEXT y # Without it, ipw2200 drivers don't build
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.

8
pkgs/os-specific/linux/kmod/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, xz, zlib, pkgconfig }:
{ stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
name = "kmod-9";
name = "kmod-12";
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
sha256 = "1kyfplx0gygzxp5dn81yk3cn8zzraqm497vis04r1g1dnry2c1q6";
sha256 = "c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f";
};
# Disable xz/zlib support to prevent needing them in the initrd.
buildInputs = [ pkgconfig /* xz zlib */ ];
buildInputs = [ pkgconfig libxslt /* xz zlib */ ];
configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ];

1
pkgs/os-specific/linux/v86d/default.nix
View File

@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
description = "A userspace helper that runs x86 code in an emulated environment";
homepage = http://dev.gentoo.org/~spock/projects/uvesafb/;
license = "BSD";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

4
pkgs/servers/mediatomb/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii";
};
patches = [ ./zmm_new.patch ];
buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ];
configureFlags = [ "--enable-inotify" ];
@ -21,4 +23,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ];
platforms = platforms.linux;
};
}
}

13
pkgs/servers/mediatomb/zmm_new.patch Normal file
View File

@ -0,0 +1,13 @@
diff -rc mediatomb-0.12.1.old/src/zmm/object.h mediatomb-0.12.1/src/zmm/object.h
*** mediatomb-0.12.1.old/src/zmm/object.h 2010-03-25 07:58:08.000000000 -0700
--- mediatomb-0.12.1/src/zmm/object.h 2013-02-15 17:57:02.000000000 -0800
***************
*** 33,38 ****
--- 33,39 ----
#define __ZMM_OBJECT_H__
#include <new> // for size_t
+ #include <stddef.h>
#include "atomic.h"
namespace zmm

8
pkgs/tools/backup/bacula/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, sqlite, zlib, acl, ncurses, openssl, readline}:
stdenv.mkDerivation {
name = "bacula-5.0.3";
stdenv.mkDerivation rec {
name = "bacula-5.2.13";
src = fetchurl {
url = mirror://sourceforge/bacula/bacula-5.0.3.tar.gz;
sha256 = "1d7x6jw5x9ljbdxvcc8k635lsxcbxw9kzjyxf6l4zsdv3275j1cr";
url = "mirror://sourceforge/bacula/${name}.tar.gz";
sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4";
};
buildInputs = [ sqlite zlib acl ncurses openssl readline ];

14
pkgs/tools/misc/gummiboot/default.nix
View File

@ -1,21 +1,19 @@
{ stdenv, fetchurl, gnu_efi, unzip }:
{ stdenv, fetchurl, gnu_efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
stdenv.mkDerivation rec {
name = "gummiboot-16";
name = "gummiboot-23";
buildInputs = [ unzip ];
buildInputs = [ unzip pkgconfig utillinux libxslt docbook_xsl docbook_xml_dtd_42 ];
patches = [ ./no-usr.patch ];
buildFlags = [
"GNU_EFI=${gnu_efi}"
] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32";
buildFlags = [ "GNU_EFI=${gnu_efi}" ];
installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin";
makeFlags = [ "PREFIX=$(out)" ];
src = fetchurl {
url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip";
sha256 = "0as5svmvsbz08qgbvns77qfb36xi9lx2138ikiinqv6finzm8fi1";
sha256 = "1lmfk4k52ha00ppna5g7h51vhd27i9fipf5k7mc2d9jkm2480z4j";
};
meta = {

69
pkgs/tools/misc/gummiboot/no-usr.patch
View File

@ -1,14 +1,24 @@
diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile
--- gummiboot-16-orig/Makefile 2013-01-24 04:20:58.000000000 -0500
+++ gummiboot-16/Makefile 2013-02-01 17:27:42.922371399 -0500
@@ -1,13 +1,13 @@
VERSION=16
diff -Naur gummiboot-23-orig/Makefile gummiboot-23/Makefile
--- gummiboot-23-orig/Makefile 2013-02-20 00:55:44.000000000 -0500
+++ gummiboot-23/Makefile 2013-02-21 12:00:35.783637645 -0500
@@ -10,7 +10,8 @@
export E Q
ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//")
-LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd))
+PREFIX=/usr
+LIBDIR=$(GNU_EFI)/lib
LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR))
ifeq ($(ARCH),i686)
@@ -25,13 +26,13 @@
-mno-red-zone
endif
-all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot
+all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot man
# ------------------------------------------------------------------------------
CPPFLAGS = \
-I. \
- -I/usr/include/efi \
@ -18,3 +28,52 @@ diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile
CFLAGS = \
-DVERSION=$(VERSION) \
@@ -82,6 +83,7 @@
`pkg-config --cflags --libs blkid` \
src/setup/setup.c \
src/setup/efivars.c \
+ -DPREFIX=\"$(PREFIX)\" \
-o $@
# ------------------------------------------------------------------------------
@@ -101,11 +103,11 @@
rm -f src/efi/gummiboot.o src/efi/gummiboot.so gummiboot gummiboot$(MACHINE_TYPE_NAME).efi
install: all
- mkdir -p $(DESTDIR)/usr/bin/
- cp gummiboot $(DESTDIR)/usr/bin
- mkdir -p $(DESTDIR)/usr/lib/gummiboot/
- cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)/usr/lib/gummiboot/
- [ -e gummiboot.1 ] && mkdir -p $(DESTDIR)/usr/share/man/man1/ && cp gummiboot.1 $(DESTDIR)/usr/share/man/man1/ || :
+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
+ cp gummiboot $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(PREFIX)/lib/gummiboot/
+ cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)$(PREFIX)/lib/gummiboot/
+ [ -e gummiboot.1 ] && mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1/ && cp gummiboot.1 $(DESTDIR)$(PREFIX)/share/man/man1/ || :
tar:
git archive --format=tar --prefix=gummiboot-$(VERSION)/ $(VERSION) | xz > gummiboot-$(VERSION).tar.xz
diff -Naur gummiboot-23-orig/src/setup/setup.c gummiboot-23/src/setup/setup.c
--- gummiboot-23-orig/src/setup/setup.c 2013-02-20 00:55:44.000000000 -0500
+++ gummiboot-23/src/setup/setup.c 2013-02-21 11:57:43.295324700 -0500
@@ -736,7 +736,7 @@
char *p = NULL, *q = NULL, *v = NULL;
int r;
- if (asprintf(&p, "/usr/lib/gummiboot/%s", name) < 0) {
+ if (asprintf(&p, PREFIX "/lib/gummiboot/%s", name) < 0) {
fprintf(stderr, "Out of memory.\n");
r = -ENOMEM;
goto finish;
@@ -791,9 +791,9 @@
return r;
}
- d = opendir("/usr/lib/gummiboot");
+ d = opendir(PREFIX "/lib/gummiboot");
if (!d) {
- fprintf(stderr, "Failed to open /usr/lib/gummiboot: %m\n");
+ fprintf(stderr, "Failed to open " PREFIX "/lib/gummiboot: %m\n");
return -errno;
}

11
pkgs/tools/networking/offlineimap/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, buildPythonPackage }:
{ pkgs, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
version = "6.5.3";
version = "6.5.5-rc2";
name = "offlineimap-${version}";
src = fetchurl {
url = "https://github.com/spaetz/offlineimap/tarball/v${version}";
url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}";
name = "${name}.tar.bz";
sha256 = "8717a56e6244b47b908b23b598efb3470d74450ecd881b6d3573d8aec4a5db38";
sha256 = "03w3irh8pxwvivi139xm5iaj2f8vmriak1ispq9d9f84z1098pd3";
};
doCheck = false;
@ -15,6 +15,7 @@ buildPythonPackage rec {
meta = {
description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers.";
homepage = "http://offlineimap.org";
license = "GPLv2+";
license = pkgs.lib.licenses.gpl2Plus;
maintainers = [ pkgs.lib.maintainers.garbas ];
};
}

2
pkgs/tools/security/aespipe/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
description = "AES encrypting or decrypting pipe";
homepage = http://loop-aes.sourceforge.net/aespipe.README;
license = "GPL";
maintainers = stdenv.lib.maintainers.goibniu;
maintainers = stdenv.lib.maintainers.goibhniu;
platforms = stdenv.lib.platforms.linux;
};
}

28
pkgs/top-level/all-packages.nix
View File

@ -3407,8 +3407,6 @@ let
caelum = callPackage ../development/libraries/caelum { };
cairomm = callPackage ../development/libraries/cairomm { };
scmccid = callPackage ../development/libraries/scmccid { };
ccrtp = callPackage ../development/libraries/ccrtp { };
@ -3861,31 +3859,27 @@ let
};
glib = callPackage ../development/libraries/glib/2.34.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
glibmm = callPackage ../development/libraries/glibmm { };
glib_networking = callPackage ../development/libraries/glib-networking {};
atk = callPackage ../development/libraries/atk/2.6.x.nix { };
atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
atkmm = callPackage ../development/libraries/atkmm { };
cairo = callPackage ../development/libraries/cairo { };
cairomm = callPackage ../development/libraries/cairomm { };
pango = callPackage ../development/libraries/pango/1.30.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtk = pkgs.gtk2;
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { };
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
gtksharp = gtksharp2;
@ -6947,7 +6941,7 @@ let
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
firefoxPkgs = pkgs.firefox18Pkgs;
firefoxPkgs = pkgs.firefox19Pkgs;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gnome) libIDL;
@ -6961,12 +6955,12 @@ let
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix {
firefox19Pkgs = callPackage ../applications/networking/browsers/firefox/19.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
};
firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; });
firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; });
flac = callPackage ../applications/audio/flac { };
@ -7328,6 +7322,8 @@ let
matchbox = callPackage ../applications/window-managers/matchbox { };
mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
meld = callPackage ../applications/version-management/meld {
inherit (gnome) scrollkeeper;
pygtk = pyGtkGlade;
@ -8277,6 +8273,8 @@ let
lua = lua5;
};
unvanquished = callPackage ../games/unvanquished { };
uqm = callPackage ../games/uqm { };
urbanterror = callPackage ../games/urbanterror { };

24
pkgs/top-level/haskell-packages.nix
View File

@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
HTTP = self.HTTP_4000_2_8; # 7.6 ok
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
mtl = self.mtl_2_1_2; # 7.6 ok
network = self.network_2_4_1_0; # 7.6 ok
network = self.network_2_4_1_2; # 7.6 ok
OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok
parallel = self.parallel_3_2_0_3; # 7.6 ok
parsec = self.parsec_3_1_3; # 7.6 ok
@ -1286,8 +1286,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
network_2_4_1_0 = callPackage ../development/libraries/haskell/network/2.4.1.0.nix {};
network = self.network_2_4_1_0;
network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
network = self.network_2_4_1_2;
networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
@ -1295,7 +1295,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
networkMulticast = callPackage ../development/libraries/haskell/network-multicast {};
networkPprotocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
networkTransport = callPackage ../development/libraries/haskell/network-transport {};
@ -1999,9 +1999,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellSrcExts = self.haskellSrcExts_1_11_1;
};
tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {};
tar_0_4_0_1 = callPackage ../development/tools/haskell/tar/0.4.0.1.nix {};
tar = self.tar_0_4_0_1;
tar = callPackage ../development/libraries/haskell/tar {};
threadscope = callPackage ../development/tools/haskell/threadscope {};
@ -2017,9 +2015,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
QuickCheck = self.QuickCheck2;
};
xmobar = callPackage ../applications/misc/xmobar {
stm = self.stm_2_3;
};
xmobar = callPackage ../applications/misc/xmobar {};
xmonad = callPackage ../applications/window-managers/xmonad {};
@ -2031,11 +2027,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
cabalDev = callPackage ../development/tools/haskell/cabal-dev {
mtl = self.mtl_2_0_1_0.override { transformers = self.transformers_0_2_2_0; };
transformers = self.transformers_0_2_2_0;
tar = self.tar_0_3_2_0;
};
cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};
cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};

2
pkgs/top-level/release.nix
View File

@ -345,7 +345,7 @@ with (import ./release-lib.nix);
};
firefox36Pkgs.firefox = linux;
firefox18Pkgs.firefox = linux;
firefox19Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;