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

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

Browse Source 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Peter Simons 2013-07-30 11:29:30 +02:00
commit 522acfd2f4
543 changed files with 11729 additions and 9102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maintainers/scripts/nix-generate-from-cpan.pl
View File

@ -51,15 +51,21 @@ print STDERR "unpacked to: $pkg_path\n";
my $meta;
if (-e "$pkg_path/META.yml") {
eval {
$meta = YAML::XS::LoadFile("$pkg_path/META.yml");
$meta = YAML::XS::LoadFile("$pkg_path/META.yml");
};
if ($@) {
system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
$meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
$meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
}
} elsif (-e "$pkg_path/META.json") {
local $/;
open(my $fh, '<', "$pkg_path/META.json") or die;
$meta = decode_json(<$fh>);
} else {
warn "package has no META.yml or META.json\n";
}
print STDERR "metadata: ", encode_json($meta), "\n";
print STDERR "metadata: ", encode_json($meta), "\n" if defined $meta;
# Map a module to the attribute corresponding to its package
# (e.g. HTML::HeadParser will be mapped to HTMLParser, because that
@ -120,11 +126,13 @@ my $homepage = $meta->{resources}->{homepage};
print STDERR "homepage: $homepage\n" if defined $homepage;
my $description = $meta->{abstract};
$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
$description =~ s/\.$//; # remove period at the end
$description =~ s/\s*$//;
$description =~ s/^\s*//;
print STDERR "description: $description\n";
if (defined $description) {
$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
$description =~ s/\.$//; # remove period at the end
$description =~ s/\s*$//;
$description =~ s/^\s*//;
print STDERR "description: $description\n";
}
my $license = $meta->{license};
if (defined $license) {
@ -156,7 +164,7 @@ EOF
print <<EOF if defined $homepage;
homepage = $homepage;
EOF
print <<EOF;
print <<EOF if defined $description;
description = "$description";
EOF
print <<EOF if defined $license;

22
maintainers/scripts/nixpkgs-lint.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation {
name = "nixpkgs-lint-1";
buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];
unpackPhase = "true";
buildPhase = "true";
installPhase =
''
mkdir -p $out/bin
cp ${./nixpkgs-lint.pl} $out/bin/nixpkgs-lint
wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
'';
meta = {
maintainers = [ stdenv.lib.maintainers.eelco ];
description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
};
}

115
maintainers/scripts/nixpkgs-lint.pl Executable file
View File

@ -0,0 +1,115 @@
#! /run/current-system/sw/bin/perl -w
use strict;
use List::Util qw(min);
use XML::Simple qw(:strict);
use Data::Dumper;
my $filter = "*";
my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`;
my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output";
#print Dumper($info);
my %pkgsByName;
foreach my $attr (sort keys %{$info->{item}}) {
my $pkg = $info->{item}->{$attr};
#print STDERR "attr = $attr, name = $pkg->{name}\n";
$pkgsByName{$pkg->{name}} //= [];
push @{$pkgsByName{$pkg->{name}}}, $pkg;
}
# Check meta information.
print "=== Package meta information ===\n\n";
my $nrMissingMaintainers = 0;
my $nrMissingDescriptions = 0;
my $nrBadDescriptions = 0;
my $nrMissingLicenses = 0;
foreach my $attr (sort keys %{$info->{item}}) {
my $pkg = $info->{item}->{$attr};
my $pkgName = $pkg->{name};
$pkgName =~ s/-[0-9].*//;
# Check the maintainers.
my @maintainers;
my $x = $pkg->{meta}->{maintainers};
if (defined $x && $x->{type} eq "strings") {
@maintainers = map { $_->{value} } @{$x->{string}};
} elsif (defined $x->{value}) {
@maintainers = ($x->{value});
}
if (scalar @maintainers == 0) {
print "$attr: Lacks a maintainer\n";
$nrMissingMaintainers++;
}
# Check the license.
if (!defined $pkg->{meta}->{license}) {
print "$attr: Lacks a license\n";
$nrMissingLicenses++;
}
# Check the description.
my $description = $pkg->{meta}->{description}->{value};
if (!$description) {
print "$attr: Lacks a description\n";
$nrMissingDescriptions++;
} else {
my $bad = 0;
if ($description =~ /^\s/) {
print "$attr: Description starts with whitespace\n";
$bad = 1;
}
if ($description =~ /\s$/) {
print "$attr: Description ends with whitespace\n";
$bad = 1;
}
if ($description =~ /\.$/) {
print "$attr: Description ends with a period\n";
$bad = 1;
}
if (index(lc($description), lc($attr)) != -1) {
print "$attr: Description contains package name\n";
$bad = 1;
}
$nrBadDescriptions++ if $bad;
}
}
print "\n";
# Find packages that have the same name.
print "=== Package name collisions ===\n\n";
my $nrCollisions = 0;
foreach my $name (sort keys %pkgsByName) {
my @pkgs = @{$pkgsByName{$name}};
# Filter attributes that are aliases of each other (e.g. yield the
# same derivation path).
my %drvsSeen;
@pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs;
# Filter packages that have a lower priority.
my $highest = min (map { $_->{priority} // 0 } @pkgs);
@pkgs = grep { ($_->{priority} // 0) == $highest } @pkgs;
next if scalar @pkgs == 1;
$nrCollisions++;
print "The following attributes evaluate to a package named ‘$name’:\n";
print " ", join(", ", map { $_->{attrPath} } @pkgs), "\n\n";
}
print "=== Bottom line ===\n";
print "Number of packages: ", scalar(keys %{$info->{item}}), "\n";
print "Number of missing maintainers: $nrMissingMaintainers\n";
print "Number of missing licenses: $nrMissingLicenses\n";
print "Number of missing descriptions: $nrMissingDescriptions\n";
print "Number of bad descriptions: $nrBadDescriptions\n";
print "Number of name collisions: $nrCollisions\n";

2
pkgs/applications/audio/csound/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
src = fetchurl {
url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz;
url = mirror://sourceforge/csound/Csound5.18.02.tar.gz;
sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
};

36
pkgs/applications/audio/easytag/default.nix
View File

@ -1,22 +1,32 @@
{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac
}:
let
version = "2.1.7";
sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "easytag-${version}";
version = "2.1.8";
src = fetchurl {
url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2";
inherit sha256;
url = "mirror://gnome/sources/easytag/2.1/${name}.tar.xz";
sha256 = "1ab5iv0a83cdf07qzi81ydfk5apay06nxags9m07msqalz4pabqs";
};
buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ];
preConfigure = ''
# pkg-config v0.23 should be enough.
sed -i -e '/_pkg_min_version=0.24/s/24/23/' \
-e 's/have_mp3=no/have_mp3=yes/' \
-e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure
'';
NIX_LDFLAGS = "-lid3tag -lz";
buildInputs = [
pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
];
meta = {
description = "an utility for viewing and editing tags for various audio files";
homepage = http://http://easytag.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
description = "View and edit tags for various audio files";
homepage = "http://projects.gnome.org/easytag/";
license = stdenv.lib.licenses.gpl2Plus;
};
}

22
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -10,12 +10,24 @@ stdenv.mkDerivation rec {
sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24";
};
buildInputs = [ alsaLib glib jackaudio libsndfile pkgconfig pulseaudio ];
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i '40 i\
#include <CoreAudio/AudioHardware.h>\
#include <CoreAudio/AudioHardwareDeprecated.h>' \
src/drivers/fluid_coreaudio.c
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
meta = with stdenv.lib; {
description = "real-time software synthesizer based on the SoundFont 2 specifications";
homepage = http://www.fluidsynth.org;
license = licenses.lgpl2;
maintainers = [ maintainers.goibhniu ];
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
homepage = http://www.fluidsynth.org;
license = licenses.lgpl2;
maintainers = with maintainers; [ goibhniu lovek323 ];
platforms = platforms.unix;
};
}

2
pkgs/applications/audio/lingot/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "lingot-0.9.0";
src = fetchurl {
url = http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz;
url = mirror://savannah/lingot/lingot-0.9.0.tar.gz;
sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
};

38
pkgs/applications/audio/mi2ly/default.nix Normal file
View File

@ -0,0 +1,38 @@
{stdenv, fetchurl}:
let
s = # Generated upstream information
rec {
baseName="mi2ly";
version="0.12";
name="${baseName}-${version}";
hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2";
sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll";
};
buildInputs = [
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
sourceRoot=".";
buildPhase = "./cc";
installPhase = ''
mkdir -p "$out"/{bin,share/doc/mi2ly}
cp mi2ly "$out/bin"
cp README Doc.txt COPYING Manual.txt "$out/share/doc/mi2ly"
'';
meta = {
inherit (s) version;
description = ''MIDI to Lilypond converter'';
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/applications/audio/mi2ly/default.upstream Normal file
View File

@ -0,0 +1,3 @@
url http://download.savannah.gnu.org/releases/mi2ly/
ensure_choice
version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1'

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

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
, gst_plugins_good, gst_plugins_base
}:
@ -7,7 +7,7 @@ pythonPackages.buildPythonPackage rec {
version = "0.14.2";
src = fetchgit {
src = fetchurl {
url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4";
};

8
pkgs/applications/audio/mpg123/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, alsaLib }:
stdenv.mkDerivation {
name = "mpg123-1.12.3";
name = "mpg123-1.15.4";
src = fetchurl {
url = mirror://sourceforge/mpg123/mpg123-1.12.3.tar.bz2;
sha256 = "1ij689s7jch3d4g0ja3jylaphallc8vgrsrm9b12254phnyy23xf";
url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2;
sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8";
};
buildInputs = [ alsaLib ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
crossAttrs = {
configureFlags = if stdenv.cross ? mpg123 then

2
pkgs/applications/audio/normalize/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.7.7";
src = fetchurl {
url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz";
url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz";
sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
};

14
pkgs/applications/audio/pavucontrol/default.nix
View File

@ -1,18 +1,18 @@
{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx
, libglademm, libcanberra, intltool, gettext }:
{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3
, libcanberra_gtk3, intltool, gettext }:
stdenv.mkDerivation rec {
name = "pavucontrol-1.0";
name = "pavucontrol-2.0";
src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2";
};
buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3
intltool gettext ];
configureFlags = "--disable-lynx --disable-gtk3";
configureFlags = "--disable-lynx";
meta = {
description = "PulseAudio Volume Control";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
easily control the volume of all clients, sinks, etc.
'';
homepage = http://0pointer.de/lennart/projects/pavucontrol/;
homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ;
license = "GPLv2+";

67
pkgs/applications/audio/quodlibet/default.nix Normal file
View File

@ -0,0 +1,67 @@
{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject
, pythonDBus, gst_python, gst_plugins_base, gst_plugins_good, gst_plugins_ugly }:
let version = "2.5"; in
buildPythonPackage {
# call the package quodlibet and just quodlibet
name = "quodlibet-${version}";
namePrefix = "";
# XXX, tests fail
doCheck = false;
src = [
(fetchurl {
url = "https://quodlibet.googlecode.com/files/quodlibet-${version}.tar.gz";
sha256 = "0qrmlz7m1jpmriy8bgycjiwzbf3annznkn4x5k32yy9bylxa7lwb";
})
(fetchurl {
url = "https://quodlibet.googlecode.com/files/quodlibet-plugins-${version}.tar.gz";
sha256 = "0kf2mkq2zk38626bn48gscvy6ir04f5b2z57ahlxlqy8imv2cjff";
})
];
sourceRoot = "quodlibet-${version}";
postUnpack = ''
# the patch searches for plugins in directory ../plugins
# so link the appropriate directory there
ln -sf quodlibet-plugins-${version} plugins
'';
patches = [ ./quodlibet-package-plugins.patch ];
buildInputs = [
gst_plugins_base gst_plugins_good gst_plugins_ugly
];
propagatedBuildInputs = [
mutagen pygtk pygobject pythonDBus gst_python
];
postInstall = ''
# Wrap quodlibet so it finds the GStreamer plug-ins
wrapProgram "$out/bin/quodlibet" --prefix \
GST_PLUGIN_PATH ":" \
"${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_plugins_ugly}/lib/gstreamer-0.10"
'';
meta = {
description = "Quod Libet is a GTK+-based audio player written in Python, using the Mutagen tagging library.";
longDescription = ''
Quod Libet is a GTK+-based audio player written in Python, using
the Mutagen tagging library. It's designed around the idea that
you know how to organize your music better than we do. It lets
you make playlists based on regular expressions (don't worry,
regular searches work too). It lets you display and edit any
tags you want in the file. And it lets you do this for all the
file formats it supports. Quod Libet easily scales to libraries
of thousands (or even tens of thousands) of songs. It also
supports most of the features you expect from a modern media
player, like Unicode support, tag editing, Replay Gain, podcasts
& internet radio, and all major audio formats.
'';
homepage = http://code.google.com/p/quodlibet/;
};
}

18
pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch Normal file
View File

@ -0,0 +1,18 @@
diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py
--- quodlibet-2.5.orig/setup.py 2012-12-19 08:47:41.000000000 +0000
+++ quodlibet-2.5.new/setup.py 2013-04-22 19:27:07.152631051 +0000
@@ -337,5 +338,14 @@
}
}
})
+ else:
+ from os.path import join
+
+ data_files = []
+ for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]:
+ data_files.append((join('quodlibet', 'plugins', type),
+ glob.glob(join('..', 'plugins', type, '*.py'))))
+ setup_kwargs.update({ 'data_files': data_files });
+
setup(**setup_kwargs)

2
pkgs/applications/audio/snd/default.nix
View File

@ -27,7 +27,7 @@ let
in
rec {
src = fetchurl {
url = "http://downloads.sourceforge.net/snd/snd-${version}.tar.gz";
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
};

2
pkgs/applications/editors/bvi/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "bvi-1.3.2";
src = fetchurl {
url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz;
url = mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz;
sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
};

1
pkgs/applications/editors/emacs-modes/bbdb/default.nix
View File

@ -4,6 +4,7 @@ stdenv.mkDerivation {
name = "bbdb-2.35";
src = fetchurl {
# not using mirror:// because it produces a different file
url = http://bbdb.sourceforge.net/bbdb-2.35.tar.gz;
sha256 = "3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916";
};

2
pkgs/applications/editors/emacs-modes/color-theme/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "color-theme-6.6.0";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz";
url = "mirror://savannah/color-theme/${name}.tar.gz";
sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
};

11
pkgs/applications/editors/emacs-modes/haskell/default.nix
View File

@ -1,15 +1,14 @@
{ stdenv, fetchurl, emacs }:
{ stdenv, fetchurl, emacs, texinfo }:
stdenv.mkDerivation rec {
name = "haskell-mode-2.9.1-102-g8d4b965";
name = "haskell-mode-13.07";
src = fetchurl {
url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f";
sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a";
name = "${name}.tar.gz";
url = "https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz";
sha256 = "15c8ncj9mykkrizy1a8l94gq37s8hj13v3p5rgyaj9z0cwgl85kx";
};
buildInputs = [emacs];
buildInputs = [ emacs texinfo ];
installPhase = ''
mkdir -p "$out/share/emacs/site-lisp"

2
pkgs/applications/editors/emacs-modes/php/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "php-mode-1.5.0";
src = fetchurl {
url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz";
url = "mirror://sourceforge/php-mode/${name}.tar.gz";
sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
};

3
pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
View File

@ -4,8 +4,7 @@ stdenv.mkDerivation rec {
name = "session-management-for-emacs-2.2a";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/emacs-session/session/2.2a/session-2.2a.tar.gz";
# url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz";
url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz";
sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
};

6
pkgs/applications/editors/vim/default.nix
View File

@ -41,8 +41,10 @@ stdenv.mkDerivation rec {
sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
'';
meta = {
meta = with stdenv.lib; {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;
homepage = http://www.vim.org;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
}

2
pkgs/applications/graphics/alchemy/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, jre}:
stdenv.mkDerivation {
name = "alchemy-007-alpha";
name = "alchemy-007";
enableParallelBuilding = true;
src = fetchurl {

2
pkgs/applications/graphics/exrdisplay/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
name ="openexr_viewers-1.0.1";
src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz";
url = "mirror://savannah/openexr/openexr_viewers-1.0.1.tar.gz";
sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
};

6
pkgs/applications/graphics/gimp/2.8.nix
View File

@ -4,18 +4,18 @@
, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
stdenv.mkDerivation rec {
name = "gimp-2.8.4";
name = "gimp-2.8.6";
src = fetchurl {
url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
md5 = "392592e8755d046317878d226145900f";
md5 = "12b3fdf33d1f07ae79b412a9e38b9693";
};
buildInputs =
[ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext
python pygtk libart_lgpl libexif gettext xlibs.libXpm
];
passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?

4
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -107,7 +107,7 @@ rec {
name = "texturize-2.1";
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz;
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
};
installPhase = "installPlugins src/texturize";
@ -148,7 +148,7 @@ rec {
name = "gmic-1.3.2.0";
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz;
sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
};
preConfigure = ''

2
pkgs/applications/graphics/pinta/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "pinta-1.4";
src = fetchurl {
url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d";
url = "https://github.com/PintaProject/Pinta/tarball/3f7ccfa93d";
name = "pinta-1.4.tar.gz";
sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
};

2
pkgs/applications/graphics/rapcad/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "rapcad-${version}";
src = fetchgit {
url = "git://git.rapcad.org/rapcad";
url = "https://github.com/GilesBathgate/RapCAD.git";
rev = "refs/tags/v${version}";
sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7";
};

8
pkgs/applications/graphics/sane/backends-git.nix
View File

@ -5,12 +5,12 @@ in
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
stdenv.mkDerivation {
name = "sane-backends-1.0.22.482-g071f226";
name = "sane-backends-1.0.23.296-gf139120";
src = fetchgit {
url = "http://git.debian.org/git/sane/sane-backends.git";
rev = "071f2269cd68d3411cbfa05a3d028b74496db970";
sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf";
rev = "f139120c72db6de98be95b52c206c2a4d8071e92";
sha256 = "1b2fv19c8ijh9l0jjilli3j70n17wvcgpqq1nxmiby3ai6nrzk8d";
};
udevSupport = hotplugSupport;
@ -34,7 +34,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.sane-project.org/";
description = "Scanner Access Now Easy";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;

2
pkgs/applications/graphics/seg3d/default.nix
View File

@ -4,7 +4,7 @@ libuuid }:
assert (stdenv ? glibc);
stdenv.mkDerivation {
name = "seg3d-1.12";
name = "seg3d-1.12_20090930";
src = fetchurl {
url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";

24
pkgs/applications/misc/calibre/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp
, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
}:
stdenv.mkDerivation rec {
name = "calibre-0.8.70";
# 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719
name = "calibre-0.9.11";
# 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g";
sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8";
};
inherit python;
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
buildInputs =
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
fontconfig podofo qt4 pil chmlib icu
fontconfig podofo qt48 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup
pythonPackages.sqlite3 sqlite udisks libusb1 libmtp
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp
];
installPhase = ''
@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
done
'';
meta = {
meta = with stdenv.lib; {
description = "Comprehensive e-book software";
homepage = http://calibre-ebook.com;
license = "GPLv3";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl3;
maintainers = with maintainers; [ viric iElectric ];
platforms = platforms.linux;
};
}

5
pkgs/applications/misc/evtest/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
stdenv.mkDerivation rec {
name = "evtest-1.30";
name = "evtest-1.31";
preConfigure = "autoreconf -iv";
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://anongit.freedesktop.org/evtest";
rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
rev = "871371806017301373b8b0e5b7e8f168ce1ea13f";
sha256 = "1hxldlldlrb9lnnybn839a97fpqd1cixbmci2wzgr0rzhjbwhcgp";
};
meta = with stdenv.lib; {

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

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
name = "gmrun-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz";
md5 = "6cef37a968006d9496fc56a7099c603c";
url = "mirror://sourceforge/gmrun/${name}.tar.gz";
sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
};
buildInputs = [ glib gtk2 pkgconfig popt ];

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

@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20130212";
version = "3.20130518";
lib = stdenv.lib;
in
@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m";
sha256 = "00mmxxlbzv6bz3cz3746r5lqwby6liwsg7m3jfba8258y52w13qp";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

5
pkgs/applications/misc/nut/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
, libtool }:
stdenv.mkDerivation rec {
name = "nut-2.6.5";
@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
};
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
nativeBuildInputs = [ pkgconfig ];

27
pkgs/applications/misc/qgis/default.nix
View File

@ -1,25 +1,32 @@
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
pyqt4, qwt, fcgi, python }:
pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }:
stdenv.mkDerivation rec {
name = "qgis-1.6.0";
name = "qgis-1.8.0";
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt
fcgi ];
fcgi libspatialindex libspatialite ];
nativeBuildInputs = [ cmake python];
nativeBuildInputs = [ cmake python ];
patches = [ ./r14988.diff ];
enableParallelBuilding = true;
# To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process.
preBuild = ''
export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH
'';
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr";
sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh";
};
meta = {
description = "user friendly Open Source Geographic Information System";
homepage = ttp://www.qgis.org;
# you can choose one of the following licenses:
license = [ "GPL" ];
description = "User friendly Open Source Geographic Information System";
homepage = http://www.qgis.org;
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

38
pkgs/applications/misc/qgis/r14988.diff
View File

@ -1,38 +0,0 @@
Index: qgis/python/core/conversions.sip
===================================================================
--- qgis/python/core/conversions.sip (revision 14323)
+++ qgis/python/core/conversions.sip (revision 14988)
@@ -16,4 +16,5 @@
%Feature QSETINT_CONVERSION
+%Feature QSETTYPE_CONVERSION
%ModuleHeaderCode
@@ -321,5 +322,5 @@
%End
-
+%If (QSETTYPE_CONVERSION)
template <TYPE>
%MappedType QSet<TYPE>
@@ -395,6 +396,5 @@
};
-
-
+%End
template<TYPE>
Index: qgis/python/CMakeLists.txt
===================================================================
--- qgis/python/CMakeLists.txt (revision 14330)
+++ qgis/python/CMakeLists.txt (revision 14988)
@@ -44,4 +44,8 @@
ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
+
# core module
FILE(GLOB sip_files_core core/*.sip)

2
pkgs/applications/misc/rxvt/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "rxvt-2.6.4";
src = fetchurl {
url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
url = mirror://sourceforge/rxvt/rxvt-2.6.4.tar.gz;
sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
};

5
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
fontconfig, freetype, pkgconfig, libXrender }:
fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }:
let
name = "rxvt-unicode";
@ -19,7 +19,8 @@ stdenv.mkDerivation (rec {
buildInputs =
[ libX11 libXt libXft ncurses /* required to build the terminfo file */
fontconfig freetype pkgconfig libXrender ]
++ stdenv.lib.optional perlSupport perl;
++ stdenv.lib.optional perlSupport perl
++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
preConfigure =
''

3
pkgs/applications/misc/sdcv/default.nix
View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
'';
NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl";
}

61
pkgs/applications/misc/slic3r/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
# Perl modules:
, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }:
stdenv.mkDerivation rec {
version = "0.9.10b";
name = "slic3r-${version}";
# Slic3r doesn't put out tarballs, only a git repository is available
src = fetchgit {
url = "git://github.com/alexrj/Slic3r";
rev = "refs/tags/${version}";
sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7";
};
buildInputs = [ perl makeWrapper
EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus
];
desktopItem = makeDesktopItem {
name = "slic3r";
exec = "slic3r";
icon = "slic3r";
comment = "G-code generator for 3D printers";
desktopName = "Slic3r";
genericName = "3D printer tool";
categories = "Application;Development;";
};
# Nothing to do here
buildPhase = "true";
installPhase = ''
mkdir -p "$out/share/slic3r/"
cp -r * "$out/share/slic3r/"
wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB
mkdir -p "$out/bin"
ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
mkdir -p "$out/share/pixmaps/"
ln -s "$out/share/slic3r/var/Slic3r.png" "$out/share/pixmaps/slic3r.png"
mkdir -p "$out/share/applications"
cp "$desktopItem"/share/applications/* "$out/share/applications/"
'';
meta = with stdenv.lib; {
description = "G-code generator for 3D printers";
longDescription = ''
Slic3r is the tool you need to convert a digital 3D model into printing
instructions for your 3D printer. It cuts the model into horizontal
slices (layers), generates toolpaths to fill them and calculates the
amount of material to be extruded.'';
homepage = http://slic3r.org/;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

10
pkgs/applications/misc/vanitygen/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, stdenv, openssl, pcre }:
{ fetchgit, stdenv, openssl, pcre }:
stdenv.mkDerivation rec {
version = "0.21";
name = "vanitygen-${version}";
src = fetchurl {
name = "vanitygen-${version}.tar.gz";
url = "https://github.com/samr7/vanitygen/tarball/0.21";
sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv";
src = fetchgit {
url = "https://github.com/samr7/vanitygen";
rev = "refs/tags/${version}";
sha256 = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah";
};
buildInputs = [ openssl pcre ];

2
pkgs/applications/misc/xfontsel/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "xfontsel-1.0.2";
src = fetchurl {
url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
url = "mirror://xorg/individual/app/${name}.tar.bz2";
sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
};

2
pkgs/applications/misc/xlsfonts/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "xlsfonts-1.0.2";
src = fetchurl {
url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
url = "mirror://xorg/individual/app/${name}.tar.bz2";
sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
};

6
pkgs/applications/networking/bittorrentsync/default.nix
View File

@ -14,9 +14,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
version = "1.0.134";
sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7"
else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak"
version = "1.1.42";
sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri"
else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
in stdenv.mkDerivation {

19
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -18,6 +18,9 @@
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
# dependency for version 30
, file
# package customization
, channel ? "stable"
, enableSELinux ? false, libselinux ? null
@ -87,7 +90,9 @@ let
# user namespace sandbox patch
userns_patch = if versionOlder sourceInfo.version "29.0.0.0"
then ./sandbox_userns.patch
else ./sandbox_userns_29.patch;
else if versionOlder sourceInfo.version "30.0.0.0"
then ./sandbox_userns_29.patch
else ./sandbox_userns_30.patch;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -115,7 +120,8 @@ in stdenv.mkDerivation rec {
++ optionals gnomeSupport [ gconf libgcrypt ]
++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio;
++ optional pulseSupport pulseaudio
++ optional (!versionOlder sourceInfo.version "30.0.0.0") file;
opensslPatches = optional useOpenSSL openssl.patches;
@ -145,6 +151,15 @@ in stdenv.mkDerivation rec {
use_cups = cupsSupport;
linux_sandbox_path="${libExecPath}/${packageName}_sandbox";
linux_sandbox_chrome_path="${libExecPath}/${packageName}";
werror = "";
# Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
# please get your own set of keys.
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
google_default_client_id = "404761575300.apps.googleusercontent.com";
google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;

287
pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch Normal file
View File

@ -0,0 +1,287 @@
commit b9a1fa30eb3296b169f51ffa8ee05513c5c1dbae
Author: aszlig <aszlig@redmoonstudios.org>
Date: Thu May 16 14:17:56 2013 +0200
zygote: Add support for user namespaces on Linux.
The implementation is done by patching the Zygote host to execute the sandbox
binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
process is using uid 0 and gid 0 which map to the current user of the parent.
Afterwards, the sandbox will continue as if it was called as a setuid binary.
In addition, this adds new_user_namespace as an option in process_util in order
to set the UID and GID mapping correctly. The reason for this is that just
passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
without setting the mappings exec*() will clear the process's capability sets.
If the kernel doesn't support unprivileged user namespaces and the sandbox
binary doesn't have the setuid flag, the Zygote main process will run without a
sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
diff --git a/base/process/launch.h b/base/process/launch.h
index 45b1053..ce71418 100644
--- a/base/process/launch.h
+++ b/base/process/launch.h
@@ -51,6 +51,7 @@ struct LaunchOptions {
new_process_group(false)
#if defined(OS_LINUX)
, clone_flags(0)
+ , new_user_namespace(false)
#endif // OS_LINUX
#if defined(OS_CHROMEOS)
, ctrl_terminal_fd(-1)
@@ -125,6 +126,9 @@ struct LaunchOptions {
#if defined(OS_LINUX)
// If non-zero, start the process using clone(), using flags as provided.
int clone_flags;
+
+ // If true, start the process in a new user namespace.
+ bool new_user_namespace;
#endif // defined(OS_LINUX)
#if defined(OS_CHROMEOS)
diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
index 336633c..4b50a5d 100644
--- a/base/process/launch_posix.cc
+++ b/base/process/launch_posix.cc
@@ -36,6 +36,13 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_restrictions.h"
+#if defined(OS_LINUX)
+#include <sched.h>
+#if !defined(CLONE_NEWUSER)
+#define CLONE_NEWUSER 0x10000000
+#endif
+#endif
+
#if defined(OS_CHROMEOS)
#include <sys/ioctl.h>
#endif
@@ -395,8 +402,19 @@ bool LaunchProcess(const std::vector<std::string>& argv,
pid_t pid;
#if defined(OS_LINUX)
- if (options.clone_flags) {
- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
+ int map_pipe_fd[2];
+ int flags = options.clone_flags;
+
+ if (options.new_user_namespace) {
+ flags |= CLONE_NEWUSER;
+ if (pipe(map_pipe_fd) < 0) {
+ DPLOG(ERROR) << "user namespace pipe";
+ return false;
+ }
+ }
+
+ if (options.clone_flags || options.new_user_namespace) {
+ pid = syscall(__NR_clone, flags, 0, 0, 0);
} else
#endif
{
@@ -409,6 +427,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
} else if (pid == 0) {
// Child process
+#if defined(OS_LINUX)
+ if (options.new_user_namespace) {
+ // Close the write end of the pipe so we get an EOF when the parent closes
+ // the FD. This is to avoid race conditions when the UID/GID mappings are
+ // written _after_ execvp().
+ close(map_pipe_fd[1]);
+
+ char dummy;
+ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
+ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
+ _exit(127);
+ }
+ }
+#endif
+
// DANGER: fork() rule: in the child, if you don't end up doing exec*(),
// you call _exit() instead of exit(). This is because _exit() does not
// call any previously-registered (in the parent) exit handlers, which
@@ -523,6 +556,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
_exit(127);
} else {
// Parent process
+#if defined(OS_LINUX)
+ if (options.new_user_namespace) {
+ // We need to write UID/GID mapping here to map the current user outside
+ // the namespace to the root user inside the namespace in order to
+ // correctly "fool" the child process.
+ char buf[256];
+ int map_fd, map_len;
+
+ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
+ map_fd = open(buf, O_RDWR);
+ DPCHECK(map_fd >= 0);
+ snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
+ map_len = strlen(buf);
+ if (write(map_fd, buf, map_len) != map_len) {
+ RAW_LOG(WARNING, "Can't write to uid_map.");
+ }
+ close(map_fd);
+
+ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
+ map_fd = open(buf, O_RDWR);
+ DPCHECK(map_fd >= 0);
+ snprintf(buf, sizeof(buf), "0 %d 1", getegid());
+ map_len = strlen(buf);
+ if (write(map_fd, buf, map_len) != map_len) {
+ RAW_LOG(WARNING, "Can't write to gid_map.");
+ }
+ close(map_fd);
+
+ // Close the pipe on the parent, so the child can continue doing the
+ // execvp() call.
+ close(map_pipe_fd[1]);
+ }
+#endif
+
if (options.wait) {
// While this isn't strictly disk IO, waiting for another process to
// finish is the sort of thing ThreadRestrictions is trying to prevent.
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
index bb84e62..bce0d18 100644
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -119,25 +119,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
sandbox_binary_ = sandbox_cmd.c_str();
- // A non empty sandbox_cmd means we want a SUID sandbox.
- using_suid_sandbox_ = !sandbox_cmd.empty();
+ bool userns_sandbox = false;
+ const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
- if (using_suid_sandbox_) {
+ if (!sandbox_cmd.empty()) {
struct stat st;
if (stat(sandbox_binary_.c_str(), &st) != 0) {
LOG(FATAL) << "The SUID sandbox helper binary is missing: "
<< sandbox_binary_ << " Aborting now.";
}
- if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
- (st.st_uid == 0) &&
- (st.st_mode & S_ISUID) &&
- (st.st_mode & S_IXOTH)) {
+ if (access(sandbox_binary_.c_str(), X_OK) == 0) {
+ using_suid_sandbox_ = true;
+
cmd_line.PrependWrapper(sandbox_binary_);
scoped_ptr<sandbox::SetuidSandboxClient>
sandbox_client(sandbox::SetuidSandboxClient::Create());
sandbox_client->SetupLaunchEnvironment();
+
+ if (!((st.st_uid == 0) &&
+ (st.st_mode & S_ISUID) &&
+ (st.st_mode & S_IXOTH))) {
+ userns_sandbox = true;
+ sandbox_client->SetNoSuid();
+ }
} else {
LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
"configured correctly. Rather than run without sandboxing "
@@ -161,7 +167,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
base::ProcessHandle process = -1;
base::LaunchOptions options;
options.fds_to_remap = &fds_to_map;
+ if (userns_sandbox)
+ options.new_user_namespace = true;
base::LaunchProcess(cmd_line.argv(), options, &process);
+
+ if (process == -1 && userns_sandbox) {
+ LOG(ERROR) << "User namespace sandbox failed to start, running without "
+ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
+ << "enabled in order to use the sandbox without setuid bit.";
+ using_suid_sandbox_ = false;
+ options.new_user_namespace = false;
+ base::LaunchProcess(cmd_line_unwrapped, options, &process);
+ }
+
CHECK(process != -1) << "Failed to launch zygote process";
if (using_suid_sandbox_) {
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
index dcea4c0..c06b4ae 100644
--- a/content/zygote/zygote_main_linux.cc
+++ b/content/zygote/zygote_main_linux.cc
@@ -398,6 +398,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
*has_started_new_init = true;
}
+ // Don't set non-dumpable, as it causes trouble when the host tries to find
+ // the zygote process (XXX: Not quite sure why this happens with user
+ // namespaces). Fortunately, we also have the seccomp filter sandbox which
+ // should disallow the use of ptrace.
+ if (setuid_sandbox->IsNoSuid())
+ return true;
+
#if !defined(OS_OPENBSD)
// Previously, we required that the binary be non-readable. This causes the
// kernel to mark the process as non-dumpable at startup. The thinking was
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
index 34231d4..36e3201 100644
--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
return env_->HasVar(kSandboxNETNSEnvironmentVarName);
}
+bool SetuidSandboxClient::IsNoSuid() const {
+ return env_->HasVar(kSandboxNoSuidVarName);
+}
+
bool SetuidSandboxClient::IsSandboxed() const {
return sandboxed_;
}
@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
SetSandboxAPIEnvironmentVariable(env_);
}
+void SetuidSandboxClient::SetNoSuid() {
+ env_->SetVar(kSandboxNoSuidVarName, "1");
+}
+
} // namespace sandbox
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
index a9f6536..2e8113a 100644
--- a/sandbox/linux/suid/client/setuid_sandbox_client.h
+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
@@ -39,6 +39,8 @@ class SetuidSandboxClient {
bool IsInNewPIDNamespace() const;
// Did the setuid helper create a new network namespace ?
bool IsInNewNETNamespace() const;
+ // Is sandboxed without SUID binary ?
+ bool IsNoSuid() const;
// Are we done and fully sandboxed ?
bool IsSandboxed() const;
@@ -46,6 +48,8 @@ class SetuidSandboxClient {
// helper.
void SetupLaunchEnvironment();
+ void SetNoSuid();
+
private:
// Holds the environment. Will never be NULL.
base::Environment* env_;
diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
index aad4ff8..bd710d5 100644
--- a/sandbox/linux/suid/common/sandbox.h
+++ b/sandbox/linux/suid/common/sandbox.h
@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem";
static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
static const long kSUIDSandboxApiNumber = 1;
static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";

18
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "29.0.1547.0";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.0.tar.xz";
sha256 = "0ydinl0zrsm995rcpph4i56335nzhp1fqnlz39lg4vbjsshchh9x";
version = "30.0.1573.2";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz";
sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz";
};
beta = {
version = "28.0.1500.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
version = "29.0.1547.32";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz";
sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
};
stable = {
version = "28.0.1500.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
version = "28.0.1500.71";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz";
sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r";
};
}

6
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}";
# Use the following to determine the current upstream version:
# curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
version = "3.17.0.0";
version = "4.2.1.0";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x";
sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc";
sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r";
}
else throw "Google Talk does not support your platform.";

2
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
View File

@ -9,7 +9,7 @@ let
in
rec {
src = fetchurl {
url = http://downloads.sourceforge.net/funpidgin/carrier-2.5.0.tar.bz2;
url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2;
sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
};

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
View File

@ -1,7 +1,7 @@
args : with args;
rec {
src = fetchurl {
url = http://mesh.dl.sourceforge.net/sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
url = mirror://sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2;
sha256 = "19h76fwsx5y30l5wda2930k10r385aipngfljz5bdi7b9y52lii7";
};

6
pkgs/applications/networking/iptraf/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation rec {
name = "iptraf-3.0.0";
name = "iptraf-3.0.1";
src = fetchurl {
url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz;
sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y";
url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz;
md5 = "004c2c005a1b78739e22bc49d33e244d";
};
patchPhase = ''

2
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -11,7 +11,7 @@ assert sslSupport -> openssl != null;
assert gpgSupport -> gpgme != null;
stdenv.mkDerivation {
name = "sylpheed-3.2";
name = "sylpheed-3.2.0";
src = fetchurl {
url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2;

8
pkgs/applications/networking/msmtp/default.nix
View File

@ -1,18 +1,20 @@
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
stdenv.mkDerivation rec {
name = "msmtp-1.4.30";
name = "msmtp-1.4.31";
src = fetchurl {
url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
sha256 = "11lq82byx9xyfkf4nrcfjjfv5k8gk3bf8zlw0kml1qrndqlvjlpi";
sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4";
};
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
meta = {
description = "a MUA";
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
homepage = "http://msmtp.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/applications/networking/p2p/gnunet/svn.nix
View File

@ -4,7 +4,7 @@
, makeWrapper, autoconf, automake }:
let
rev = "27399";
rev = "27775";
in
stdenv.mkDerivation rec {
name = "gnunet-svn-${rev}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchsvn {
url = https://gnunet.org/svn/gnunet;
inherit rev;
sha256 = "0fn7ppfnc4v6lkxwww11s0h8mdvwyv7f40f6wrbfilqpn2ncrf8c";
sha256 = "1fa2g63rrn0mmim9v62gnm2hqr556mbcafb7cs7afycbinix4spf";
};
buildInputs = [

4
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -21,11 +21,11 @@
assert printerSupport -> cups != null;
stdenv.mkDerivation rec {
name = "freerdp-${version}";
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w";
sha256 = "1w9dk7dsbppspnnms2xwwmbg7jm61i7aw5nkwzbpdyxngbgkgwf0";
};
buildInputs = [

2
pkgs/applications/science/geometry/drgeo/default.nix
View File

@ -2,7 +2,7 @@ args : with args;
let version = lib.attrByPath ["version"] "1.1.0" args; in
rec {
src = fetchurl {
url = http://downloads.sourceforge.net/ofset/drgeo-1.1.0.tar.gz;
url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz;
sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
};

2
pkgs/applications/science/logic/ssreflect/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "${webpage}/${name}-coq8.4.tar.gz";
url = "http://ssr.msr-inria.inria.fr/FTP/${name}-coq8.4.tar.gz";
sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h";
};

59
pkgs/applications/science/math/pari/default.nix
View File

@ -1,50 +1,25 @@
x@{builderDefsPackage
, perl, zlib, gmp, readline
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchurl, gmp, readline }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="pari";
version="2.5.0";
name="${baseName}-${version}";
url="http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
hash="18ipxj4hzj7s3fqz878fiypkzrkbjj8wvbygz9j8c3ya06q27jax";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
stdenv.mkDerivation rec {
name = "pari-2.5.4";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz";
};
inherit (sourceInfo) name version;
inherit buildInputs;
buildInputs = [gmp readline];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
configureCommand="./Configure";
configureScript = "./Configure";
configureFlags =
"--with-gmp=${gmp} " +
"--with-readline=${readline}";
meta = {
description = "Computer algebra system for high-performance number theory computations";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = "GPLv2+";
homepage = "http://pari.math.u-bordeaux.fr/";
homepage = "http://pari.math.u-bordeaux.fr/";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ertes raskin];
platforms = stdenv.lib.platforms.linux;
};
passthru = {
updateInfo = {
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
};
};
}) x
}

2
pkgs/applications/science/misc/boinc/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "boinc-7.0.44";
src = fetchgit {
url = "git://boinc.berkeley.edu/boinc.git";
url = "git://boinc.berkeley.edu/boinc-v2.git";
rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
};

6
pkgs/applications/science/misc/golly/src-for-default.nix
View File

@ -1,8 +1,8 @@
rec {
version="2.4-src";
name="golly-2.4-src";
version="2.4";
name="golly-2.4";
hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
url="mirror://sourceforge/golly/golly-2.4-src.tar.gz";
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";

2
pkgs/applications/version-management/cvs/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "cvs-1.12.13";
src = fetchurl {
url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
url = mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2;
sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq";
};

31
pkgs/applications/version-management/diffuse/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, python, pygtk, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.4.7";
name = "diffuse-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh";
};
buildInputs = [ python pygtk makeWrapper ];
buildPhase = ''
python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python"
wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
'';
# no-op, everything is done in buildPhase
installPhase = "true";
# NOTE: diffuse installs a .desktop file itself
meta = with stdenv.lib; {
description = "Graphical diff and merge tool";
homepage = http://diffuse.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

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

@ -14,8 +14,8 @@
cabal.mkDerivation (self: {
pname = "git-annex";
version = "4.20130627";
sha256 = "1q9hdh7m04idx1nm631624s37p6w1b9j1z5n06j2449b3pxqrn3y";
version = "4.20130723";
sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -10,7 +10,7 @@
let
version = "1.8.2.3";
version = "1.8.3.2";
svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha1 = "2831f7deec472db4d0d0cdffb4d82d91cecdf295";
sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -34,7 +34,7 @@ stdenv.mkDerivation {
# required to support pthread_cancel()
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
+ (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "");

2
pkgs/applications/version-management/meld/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
name = "meld-${version}";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
};

2
pkgs/applications/version-management/rapidsvn/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
stdenv.mkDerivation {
name = "rapidsvn-0.12";
name = "rapidsvn-0.12.0-1";
src = fetchurl {
url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;

2
pkgs/applications/video/kino/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation {
name = "kino-1.3.4";
src = fetchurl {
url = http://downloads.sourceforge.net/kino/kino-1.3.4.tar.gz;
url = mirror://sourceforge/kino/kino-1.3.4.tar.gz;
sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i";
};

2
pkgs/applications/virtualization/qemu/default.nix
View File

@ -2,7 +2,7 @@
, attr, libcap, vde2, alsaLib, texinfo, libuuid
, sdlSupport ? true, SDL
, vncSupport ? true, libjpeg, libpng
, spiceSupport ? false, spice, spice_protocol
, spiceSupport ? true, spice, spice_protocol
, x86Only ? false
}:

17
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -30,10 +30,23 @@ let
done
'';
extensionPack = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extpackRevision = "86644";
extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) by downloading the related binaries from:
https://www.virtualbox.org/wiki/Downloads
Once you have downloaded the file, please use the following command and re-run the
installation:
nix-prefetch-url file://${name}
'';
};
in stdenv.mkDerivation {

25
pkgs/applications/window-managers/herbstluftwm/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, glib, libX11, libXinerama }:
stdenv.mkDerivation rec {
name = "herbstluftwm-0.5.2";
src = fetchurl {
url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
sha256 = "15crb77gw8p1h721r3dcgn0m1n03qk0g81rrnaqw8p7hz44k6gf5";
};
patchPhase = ''
sed -i -e "s:/usr/local:$\{out}:" \
-e "s:/etc:$\{out}/etc:" \
config.mk
'';
buildInputs = [ pkgconfig glib libX11 libXinerama ];
meta = {
description = "A manual tiling window manager for X";
homepage = "http://herbstluftwm.org/";
license = "BSD"; # Simplified BSD License
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/applications/window-managers/matchbox/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, libmatchbox, pkgconfig}:
stdenv.mkDerivation rec {
name = "matchbox-1.2.2";
name = "matchbox-1.2";
buildInputs = [ libmatchbox pkgconfig ];

2
pkgs/applications/window-managers/stumpwm/default.nix
View File

@ -12,7 +12,7 @@ let
in
rec {
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/stumpwm/${pkgName}-${version}.tgz";
url = "mirror://savannah/stumpwm/${pkgName}-${version}.tgz";
sha256 = "a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78";
};

2
pkgs/applications/window-managers/wmii/default.nix
View File

@ -1,5 +1,5 @@
args: with args; stdenv.mkDerivation {
name = "wmii-20071116";
name = "wmii-3.6";
src = fetchurl {
url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;

2
pkgs/applications/window-managers/xcompmgr/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "xcompmgr-1.1.6";
src = fetchurl {
url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
url = "mirror://xorg/individual/app/${name}.tar.bz2";
sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";
};
buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];

4
pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmonad-contrib";
version = "0.11.1";
sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl";
version = "0.11.2";
sha256 = "0qlc732m6mhvx7g10r69hk5x460kjv2r04s91cnn5yfiia1qfpai";
buildDepends = [
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
];

23
pkgs/build-support/vm/default.nix
View File

@ -291,7 +291,7 @@ rec {
args = ["-e" (vmRunCommand qemuCommandLinux)];
origArgs = attrs.args;
origBuilder = attrs.builder;
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 512)}";
QEMU_OPTS = "-m ${toString (attrs.memSize or 512)}";
});
@ -599,8 +599,17 @@ rec {
debs="$debs /inst/$i";
done
chroot=$(type -tP chroot)
# Create a fake start-stop-daemon script, as done in debootstrap.
mv "/mnt/sbin/start-stop-daemon" "/mnt/sbin/start-stop-daemon.REAL"
echo "#!/bin/true" > "/mnt/sbin/start-stop-daemon"
chmod 755 "/mnt/sbin/start-stop-daemon"
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
/usr/bin/dpkg --install --force-all $debs < /dev/null || true
# Move the real start-stop-daemon back into its place.
mv "/mnt/sbin/start-stop-daemon.REAL" "/mnt/sbin/start-stop-daemon"
done
echo "running post-install script..."
@ -1394,22 +1403,22 @@ rec {
};
debian70i386 = {
name = "debian-7.0.0-wheezy-i386";
fullName = "Debian 7.0.0 Wheezy (i386)";
name = "debian-7.1.0-wheezy-i386";
fullName = "Debian 7.1.0 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
sha256 = "712939639e2cc82615c85bdf81edf31edef0fda003ac2b32998e438aee403ab8";
sha256 = "c2751c48805b41c3eddd31cfe92ffa46df13a7d6ce7896b8dc5ce4b2f7f329c5";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian70x86_64 = {
name = "debian-7.0.0-wheezy-amd64";
fullName = "Debian 7.0.0 Wheezy (amd64)";
name = "debian-7.1.0-wheezy-amd64";
fullName = "Debian 7.1.0 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
sha256 = "e79132f7db6655013be1f75feb9812b071386525246d8639679b322487d2732a";
sha256 = "9b15b4348cadbcf170c9e83d6fbcb64efac2b787ebdfef16ba21dd70dfca0001";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

2
pkgs/data/fonts/junicode/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "junicode-0.6.15";
src = fetchurl {
url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
url = mirror://sourceforge/junicode/junicode-0.6.15.zip;
sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
};

2
pkgs/data/fonts/ttf-bitstream-vera/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "ttf-bitstream-vera-1.10";
src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2;
sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv";
};
buildPhase = "true";

2
pkgs/data/fonts/wqy-zenhei/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "wqy-zenhei-0.4.23-1";
src = fetchurl {
url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz;
sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
};

4
pkgs/data/misc/shared-desktop-ontologies/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
name = "shared-desktop-ontologies-0.10.0";
name = "shared-desktop-ontologies-0.11.0";
src = fetchurl {
url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di";
sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2";
};
buildInputs = [ cmake ];

2
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "gnome-python-${version}.1";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2";
url = "mirror://gnome/sources/gnome-python/${version}/${name}.tar.bz2";
sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
};

2
pkgs/desktops/gnome-2/desktop/vte/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "vte-0.28.0";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.28/${name}.tar.bz2";
url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
};

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

@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
stdenv.mkDerivation {
name = "libgnomeprintui-2.11.1";
name = "libgnomeprintui-2.18.4";
src = fetchurl {
url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;

2
pkgs/desktops/gnome-3/core/evince/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
name = "evince-3.6.1";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz";
url = "mirror://gnome/sources/evince/3.6/${name}.tar.xz";
sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv";
};

4
pkgs/desktops/kde-4.10/default.nix
View File

@ -1,8 +1,6 @@
{ callPackage, callPackageOrig, stdenv, qt48 }:
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
let
release = "4.10.4";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
inherit release ignoreList extraSubpkgs callPackage;

399
pkgs/desktops/kde-4.10/kde-package/4.10.4.nix
View File

@ -1,399 +0,0 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="analitza";value="1ikja551kp2i4x6mw64i12yf84vx0g5rfmqcq93lj2z4gii17nlq";}
{name="ark";value="06ymghs1rflhij7skw3hnk2w8kjmmaigh31raq690vbnpa9w8isb";}
{name="audiocd-kio";value="1pxza8v5gb34hzbky5jwm2fw3b4bynpzcrggw6vvhnb0gqrfm7x6";}
{name="blinken";value="12rl2jl91mkvls7lh38hxxc8qfrw9lq56syb2k5v81x0gxzgz7gx";}
{name="bomber";value="13qi8q3jyk9dn2pnljrgh00qp5k4dimdfj5z8r6gb05cvzn1g5zw";}
{name="bovo";value="1j180rm5wr1yy2wn76g3s6v7hl54rhahna32lll8dv9srrpqry12";}
{name="cantor";value="1406bkky7pglck0vad9id02w5gyfcva9slmy5gb06iwi9rcvl13y";}
{name="dragon";value="1zc14x60rcmgiim5wlss0pva1mc89r00xasic55zkb9w1xl2ymrd";}
{name="ffmpegthumbs";value="03hyypzdaf1v7hczbmhnkw3fc1va1mfmhl3kdzm40cak2wf3fd89";}
{name="filelight";value="0snjk95jmw3f5v21jwld8ywxpa65zayq9n9bsryipg5i7swa9ylk";}
{name="granatier";value="0qsxgs11caccz695a7lcrhrm3awdm390fa1hmxs6ijrfj9wx3qkf";}
{name="gwenview";value="0b00cvgh1f6abj9ijg32yk1l8mfb0ph5iwqnbwj86z95v0i9kwhl";}
{name="jovie";value="0g07d9zdfjpscc8y4nhfsy869iy2h4vin7inlfk59jih4zbh2yss";}
{name="juk";value="01nxn50nxdkg87fljiz7y6s02wxbbbifv84p8hp1rswi5mx929a4";}
{name="kaccessible";value="0biygax3c5hcqhfgmggn3gbg4skhr75bix8swdj1mp8ypbk7cwn5";}
{name="kactivities";value="07f38qxbd1ads5v912759da6b6hxq9jhiphjlq7ja04130h5425l";}
{name="kajongg";value="0mp329yqxjvi4rzfam0dxjx0gacpgvzcnd5dbbw43f0bdi28r6xg";}
{name="kalgebra";value="139n44rvxdhph1bpvj8x83d4qslhjqwxpw09pj76qskdda0bw1ga";}
{name="kalzium";value="0j5dhaffvi825jbgr4vbi3k4ykk7ha8gv2sas1garqfrqbc30p7n";}
{name="kamera";value="06ny4af8071bd22kgvfx0vw37arvzmv0vimci17glp1v37qfafl5";}
{name="kanagram";value="1nzchi9sjphkh1rsg42jfn2xia9fcjcwihkgan01wd82hrim34bd";}
{name="kapman";value="1hgifdlzhrxabn4ywpxmwqikfms8ihnjz0dwbrfwdji84aij9kxf";}
{name="kate";value="0m9j7a42vzkdzhcd7hhvswyi7rwvicnb9wjs5ff01lg7zdnbyqxx";}
{name="katomic";value="1fj06n77krwyxvjmqwbhfsmi6vii36smifrpzd0yd1f0g3yihiaf";}
{name="kblackbox";value="1irnlwagxsik35n6zkdg6vqvydvhka3yq6p3najdav1hbs7liav6";}
{name="kblocks";value="0b5n3sil6llnryfns5cff07ckids65pz99swkkcgpalpqvhg5xva";}
{name="kbounce";value="0mqaxkgnylirrcip70b330q56c4j31pb2f7c5j65gvzxlk7n1kh9";}
{name="kbreakout";value="1c4ycncf21br0ywdbx91gia62k5kkrgnaj38qclfljhzqx83pr3q";}
{name="kbruch";value="143wfqjpnwcd51zr14mgn2ak38szbr24k1phv5lmlc3whgz7q15v";}
{name="kcalc";value="18jcr6mzasrbs4zbilxhqdsb03965bzm30f74clh5czsyv8s5129";}
{name="kcharselect";value="0hj9ax570qpgkj666qab6bdnz0irzlzynsq28dw64sdmjcxs28k4";}
{name="kcolorchooser";value="00pr0sgq8s008lc0a22nmavsqap8dk00y6wd56a8zv2fpnrys5gn";}
{name="kdeadmin";value="1m5svs6wq393i2ja2z8vivbiw05z41r8nq07j0qypcgzm8a801ks";}
{name="kdeartwork";value="1ax5m70zb8jfil2llia5ph8ykz3xm1xnz0irp5ivp69hixnrrp09";}
{name="kde-baseapps";value="067a2s8kw26yjsm8lmn9xg3nw80yyfbkz2x96pj4qx1qxv4qviil";}
{name="kde-base-artwork";value="0rjxk5qbr15vi4vrd2x9ypqpbam3jbgiylzgk3bx5v367ldrrsbs";}
{name="kdegraphics-mobipocket";value="0fky12546bywjng8vab4nr7ih3zrmskp6kz49hqqbhpcxrnlihpf";}
{name="kdegraphics-strigi-analyzer";value="0g2zf9fmn6720j29pxsq9hw424p1p1pgz4smz1gb8casfrpc2mqa";}
{name="kdegraphics-thumbnailers";value="19nplbwhv0mdg6iawwm8vbmincccyabq9k8ywd8icr8vgj4ikvd4";}
{name="kdelibs";value="08249hp7q8ck1sgihia1idxllp7qb85xw9xv21snhccgdv3p1rd1";}
{name="kdenetwork";value="1fm9f7nln3735frlcrqvwpg10b31dgr4gf6xiyq068sixh4cv0g6";}
{name="kdepim";value="0v9mp548nbqvd03krq6z1djsvr5a6p21bz5dspqy6kp6xymblwzz";}
{name="kdepimlibs";value="09p60h7m41495664ijab33dc5n64spynnjqay1allx0mcldqnapq";}
{name="kdepim-runtime";value="1d47byk057jdgyvzjyhv7px39dl6qcg26i5r12p3q8y2lslnz5wr";}
{name="kdeplasma-addons";value="001yfb324wb7fpi57dz6rnnbjrip9n14bxa7yv20fpq8i6ngv8hl";}
{name="kde-runtime";value="065jhs3ajg3c6k25g5cwbxpp6wxmrd6qg0aza3lxfm87fb1v255n";}
{name="kdesdk";value="1bvmfaddvpgh5kx4nv4c3z33bka6m7wlsw1nzyip9gw1ghac6a2s";}
{name="kdetoys";value="1frkz6k7q99y2nn0j2xw00zsq4dbsmwyvq7jbh7y4wyzanbyxh0f";}
{name="kde-wallpapers";value="0gspx1xld9da4ppcgr20rvkbhy3jh4yqjzfvhsfi1qhh61jgfcks";}
{name="kdewebdev";value="178sq7r584qlkphzwdqhkjaq2h87vjjghq3ialmahzsas3qihkbs";}
{name="kde-workspace";value="1l927wa1qlj0vcahqb0h8vx23fyg9nwv07lmacb7igpv56ccgfam";}
{name="kdf";value="18b623q0p3sh5y69i6likknh90h85imgr2glddsjz4p38f575kis";}
{name="kdiamond";value="0smq3333k5qiny3663yj9h8j0smgybjxr0qpf2m139amr45qcyn4";}
{name="kfloppy";value="0xv1nsnv105b9dr2vdlns1vwq25963fgl130lhg31dafkiyn3ivr";}
{name="kfourinline";value="0d721glmhjp9dr6y60gv299jnjf96n8rkws759kizlq2x3ggn1gx";}
{name="kgamma";value="1hmw7pbsxclws57saha7s253172b61lvqxcqp2vpgvdgjdrraik5";}
{name="kgeography";value="1vnrm7rva467z582qppqryz0671b1bcmgxcxlc2f223kp9g0k8d5";}
{name="kgoldrunner";value="1d2sl02c2ys6vnxxy1rh9lsz3aj5rlzjmpx39dbvap5qqjsan58b";}
{name="kgpg";value="0k1ni2xb4p5p5r8vmnpxm77jqa4176apy7047dxc3w3v0qgqvj9n";}
{name="khangman";value="0bq0bdrx761fyaxfv43sfq68hfcwzhvagxm66jzk4wzd6pb1m6ky";}
{name="kig";value="0jmax8a357iqa3nggpmpbzk9vdnisdmilyqxgkrd1n43cs4cbc9h";}
{name="kigo";value="029xn39sxp2dpj8isq1gmis1858iya0bc758jy8d1rq4c046zmxj";}
{name="killbots";value="0arvfbzsax61nn3hz8nk82l3in802866fqsxhz2zrwh03dbrl30i";}
{name="kimono";value="1ic2xbgd8xwadrvc7qfq1ihkpnh4dx2pjrm5zbjgycyfvsmvl6sh";}
{name="kiriki";value="1dp1dp8s4r4501ldn0v5phkk3fj2kfrncz6h4pfylx27lhpbjbn0";}
{name="kiten";value="0jd17nvk6vqniqs8rzmzsnc5hr05i3fwmmvf44g35gpqmr88kb5b";}
{name="kjumpingcube";value="0z6a8iaprdaqpif054a6glbgcgwaxm2w4i1r9077k91nnsnwrmp3";}
{name="klettres";value="10jc56ll0cgaqkb2xf1gh0k75l90al046syj2q2dqsnaa7lazxp7";}
{name="klickety";value="0afb8llrx30zajsy2k0i22xf8ll9lrlmwzrqn4qq7s9wxzwy291v";}
{name="klines";value="0mkwb4d60zxalv0asw4qnvml6jf153ghzqcxgbac40nhzl2abdyz";}
{name="kmag";value="0pjq6nax82x3ldknld25xrx4adc2i7jcy0x4l343m83f5c79xyn6";}
{name="kmahjongg";value="1sx8yplpc70z1vdp9j1shmhc8cqbwmshdhl23hxpl1jydd36q1wj";}
{name="kmines";value="0qpcnp0hfhwybqfxgqvbwhin8lb50gca2kwvms10cayqmjafj9j8";}
{name="kmix";value="1k67gygq1j13p8nxk50n9q01yfkrv0safvxrbq5f70yvka1jdyj7";}
{name="kmousetool";value="17sylfp5zicq36c812jy9h6s4qprwwad05zbbj9701ax40iwrvlr";}
{name="kmouth";value="1bpqq919rzcaaqxp3md4w1lrhf5mxfjp07z5v7ii8mgji8wrq1g5";}
{name="kmplot";value="0dhdpx79klqc5xb9h4dcgriqivppcrw2ib2piqbqs882mi3pdzx2";}
{name="knavalbattle";value="07x4vh2h0d62kwwai5j0d6a2zf615y4mp3iacp5rz8j9pdkhqn52";}
{name="knetwalk";value="151cj33kfyjf5xxgw0q00l5jbvx5kb893y2mv9ydc9xmwgcd4szz";}
{name="kolf";value="1ibrf01vzpr5dyy2hjb6jq6i9hk7w4kw1iffkyh6w5z40nphs2dx";}
{name="kollision";value="1fgs793v36j27z76ik50wz466r3wrga5pq8ibqy3cinvh7blk7cb";}
{name="kolourpaint";value="1wxja4xd3jhxib2vpa5289f80hfcd2idpvzz4ap71ca0bzkvknq3";}
{name="konquest";value="0aga5yzv5jqbgzp6dp11mgjvfjzrs4csaa5pppwbld81573vldmp";}
{name="konsole";value="0kvv4ccc76swxzsw3z7dis8lbmnf6mbzj4b0n9l4zcmmw2iphvd4";}
{name="korundum";value="03djf01c6rm76dzswnlccwr81p5qyzccv2zxmbycclp8lp6w4vgg";}
{name="kpat";value="1vlyya0yiizrd9c1d4pl1dn6nw7g14rzvwhny12qls7ssrj40zzc";}
{name="kremotecontrol";value="0i6jz6m2a2ff97hkqpjy2qhdagx82jwcsnafl2cv0kddszxdabni";}
{name="kreversi";value="0ci6aampxq6l6sc8m8gxqrzhws56fbhp2xil0qzgab93xn7mmp1c";}
{name="kross-interpreters";value="1iypzm9rwszw1walylq6fa16s4hw84zqpyvmd7aik2dz59fmmvlx";}
{name="kruler";value="0841j4001v7497xa6nzdlprnhx8whp0rq24z2yblqnjf1wi5d07y";}
{name="ksaneplugin";value="10x1shs2cfa4331qymwafpm3hm45n3aqrhiriyl7vsnk1cc2agin";}
{name="kscd";value="0ih7zwyvrgsfd4sqj1g5m5hv71sqdzfhmfn6p3crdnnssbvnfhzd";}
{name="kshisen";value="1pxqz390mr066kni1gxa0jay00mgm1r0dmxydrg6mbfyw4qqw554";}
{name="ksirk";value="0rf5hj19bfc8mgm810rwvj1173nk93npgbsd17vsj1rqskdi57zy";}
{name="ksnakeduel";value="0q02nbcl71h6kqs3mdgq51g4y66p5p62mm70j55cfwjq70i8abbw";}
{name="ksnapshot";value="1rlq34j5ay3vyp1vpxxfpzyap26dcwg4ii10ql5bl28z2m1xv8ba";}
{name="kspaceduel";value="1nhxcmrn42gfkifxfikldha9045ffq5xzbb95wwvwp478jcqi4xk";}
{name="ksquares";value="06kxr8v70ygk2bwcvnfp4l4kjj3yhm5f5wgmzfww8h7kxg87lhg7";}
{name="kstars";value="0hhi2vfvv5dzr82gg2p34nsclis0hswkgvh9q21zg2nj2g4byblh";}
{name="ksudoku";value="1jglf83shv3p3kn71i0lbga9mil54cs2m4xr0dd113961c2fnylf";}
{name="ktimer";value="0kqavcxrxly15az0h0yn8cn6mksvka12yc8fywr029drnr70hs0i";}
{name="ktouch";value="1b8612a6pcsaamdq9hpkxr71vvmd0mxrnb0hl8iy05q61cv71i0b";}
{name="ktuberling";value="1zqzs86ricqwvj6ragxj4rxhddr92a34z8jwdp7qqqjdafzq57c8";}
{name="kturtle";value="0nslszpkacbdwsq8l2phzls5qbfm76r32yiynnd35qjfh94dpilf";}
{name="kubrick";value="1qlysx8kvz6r80rm0szq7pk007d57ddv77qy7d3gmpijwa9giybj";}
{name="kwallet";value="1pw7wgfjfa553kdc8z91amg18zhr5c51nhklr7kpqgp1yj0hwp6a";}
{name="kwordquiz";value="016l2yv461w6liqnkszprlr22nyyy7wi9f3fqblqq5xbps8wr6b4";}
{name="libkcddb";value="0qjdxxwj0hw6ykya6npfq2kp21sspwxf79pklz3w7q3gnl98rlbb";}
{name="libkcompactdisc";value="1jql8hqsb5jl73c22ssv0ddmhipjpgqxhwnyw362djdxifvrybhi";}
{name="libkdcraw";value="0w9h9a69wz7m0hg486jcw7vxkzrr3nfjkgqgr40i3cmxpnnjjvp9";}
{name="libkdeedu";value="0ai6vr33wcphimgbznmi8arh9fa9xpcpkjq8hq07svdgmbxjd44m";}
{name="libkdegames";value="0ifpxwpfh79gh5qs8wl0i951kab3ppmri0h99hi0idj96xhkznpf";}
{name="libkexiv2";value="1w9k4c38ziyfnh9byjszg6aw1mbjii06ladgiwx1q397layd7qhx";}
{name="libkipi";value="1a4kqhsvpcly6mlr9w8g8gb2wyyrfbi89pwb3i1ky3w9wxk87pi4";}
{name="libkmahjongg";value="1rr5z04af5kswcn6pjpd9ryp1zwp3znhwb97xgvppni88cwawyff";}
{name="libksane";value="1sv0ba5p0m8d621vykhayblk6lsys4c80474b7d7vgh9xbcxhhgc";}
{name="lskat";value="0bimy8wng95mpkssssmfm2779qyjsw5f1i9wh695k0jq6j25dscy";}
{name="marble";value="1z90p25fgvwg35pxap1yd3k2i2qrsv9d2057lixv03ymbj0l93aq";}
{name="mplayerthumbs";value="1m83pglqgi6dwbbnm4djybki11f2s6q2lhbqa6v1kq12133fhkc4";}
{name="nepomuk-core";value="14sfvizfwnarcidmj74v1rsix85sn9hvs6wm4xnyv7d4xw7mgqv3";}
{name="nepomuk-widgets";value="02wm1ghsf8mxv24y1d1b5j4nq8jwi6dwlbzlqdl2hhjqxfc60sxw";}
{name="okular";value="15aydihdfd5hzkgchxi2xpfy96bm90jcn07lmmp5xcdng3jj520h";}
{name="oxygen-icons";value="0rwdp44nkigs0v449l90mjw7ngs21a0jx17biascjhq1kxrh0vmp";}
{name="pairs";value="009qpwhy64xfad4ch4l4dh5dn5cj9g9jg0b3384k6wjvx6k61fqq";}
{name="palapeli";value="0g03r8f1z2jxyh2hl6l21s292240d2dbcqi0lndjyfsz322i55wc";}
{name="parley";value="1xn5na30xabzp8lhbmq5ajv08rl1s7zsn08ffwd2vq8ac1nwi0k6";}
{name="perlkde";value="0088hbqdjqdfyf1pqksppbq1xzpgc49rqsnpgjikgdh9nqssnipd";}
{name="perlqt";value="1jgiicjknkfiavnq9jw2mdmsqbqb4ch5caxfhx1v6azj4s95ldpj";}
{name="picmi";value="0ckfcmbivkbkl9akb20ih2k4sz221ygqi51wmir3p5ryvk2dlq2a";}
{name="print-manager";value="0wszjqf42c3mb8c9iq5ngjz21424zjl9j0g3pwgdfj0i8iv1lcd2";}
{name="pykde4";value="18j9fh1w3n9yrrzgsq3pqj2pi53wp58kbwkfwb3hn3a2ksw569qb";}
{name="qtruby";value="0zc0if1c8c0ddfm2f6w4zp6dizxqd3z6dnr1iwydw7mdac205j38";}
{name="qyoto";value="1cgkpr68wh5rq3kbkv0zjylmyfg1ld4qh8r5azrq25y4qiisxmax";}
{name="rocs";value="1ak19mjsniwqzybjawigqg8a04kpv6jhx53mkvlm3wjdnsxi1jis";}
{name="smokegen";value="09liqidf5a862l6a4cz4wghhmfsjay647q2q3h17s8iwwid7k373";}
{name="smokekde";value="1xl56ygpc0ca7smxiagm7ch45w6m415i9nbzin08i4p017vvx0df";}
{name="smokeqt";value="0rk31vd45xraihhb3nmx0mkynlq3wwvdsn0460jfi30m72zpmkyc";}
{name="step";value="00vxnybi6q7lw6w22gmd5jmai8ysgyh9sy1cnn6jj4difn1x8zcr";}
{name="superkaramba";value="1rkbrifkvhl2zajr96kk63lc3r5s43acfih6m499hgwxg8g9z0cf";}
{name="svgpart";value="0892krp78wq731wdr5ipsgx10w45xsrr8jx00qyjsci7qsmpfz4w";}
{name="sweeper";value="1i151jzqabfs72c8rl5hh401nmwp9abpa6nfq3m8qyh4d8gn0fig";}
];
modules=[
{
module="kdemultimedia";
split=true;
pkgs=[
{ name="audiocd-kio"; sane="audiocd_kio"; }
{ name="dragon"; }
{ name="ffmpegthumbs"; }
{ name="juk"; }
{ name="kmix"; }
{ name="kscd"; }
{ name="libkcddb"; }
{ name="libkcompactdisc"; }
{ name="mplayerthumbs"; }
];
}
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdelibs";
split=true;
pkgs=[
{ name="kdelibs"; }
{ name="nepomuk-core"; sane="nepomuk_core"; }
{ name="nepomuk-widgets"; sane="nepomuk_widgets"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="print-manager"; sane="print_manager"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="applications";
split=true;
pkgs=[
{ name="kate"; }
{ name="konsole"; }
];
}
{
module="kdegames";
split=true;
pkgs=[
{ name="bomber"; }
{ name="bovo"; }
{ name="granatier"; }
{ name="kajongg"; }
{ name="kapman"; }
{ name="katomic"; }
{ name="kblackbox"; }
{ name="kblocks"; }
{ name="kbounce"; }
{ name="kbreakout"; }
{ name="kdiamond"; }
{ name="kfourinline"; }
{ name="kgoldrunner"; }
{ name="kigo"; }
{ name="killbots"; }
{ name="kiriki"; }
{ name="kjumpingcube"; }
{ name="klickety"; }
{ name="klines"; }
{ name="kmahjongg"; }
{ name="kmines"; }
{ name="knavalbattle"; }
{ name="knetwalk"; }
{ name="kolf"; }
{ name="kollision"; }
{ name="konquest"; }
{ name="kpat"; }
{ name="kreversi"; }
{ name="kshisen"; }
{ name="ksirk"; }
{ name="ksnakeduel"; }
{ name="kspaceduel"; }
{ name="ksquares"; }
{ name="ksudoku"; }
{ name="ktuberling"; }
{ name="kubrick"; }
{ name="libkdegames"; }
{ name="libkmahjongg"; }
{ name="lskat"; }
{ name="palapeli"; }
{ name="picmi"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="pairs"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kde-baseapps"; sane="kde_baseapps"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kuser"; }
{ name="kcron"; }
{ name="ksystemlog"; }
];
}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
];
}
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdenetwork"; split=false;
pkgs=[
{ name="kfile-plugins"; sane="kfile_plugins";}
{ name="kget"; }
{ name="kopete"; }
{ name="krdc"; }
{ name="kppp"; }
{ name="krfb"; }
{ name="kdnssd"; }
{ name="filesharing"; }
];
}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
#had to add fake pkgs to kdesdk to get it to be treated like a split module
{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; }
{ module="kdetoys"; split=false;
pkgs=[
{ name="kteatime"; }
{ name="ktux"; }
{ name="amor"; }
];
}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

399
pkgs/desktops/kde-4.10/kde-package/4.10.5.nix Normal file
View File

@ -0,0 +1,399 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="analitza";value="0lc83vmapd66ilph26hlf8shd4xv0v9y8jsjycw5nl4xpfm7l5nr";}
{name="ark";value="1fvb6phcfd17fxcbb5w4njmkj0vlnz6g5qa6wv5szn4fakb5db1v";}
{name="audiocd-kio";value="11ma2pvc7w6gdd98h806i163dsjhxxly4wv4xdcqq4yhdviq29qv";}
{name="blinken";value="1lfv15blwy3m88zylqsa7k1a5z01qmakjrb9wq9yxnjbhb12nyf8";}
{name="bomber";value="0z704hzpgl1s7jdcpicvixd2dnfsh7i4ainjd5zc1rcljgabmvmx";}
{name="bovo";value="10wp4spcdwsa4nbq9qhancvddv83q12qbi72ksnvds50md12h5xx";}
{name="cantor";value="070al4dx7x7kk568lpd1ajq0q5gws48w3n76g0wlf4dqqlijjfx6";}
{name="dragon";value="0wj89v1d34s595ky97zwph7rxb97h03qya3bi6y1npcp7kjlv2j9";}
{name="ffmpegthumbs";value="0ilc8k601g3m4x1slfcczah87f402a9143a70gvbjprffd7iyf9q";}
{name="filelight";value="1wfd498ir1ivcks1ys3h8whvi0l4xwfgz2j5c4m4b517dskrmaxf";}
{name="granatier";value="04i1zzqkv0da6ymqvdxlaxgws7z44521zj51nw4mvapf1jcck7bq";}
{name="gwenview";value="0rz3va3djm3qxqvchxa3549r1qf124sb4105bs6s42a05h4mzhqv";}
{name="jovie";value="05cc6qzn9hgdvqgi8a2k2i89ggx10fv970293z8d59r6wbh1skv6";}
{name="juk";value="00j9c3g1zsa9vbfwpg37jb4w8753sr28q9xbxp3kfablndwid3w9";}
{name="kaccessible";value="0rsdxzqamq2i3f59npsv6pir9bys3g6zd345sfnpbdkinvxyhrdn";}
{name="kactivities";value="0sfbc3w0cvjfp2zs6v28fv69pq5ikignily572jamm8nwaid5h2g";}
{name="kajongg";value="1yffsgbabnp4mckirl888bghpyrj71d8fbsb0rjk96av1kzl2yvx";}
{name="kalgebra";value="0slvk1c1n9g2b5nakfi53l7gh3c2y78pvcy2snj9f1z5c0sr05cn";}
{name="kalzium";value="12gp0k11zf3m5g2aabrbrd7kpi5k3z46w74kalzzk3s1babgnwxn";}
{name="kamera";value="13qka1nc0ibn3kb03l11v64r6w3k4g7ayq539ncp1syba5726xy1";}
{name="kanagram";value="11vd5abdsggzv4svj4wj6q7mcpbxnpjk4gv0m1zw82ya26aarjnk";}
{name="kapman";value="19r8a7k2ib2fijipajbj461b1sfvlfxrlpfmm52njg61xizdxy20";}
{name="kate";value="0wzvhywvkagshs1q8q1rmq3dxlc5h62y7mlfb2x9wzp945rshq6d";}
{name="katomic";value="0vqqjv1magpc7wgwj0cvbykl9qvphc3s03i30qndygi96mf36iwc";}
{name="kblackbox";value="197r2nfrpdynqix1c81y1y72jrbzzl3prjd6q9sca9qnd47xx9kb";}
{name="kblocks";value="0nnbaskl1s9gy6kn8qk3j9qr6vmsbnpmjj4ddn1fvr32kqjfzr3h";}
{name="kbounce";value="0i962rbbi41m8fd7x1vrbi6q46qnij3d8kdc3cwn7mmjp79gzwmq";}
{name="kbreakout";value="1mh7ki87y1jjk7g4n8flr0ym6qk9nh922xsca2ww1vv16mpxww9w";}
{name="kbruch";value="1632a7rjrmll42yazdab1hmgjv39mp16xhkj6mq61sqdd4pj316v";}
{name="kcalc";value="1gyp45f873q6v2y1l8k52x70b92893314h6ci5a07c0asm8ffrpa";}
{name="kcharselect";value="12w3mzh0gqgh6aaih69djv3f4b1z34cxwhnchqz75z2yb9lcdj1c";}
{name="kcolorchooser";value="19b0r8jjy3fkhhzp9hhxw7zyrkb7fafkxs22ik3lzlm6wri1dwpj";}
{name="kdeadmin";value="1fg49z2lgmsvkhhyvahasb5z0l9cad4xwq5ps3qv5f1yj0hfzic4";}
{name="kdeartwork";value="1z1xnljs5lzmahn3i5xs429bpyxzc6b8sw2m216cs06dwfk77if6";}
{name="kde-baseapps";value="1d08wqb3a9fi0gzkls4jmlnmqpfd5fmg4310d2ih78gflv1yk2gz";}
{name="kde-base-artwork";value="1hq35i8mw3akbg9m6wvp9fv6xpamv9na2bjqzqyph8sx0633dxrw";}
{name="kdegraphics-mobipocket";value="0jq1qrrax9w60w35qxvjrazl4c8qvninhgp9na7pgz6sk6ydb0jf";}
{name="kdegraphics-strigi-analyzer";value="07z3nzmfw5pxg97qx2jj54f3r6qc2x22yxhn3kmcpifzr3gyi555";}
{name="kdegraphics-thumbnailers";value="1iwmyn2r43i3bykrc4vx0785f3x5zrnvvfdhfpr88f6pxr95f7bq";}
{name="kdelibs";value="1lgjz90irrqwz8h6w7iwy8icvqyj4kb2sarnyrxna8dy1fah9m5n";}
{name="kdenetwork";value="1lra150av4ndq5s9msx1khwdwd8k0n756qg6d4fsjp2fy7scf26k";}
{name="kdepim";value="0qs1znrvfzrkhlh1d68pri9fnaq2nhxnih5fsjcn2m7d537havq1";}
{name="kdepimlibs";value="01hyi3r2an8g9ds59az39c8qdm8qiws6q16558jna7f6w4m0yq5r";}
{name="kdepim-runtime";value="1p293zqwdc0g77h996slc0qwa01a24nq5yh5a4q6ng92rfzzkrl3";}
{name="kdeplasma-addons";value="0hs9bmg4gcl9lks78pmb0n29jzzh56w5islyzhzccrrcbimsqvzp";}
{name="kde-runtime";value="0daw0sjyqrdhsah920fla05wvcf9zrck1lbkdcbvrk1qvvqwjhpx";}
{name="kdesdk";value="0h1il5dza8qcfz1fgz6qhsaccqkp0g5fdi4k3413vr6lhg67dh78";}
{name="kdetoys";value="1r2rh0hdipwfxwq29whicbvxa7dr5vswh9pqw60x1c634cgba49p";}
{name="kde-wallpapers";value="1d96asb1nn88rwzb2nis37d8qwliaswpzfc15zq6jkcbdyzaxfpv";}
{name="kdewebdev";value="18s79ah9j01mb3lpzpsi6wxbh3wjpkswx5snpv1fyphf760jzb3n";}
{name="kde-workspace";value="0xg8asnxq48x6zydh09bfga11363bya7hfkygas7ar7rb0144im3";}
{name="kdf";value="0d3i5jpikh285vwr93044lws34ihhbszb05gbyvibx7faqdllg2h";}
{name="kdiamond";value="1dca5h88lm2syhnk5bd8g83lx9422hyg972di4xj69vnnpl5nsp9";}
{name="kfloppy";value="02yq8p8ma1aghm9k442xznk1xwb4mcd36h040ix5rc7j3j02l79m";}
{name="kfourinline";value="0ljs9szk4r6iasn4qkclpq3nij5hb8xnyqj36w8nxbvsmka69d2p";}
{name="kgamma";value="0byvsk5j2g1ycfq5zskg9bkbmq9jddv0nzck2w4qayf072cqn8b3";}
{name="kgeography";value="0icf21sr6w920ga6as9yx1ja85gwk3h2bb1ra9k5bs32vw5r7nk9";}
{name="kgoldrunner";value="18i0mj3j6q1gycf33z416kcf9lsksrmk8fnp4j1jg9mlr6y1xc6c";}
{name="kgpg";value="1x04mj6ykmhmlr2074bn6kc88zz4y3lgbvnf4qkcj8q5wil1p3gv";}
{name="khangman";value="0yrqd17w78pl18ln8rqcb0cmqis8al9k3zvg0hvxyh3qp013xb9m";}
{name="kig";value="1wd8kk4gkvgxp83q6dqdqkqaznbrl8kk88ixk17qhlj03iykxfcj";}
{name="kigo";value="1g78wqsk72mki48inxam6337hpjd491325j3cmvvlz0196q3s4zn";}
{name="killbots";value="1kjmwsrqmj85yawbw6xr025bkv3kidwasiyrjr01mgsndlkn3y47";}
{name="kimono";value="0wswbykjq56rxf0rkkl97ipy36r5q8h9sws758fvwmd16nylhdg0";}
{name="kiriki";value="0iv3lak13szc93gqqjlqdmdbg3jy4xbxvnahzka0d3m2nkg9iv6h";}
{name="kiten";value="1112kl5vbz58v52nss4gd4plnrl3nkp57mnhdbs58dlxv1s1s7b9";}
{name="kjumpingcube";value="1y9pgqsq72v9mxw04dkg4x2m15jyl5iahqshxczzihh3pjllv7sr";}
{name="klettres";value="0kqjw7vrpzvrr4g6zhdsqppbr2viqr7jann4npnzh0bw48842zhp";}
{name="klickety";value="0d78nak6dzmkfsxq7cxndca51paw2giawk31s70fgr7kwa7s9g9f";}
{name="klines";value="0z8bp1xwy17k1nv7d8mrgsk7vgb5137icdy0d66jwaa9bzsv3khh";}
{name="kmag";value="1iamiy8ppyd4qkbdhqykxgh6c8w31glpjv1srk9s4gqyqj51mf24";}
{name="kmahjongg";value="02ai75zc5rfch3b7a2zz9kmw6r3kgkbzr9pi8c1zrdgif8awrl3x";}
{name="kmines";value="0hc838cd5h8gjm4alszi8z70r3jmjxqwmhni1silk16gsiy3kqvy";}
{name="kmix";value="08ls620ndrvszx36sy2xj32fvwm5b8aggp86cwvzqjvp47c46wjv";}
{name="kmousetool";value="02lg84gpnic2l84ay01adw2fynr0x7byklqdz3zphiqhddhfnb81";}
{name="kmouth";value="09jg2xar4p6rrcc41qfj0h57fapdgpdpjh6ackhyana0871q5cam";}
{name="kmplot";value="17s7n51x2nl5g4l0862gnzigkwa7qwipmvy7krn8b1z051n2jwfx";}
{name="knavalbattle";value="15qpgn5bjbk4smwzz5x0x9f1kd5mjhg6p4h4dalcay8k9zixxxvl";}
{name="knetwalk";value="0yqdxcah56z1q21xfrk33s4fx6l9q21na5dx1p12d114vzgr3gzq";}
{name="kolf";value="08ba3flnknzjgys73lhpy7b98j544wwv6vvbrd6p2675imwk168w";}
{name="kollision";value="1jahrgkb9j8shwrmm1486f3w1hd5snwfwv53gj7973z0mmm5468r";}
{name="kolourpaint";value="18ql77778zdc9149qd7mslkh780v6qkhdc1wfljrr1mj98p08av9";}
{name="konquest";value="1iyqgzyg004lyqssmvh4951m9v56ayw7ggza6awh6a805j0zz0sp";}
{name="konsole";value="1zqmmv4zpq59nm2r7ccmp1ij5q3qjclmbmcm667hxmq9dyrwv5an";}
{name="korundum";value="12cqg6ib06icadyslnqzqmkal6rmjhki02na09gacqdiwc7gf2p2";}
{name="kpat";value="1zdv4jvqg0xbbsf39d2n8d0ya2mqzva06s46m2hb66flyjz5pd3p";}
{name="kremotecontrol";value="0jw4jjlhy378f58wgqm5cikqj8i3bdz1s1qm4r24bb1677dqyd4x";}
{name="kreversi";value="1mxgb60zbq8qkjnamvlr072vii2px224mg03fjjds063321swx0z";}
{name="kross-interpreters";value="0r2y7lscsgk6jkzby7dqwd62yk2nyzwm6chihsvivl9frl38wqza";}
{name="kruler";value="0gwyy0k8h705bnp6q7jgzbk8i9d6csffhwlas7y0zwcl7n03664x";}
{name="ksaneplugin";value="187n3s19xdfl7bbcpgyappw1v2bgjki8kh1qh8dy8mscm2qn50j9";}
{name="kscd";value="0wqm2vhj593x4vps3205gfnl29yglr2szzpdiazi6rq80r8ifvbq";}
{name="kshisen";value="1n5131kckixwbllp8sxn5y93z9q2fdvjj77pcy4sadngx5slz718";}
{name="ksirk";value="0b2084h246jhphwpa5iwpxbib4z4h6cwvi8bp18l7yid77wz28f2";}
{name="ksnakeduel";value="0v74l5svmr21gahxzfz7sjnj5gzhnyir7l7cny1q7xnha7bnaw81";}
{name="ksnapshot";value="05l18i9mv9pghlf50qax9drlcrmdahgiljnvcq20vadrxw4qxghv";}
{name="kspaceduel";value="0q8iqg5n7w0v5llbgan7vnf41zbfagc0rd8ya7fp9gf5pmx422zf";}
{name="ksquares";value="0fnz1hy2n0i1gal9b8ij8bi5sql5iybbjpkyy55dapcbph2br8xc";}
{name="kstars";value="0nf3n9f6dmp8401d2jfcyh26xbwmwdav4maacp5dmhv6xvr2ivis";}
{name="ksudoku";value="07lxxaw6ykhlxzkbhzsz43ingfx0l1gb38v2z0ag8jd3iln7l79v";}
{name="ktimer";value="112449fn8zbgz3s22bswyc8fisa126j6xvmwxzb91c5vx0wj9qg8";}
{name="ktouch";value="0a9x6ym3gw3d6jqvlfaw5qyxzcn9vi4sa55ig0d9cdy8057y5pwz";}
{name="ktuberling";value="1ihvv3mais39yk84k1a76mpz5c9sbbnw80n536adh3y3fad4yw5a";}
{name="kturtle";value="07fxjiaq69x97w45z8r3g1iyi0vyk0wyqwjwn1qb7a1ziwva5jl9";}
{name="kubrick";value="0mqf52lp0s61qsv8q47h012m5k8mf6gqwjpb7swrs7hxsc58dspy";}
{name="kwallet";value="0mb8ph0wf761gpss7xmi4zngxfalm3sdngjxrpr8brczjp8v9wdm";}
{name="kwordquiz";value="0rbrfswf13pw4cam8fj9w7g12yhzvg82izzy79xsxb0dkk4ki42n";}
{name="libkcddb";value="033vmv8fin87m788qjyjaravf5gr9cj953yvcfg9438qpavd79qr";}
{name="libkcompactdisc";value="105w0bnw6gzjb8gnp2gmwcjgaz3gi4f16fninbl2658dnb24b1kq";}
{name="libkdcraw";value="0p1wbdrhpp6rg82kfrxhaz4lxqjix6mb1grj16zy1i24x89mxlya";}
{name="libkdeedu";value="1b6qpd3i59hfd7rwij255xyrxp5ylw5mpyr6k10py5pj7fn4zhc2";}
{name="libkdegames";value="1cc5011xm9rz9fz2dk3ibfr4cqq3rmw3i7vlcsrhfscsx0xm88sc";}
{name="libkexiv2";value="18ngfrz30q0prsrwy92hb7y0hxhcxlr4ic7lq7fv4l45434ry7pv";}
{name="libkipi";value="00nn96qwynfx2ajqllh8zkwccc1prigbcq75s1hnpm67nnfc98as";}
{name="libkmahjongg";value="06qpykgaxx5r7n3ymph1g2fy0dj2vclfqlnzbdc41ma3l66jci64";}
{name="libksane";value="0a0ipz9jmrw076mxsj2k3njaf7dwfrdqd5bqwcc4q8qqlhpp4ljy";}
{name="lskat";value="1sxmjhw61w1d19zidf96qkddx9r0h8z5kbjl8xgah8k25ji5qsr6";}
{name="marble";value="04cy00jsnahmigffjyqviizj5bvj2aldfgkyj2g5iadfsqflxvy4";}
{name="mplayerthumbs";value="0hmdvyillr779c1fmia3h6dcy7j7j0kvxvh4mdz1adfwaz4zgymy";}
{name="nepomuk-core";value="12grw88gc4b4i1h346ahpkv8493gyvhvkpcqxwc2dqpsqsfc7rpz";}
{name="nepomuk-widgets";value="1npmwv1vh5ci6c9a291vyps85c5cvdg5dn9r9h28dq58s2h274yh";}
{name="okular";value="05v23g4w6sw525w7qllcbyhk92k75hyqrvx9hncylig4blivjp9f";}
{name="oxygen-icons";value="1y7iq77fyiykmjf8xdyprnshlasazdv6fcjp6ayfx0jkixb2gqya";}
{name="pairs";value="1v4h0d04b7g59axkl69gyml02hzxjkfzcgg320mj05xx5q0kjyq5";}
{name="palapeli";value="13hvppav7yz9wvvly8f8kads9arqvl25spwa8awpl2f4a394c0sa";}
{name="parley";value="0wk6p4rw6063089iq758a0mcq10fh8c1pg0wq00dhs9d05gwk873";}
{name="perlkde";value="1hh5y4zmmb97py281i0jhzwg8r4ii3qmilzbwbrvk9j4ngcz37gg";}
{name="perlqt";value="09880varap78a44zifqx72wbx23wq0hqq540hf466fmmxk744877";}
{name="picmi";value="060a1n5lclsaz4zjq1dpm9y20fqgq3rjlkm54prp3kkj5hpi6kcl";}
{name="print-manager";value="0jmvfy376axdwi4a2fc78ldlny4jbk7kxvhi1mwf8piibwc10dvf";}
{name="pykde4";value="10aqvx6dfcbi9mrsr0sdhhxp2jqkw06rf55p2nxdadmcszad2k7k";}
{name="qtruby";value="042nya6n5sp2r9a9s3limbph8wv5z04fha7pkqznvrkr040qykvj";}
{name="qyoto";value="0nxhxvh4zpskvxv7mjz06vililg2wqlabaaaf61j0naxz4aynyrv";}
{name="rocs";value="10xb6qh29g4l369dyimwj0yk8s5yi6jg1byaf4z5jnr2w8ysbf7j";}
{name="smokegen";value="0myzqfqcl7i8kikcyj2vbip9y4al411jmjm02hv55baccygls8yr";}
{name="smokekde";value="0b1m9g1swj9r44zbg8lbqmxp9l342dz8b4wsnn6n9ih0b15p512h";}
{name="smokeqt";value="047am45yjkyyza281zfzvv84kvldvmbgch5q3fd89vcvl5sh399j";}
{name="step";value="05rjnb16mzz91q7473k2g83g792xqh77p4gc2xmw0a5j4qk6f6ga";}
{name="superkaramba";value="0vxb8656ag6hmy3nx9w3xa38j12rajkqsmv4kx6ylnpk6v71s7x2";}
{name="svgpart";value="17j59rwg483p7ip1zxq37jnzvkafrkj7yabwrbwk0vvxkqcbqpx3";}
{name="sweeper";value="0yhp6k2ai7wgn242932w10xwainq07bf9zjm2fvaavrg3gh38644";}
];
modules=[
{
module="kdemultimedia";
split=true;
pkgs=[
{ name="audiocd-kio"; sane="audiocd_kio"; }
{ name="dragon"; }
{ name="ffmpegthumbs"; }
{ name="juk"; }
{ name="kmix"; }
{ name="kscd"; }
{ name="libkcddb"; }
{ name="libkcompactdisc"; }
{ name="mplayerthumbs"; }
];
}
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdelibs";
split=true;
pkgs=[
{ name="kdelibs"; }
{ name="nepomuk-core"; sane="nepomuk_core"; }
{ name="nepomuk-widgets"; sane="nepomuk_widgets"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="print-manager"; sane="print_manager"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="applications";
split=true;
pkgs=[
{ name="kate"; }
{ name="konsole"; }
];
}
{
module="kdegames";
split=true;
pkgs=[
{ name="bomber"; }
{ name="bovo"; }
{ name="granatier"; }
{ name="kajongg"; }
{ name="kapman"; }
{ name="katomic"; }
{ name="kblackbox"; }
{ name="kblocks"; }
{ name="kbounce"; }
{ name="kbreakout"; }
{ name="kdiamond"; }
{ name="kfourinline"; }
{ name="kgoldrunner"; }
{ name="kigo"; }
{ name="killbots"; }
{ name="kiriki"; }
{ name="kjumpingcube"; }
{ name="klickety"; }
{ name="klines"; }
{ name="kmahjongg"; }
{ name="kmines"; }
{ name="knavalbattle"; }
{ name="knetwalk"; }
{ name="kolf"; }
{ name="kollision"; }
{ name="konquest"; }
{ name="kpat"; }
{ name="kreversi"; }
{ name="kshisen"; }
{ name="ksirk"; }
{ name="ksnakeduel"; }
{ name="kspaceduel"; }
{ name="ksquares"; }
{ name="ksudoku"; }
{ name="ktuberling"; }
{ name="kubrick"; }
{ name="libkdegames"; }
{ name="libkmahjongg"; }
{ name="lskat"; }
{ name="palapeli"; }
{ name="picmi"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="pairs"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kde-baseapps"; sane="kde_baseapps"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kuser"; }
{ name="ksystemlog"; }
{ name="kcron"; }
];
}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
];
}
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdenetwork"; split=false;
pkgs=[
{ name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers";}
{ name="kdenetwork-filesharing"; sane="kdenetwork_filesharing";}
{ name="kppp"; }
{ name="kdnssd"; }
{ name="krdc"; }
{ name="krfb"; }
{ name="kget"; }
{ name="kopete"; }
];
}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
#had to add fake pkgs to kdesdk to get it to be treated like a split module
{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; }
{ module="kdetoys"; split=false;
pkgs=[
{ name="kteatime"; }
{ name="ktux"; }
{ name="amor"; }
];
}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

7
pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix
View File

@ -1,7 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

0
pkgs/desktops/kde-4.7/kdeadmin/kcron.nix → pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
View File

4
pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix → pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
View File

@ -5,7 +5,5 @@ kde {
buildInputs = [ kdelibs boost ];
preConfigure = "mv -v strigi-analyzer kfile-plugins";
patches = [ ./kdenetwork.patch ];
#preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins";
}

24
pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch
View File

@ -1,24 +0,0 @@
diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
--- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400
+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400
@@ -28,7 +28,8 @@
set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} )
endif (WIN32)
-find_package(KdepimLibs REQUIRED)
+macro_optional_find_package(KdepimLibs)
+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
# find_package(X11VidMode) not used at this time
# NX support is not ready for KDE 4.2; disabled (uwolfer)
@@ -79,7 +80,9 @@
macro_optional_add_subdirectory(kfile-plugins)
macro_optional_add_subdirectory(kget)
-macro_optional_add_subdirectory(kopete)
+if(KDEPIMLIBS_FOUND)
+ macro_optional_add_subdirectory(kopete)
+endif(KDEPIMLIBS_FOUND)
if(Q_WS_X11)
macro_optional_add_subdirectory(krdc)

2
pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
View File

@ -2,6 +2,4 @@
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

11
pkgs/desktops/kde-4.10/kdenetwork/kget.nix
View File

@ -4,14 +4,11 @@
kde {
buildInputs =
[ kdelibs libktorrent
#kde_workspace
shared_desktop_ontologies
#kdepimlibs
# kde_baseapps
gpgme boost libmms qca2 sqlite
kde_workspace
shared_desktop_ontologies
# kde_baseapps
gpgme boost libmms qca2 sqlite
];
KDEDIRS = libktorrent;
patches = [ ./kdenetwork.patch ];
}

2
pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
View File

@ -2,6 +2,4 @@
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

3
pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
View File

@ -1,8 +1,5 @@
{ kde, kdelibs, libvncserver, libjpeg }:
kde {
buildInputs = [ kdelibs libvncserver libjpeg ];
patches = [ ./kdenetwork.patch ];
}

6
pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
View File

@ -1,7 +1,5 @@
{ kde, kdelibs, libvncserver, libXdamage, libXtst }:
{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }:
kde {
buildInputs = [ kdelibs libvncserver libXdamage libXtst];
patches = [ ./kdenetwork.patch ];
buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ];
}

282
pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix Normal file
View File

@ -0,0 +1,282 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "0mxvp97sf1f6w2rfy966fdhpflqfmwv253zswaz3cv9b5m9yf5q8";
}
{
lang = "bg";
saneName = "bg";
sha256 = "0fk5r0bqnks1ygac6cs8f5gb16lr4qrh32jgdk50hnv6ad51agfv";
}
{
lang = "bs";
saneName = "bs";
sha256 = "10kc76l1fm56rhnc6wvm29ij15v2pvmsq1djvm6zxhsdm99af25k";
}
{
lang = "ca";
saneName = "ca";
sha256 = "0gn4ghvwwi09aibmx5940b159d7svnbcq25cg02lhvjvfrmyfp1j";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "175j2gn35vzjb17rbd0mvrxas180wq3v1x6q1caykm2qddqqmqgv";
}
{
lang = "cs";
saneName = "cs";
sha256 = "0zxa2cmcwdbdwgz5wm58v0gqzphcc1b1vzzgrrnpsmfjqb6h951c";
}
{
lang = "da";
saneName = "da";
sha256 = "0qab4gbilpb8fwyjqcvvmzms4hdbrii4xr5xgcl87v8va5gcdc8s";
}
{
lang = "de";
saneName = "de";
sha256 = "1vh9h185qa42q7gkyflp7g93hgvhxjd2cknwz0yq6dxsx8dg5iqd";
}
{
lang = "el";
saneName = "el";
sha256 = "1f8wsq9hh2d6wpd7v1bz5mchb1zjnc895mmpawy67rv6s45vx6y8";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "1nz7q6fq3242vjh2961r4v4kp1fywknnjrnfadgf3g0dvav2vkq8";
}
{
lang = "es";
saneName = "es";
sha256 = "1mazkh53vdvsz5zrx41fi49x44isibpwmrrqwcmpbcwdqx7iaf9v";
}
{
lang = "et";
saneName = "et";
sha256 = "0f7bi50gzrhnvif7c1h6mgscbbjvz0cqifdnaaqr9m7d9iafwwyz";
}
{
lang = "eu";
saneName = "eu";
sha256 = "0k0w849nqjsaxsi8rm4jd13fqcvk88v6j0yar36mvblh6x61qgq8";
}
{
lang = "fa";
saneName = "fa";
sha256 = "12fmd6zy14wsd2i1nszc4bl3q0asvf9wqsgwihxipw34fwa6irpv";
}
{
lang = "fi";
saneName = "fi";
sha256 = "0k76zlfjjz7vlvlz298713c27zbcybjip33wix76ldj7is9yb07v";
}
{
lang = "fr";
saneName = "fr";
sha256 = "03qxm8q3bvx4cqaxvfbdj07q2rpcwrqyp333x3jwmcc5xj731pww";
}
{
lang = "ga";
saneName = "ga";
sha256 = "09n5wpc4s2xxv1016dvg8zwbvx6lx6942lnyq3b4adl4yjcghs32";
}
{
lang = "gl";
saneName = "gl";
sha256 = "1w7hj6ma3d03wv2x651hwhxxc4ird23f0khc4z03ncpl9xvyikky";
}
{
lang = "he";
saneName = "he";
sha256 = "0jirch5cw99lcs9d83kzifb9wdqz1aqdjmi4wam0gi8nciws8hwr";
}
{
lang = "hi";
saneName = "hi";
sha256 = "02g0a4l1mlmx64acxfl6a1lqbivnwdfx98q8f9nyb3836i8i3sd7";
}
{
lang = "hr";
saneName = "hr";
sha256 = "087jww1daqqwrrxi1hz72kc39ipj6hj73cqzy4ds24hm112z58dc";
}
{
lang = "hu";
saneName = "hu";
sha256 = "1mwmbhnzvhxzcfk3j6f61jfprfwaan8mf9l4s7r8f3ddmsz66kha";
}
{
lang = "ia";
saneName = "ia";
sha256 = "0grmi972ndizf3gpjxjv79crc0si4b3dadayzmayrykndd5b30i6";
}
{
lang = "is";
saneName = "is";
sha256 = "13d8ikfhlswpaxrj9l6f0kf4dzbmgri5d3miz3r8h6lmmszq2phr";
}
{
lang = "it";
saneName = "it";
sha256 = "1m17wqak0alhkk81fhl32fcv0b2nnszjs7xia0df75z8c2js9vmm";
}
{
lang = "ja";
saneName = "ja";
sha256 = "1br0gipw4ra3bvzdal9dn8x8kldmmk4miw1z5hsimhkgc5y5amb3";
}
{
lang = "kk";
saneName = "kk";
sha256 = "0vmdfcy2dmxd6bjvz31xhjkxd2q55px70c9d6lj3fmf4bxiqlmc4";
}
{
lang = "km";
saneName = "km";
sha256 = "1snrn2yw7z2m0m3wqxgqrq1rxqnjb4ylngdnn0ym87yh7bh6kjsc";
}
{
lang = "ko";
saneName = "ko";
sha256 = "1dyymy3wdldmkxai47y25qzpcajsi18h4rl0m1izm90giwadrk85";
}
{
lang = "lt";
saneName = "lt";
sha256 = "1im120mlnvjdlh5gna9q0qfixg2zz2shhzbxih37ikzpjxr7v5zs";
}
{
lang = "lv";
saneName = "lv";
sha256 = "07303s04qkh7pa78ranvcvqs75wll427vdb0iv6sr07smd0fzf1d";
}
{
lang = "mr";
saneName = "mr";
sha256 = "1dzzzc3wkjhapmdlbp178w6rm00ibixmp4xhkbsavr7hy18a048c";
}
{
lang = "nb";
saneName = "nb";
sha256 = "039gi1ba8z9w80b6xsh3b51alq91d4phr6pmfnaqngwqmaksxidh";
}
{
lang = "nds";
saneName = "nds";
sha256 = "0bg55dl284y7wvcl40sgspnvpfiqkapvwwi02n4jyl3w4xsy3b8j";
}
{
lang = "nl";
saneName = "nl";
sha256 = "048pr21vfcwvfxpw56kil4awmx7samva4jd86g6rvrs6q85c0mxj";
}
{
lang = "nn";
saneName = "nn";
sha256 = "10xy5r3s79gh28zzy72dhs79ap616qnrqms3mgg9kdvmmi2n32nm";
}
{
lang = "pa";
saneName = "pa";
sha256 = "08ib4pbahgjww4d82vcgahc7jxky85riim1p0ck5dzhri0664zx8";
}
{
lang = "pl";
saneName = "pl";
sha256 = "0kqr4jvqsyasdacv0kxjcx5nfd6m0kd1vk7418mzbabjyb2nbvl1";
}
{
lang = "pt";
saneName = "pt";
sha256 = "0nfnwcq2n5dp721wi7arp3via0kvhf3rfq8h78k9dqs5afyhf4n1";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "1886fga94c7zp0g1hdijqj64mi8asgbmykic6n0mzin33c4rwyjs";
}
{
lang = "ro";
saneName = "ro";
sha256 = "0q51v23dviwrgy1zaq3823xh2vfm2zvkpqizgmi111m681s0n4kx";
}
{
lang = "ru";
saneName = "ru";
sha256 = "0mm8mfqlfbj0r2d4xyli2n8x8sgpw2bjxnlq8yy38pgi9pksgcsl";
}
{
lang = "si";
saneName = "si";
sha256 = "0qcvdil9gbgwf10v4j606d0vi4705vb77aq7p1kq3y57khldlhsa";
}
{
lang = "sk";
saneName = "sk";
sha256 = "1rmxh12r7i9cc7nkigxx6igvzjjq1rk3y5nm2mdjq7gcv067gp9i";
}
{
lang = "sl";
saneName = "sl";
sha256 = "0xdd5ini0b0fi5xfai533y8a5g8gyphfrz6qvivpgdd81rfckpk1";
}
{
lang = "sr";
saneName = "sr";
sha256 = "09rfcrw58f0bvqqkdcpiy56xv591yk6v0iinlabamza63h011rmk";
}
{
lang = "sv";
saneName = "sv";
sha256 = "1slznfn6ghqy5cy870apwgcygdhvbfvh1dy6rplhwnv0riwnx3ay";
}
{
lang = "tg";
saneName = "tg";
sha256 = "12ic6nd65l6w7vqymfr1djbkn8jfghc5vyyi783mdf3pwx3xjk8i";
}
{
lang = "th";
saneName = "th";
sha256 = "0v02h8gdwnabahb3invxvp2ap5x6b4a0pf0sl15phi8s2m1y9fad";
}
{
lang = "tr";
saneName = "tr";
sha256 = "10asd6ha7fjs4b11vp27xp1piycalvidv3l6z5sv9j5bs4hayp1g";
}
{
lang = "ug";
saneName = "ug";
sha256 = "11n6z1d2b2b93lj9vps4ry6k671m5lssrv4hi5nr0a1vbc1d6ix1";
}
{
lang = "uk";
saneName = "uk";
sha256 = "1lrghs0s3hmhmrqarsc29518ax95wz6gnhimxs8lyc88b4jil0p5";
}
{
lang = "vi";
saneName = "vi";
sha256 = "198rr7i673a77v3qlld1c0rm2vr86rr6nf97v4wckcvyz8b6s6i8";
}
{
lang = "wa";
saneName = "wa";
sha256 = "01glzj5vhhmv6zvrmwd4wwx0bq6b0p08ixx0rf3bh4pdbi42hiin";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "0cj8flr5c73crrwchfz3j60snzmvbr3bc1p4pnk4s3vajmwsdaas";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "0lc896x55ww3s5jz7ms0gmm22qq9yjpnbzbjfq64574pvr2m3s5y";
}
]

2
pkgs/desktops/kde-4.10/oxygen-icons.nix
View File

@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0nl3praln6kfdpr4diln850f29242496p5yrfcyq6xjkpsswq55w";
outputHash = "1aad2qb9zrjcild5s584q4zz6zc3wgkclv79gnfwkhmy0viqx9l6";
nativeBuildInputs = [ cmake ];

Some files were not shown because too many files have changed in this diff Show More