Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
2c09d55904
|
@ -28,6 +28,7 @@
|
||||||
garbas = "Rok Garbas <rok@garbas.si>";
|
garbas = "Rok Garbas <rok@garbas.si>";
|
||||||
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
|
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
|
||||||
guibert = "David Guibert <david.guibert@gmail.com>";
|
guibert = "David Guibert <david.guibert@gmail.com>";
|
||||||
|
hinton = "Tom Hinton <t@larkery.com>";
|
||||||
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
|
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
|
||||||
iElectric = "Domen Kozar <domen@dev.si>";
|
iElectric = "Domen Kozar <domen@dev.si>";
|
||||||
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
|
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
|
||||||
|
@ -65,6 +66,7 @@
|
||||||
sprock = "Roger Mason <rmason@mun.ca>";
|
sprock = "Roger Mason <rmason@mun.ca>";
|
||||||
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
||||||
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
|
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
|
||||||
|
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
|
||||||
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
|
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
|
||||||
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
|
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
|
||||||
vcunat = "Vladimír Čunát <vcunat@gmail.com>";
|
vcunat = "Vladimír Čunát <vcunat@gmail.com>";
|
||||||
|
@ -72,6 +74,7 @@
|
||||||
vizanto = "Danny Wilson <danny@prime.vc>";
|
vizanto = "Danny Wilson <danny@prime.vc>";
|
||||||
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
|
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
|
||||||
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
|
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
|
||||||
|
wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
|
||||||
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
|
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
|
||||||
zef = "Zef Hemel <zef@zef.me>";
|
zef = "Zef Hemel <zef@zef.me>";
|
||||||
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
|
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
|
||||||
|
|
|
@ -41,4 +41,13 @@ rec {
|
||||||
pathExists readFile isBool isFunction
|
pathExists readFile isBool isFunction
|
||||||
isInt add sub lessThan;
|
isInt add sub lessThan;
|
||||||
|
|
||||||
|
# Return the Nixpkgs version number.
|
||||||
|
nixpkgsVersion =
|
||||||
|
let suffixFile = ../.version-suffix; in
|
||||||
|
readFile ../.version
|
||||||
|
+ (if pathExists suffixFile then readFile suffixFile else "pre-git");
|
||||||
|
|
||||||
|
# Whether we're being called by nix-shell. This is useful to
|
||||||
|
inNixShell = builtins.getEnv "IN_NIX_SHELL" == "1";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,7 +132,7 @@ rec {
|
||||||
{ inherit (def) file;
|
{ inherit (def) file;
|
||||||
value = listToAttrs (
|
value = listToAttrs (
|
||||||
imap (elemIdx: elem:
|
imap (elemIdx: elem:
|
||||||
{ name = "${elem.name or "unnamed"}-${toString defIdx}.${toString elemIdx}";
|
{ name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
|
||||||
value = elem;
|
value = elem;
|
||||||
}) def.value);
|
}) def.value);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
#! /bin/sh -e
|
|
||||||
|
|
||||||
distDir=${NIX_TARBALLS_CACHE:-/tarballs}
|
|
||||||
|
|
||||||
url="$1"
|
|
||||||
file="$2"
|
|
||||||
if [ -z "$url" ]; then echo "syntax: $0 URL"; exit 0; fi
|
|
||||||
|
|
||||||
base="$(basename "$url")"
|
|
||||||
if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
|
|
||||||
dstPath="$distDir/$base"
|
|
||||||
|
|
||||||
if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
|
|
||||||
|
|
||||||
if [ -z "$file" ]; then
|
|
||||||
|
|
||||||
echo "downloading $url to $dstPath"
|
|
||||||
|
|
||||||
if [ -n "$DRY_RUN" ]; then exit 0; fi
|
|
||||||
|
|
||||||
declare -a res
|
|
||||||
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
storePath=${res[1]}
|
|
||||||
|
|
||||||
else
|
|
||||||
storePath="$file"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp $storePath "$dstPath.tmp.$$"
|
|
||||||
mv -f "$dstPath.tmp.$$" "$dstPath"
|
|
||||||
|
|
||||||
echo "hashing $dstPath"
|
|
||||||
|
|
||||||
md5=$(nix-hash --flat --type md5 "$dstPath")
|
|
||||||
ln -sfn "../$base" $distDir/md5/$md5
|
|
||||||
|
|
||||||
sha1=$(nix-hash --flat --type sha1 "$dstPath")
|
|
||||||
ln -sfn "../$base" $distDir/sha1/$sha1
|
|
||||||
|
|
||||||
sha256=$(nix-hash --flat --type sha256 "$dstPath")
|
|
||||||
ln -sfn "../$base" $distDir/sha256/$sha256
|
|
||||||
ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")
|
|
95
maintainers/scripts/copy-tarballs.pl
Executable file
95
maintainers/scripts/copy-tarballs.pl
Executable file
|
@ -0,0 +1,95 @@
|
||||||
|
#! /run/current-system/sw/bin/perl -w
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use XML::Simple;
|
||||||
|
use File::Basename;
|
||||||
|
use File::Path;
|
||||||
|
use File::Copy 'cp';
|
||||||
|
use IPC::Open2;
|
||||||
|
use Nix::Store;
|
||||||
|
|
||||||
|
my $myDir = dirname($0);
|
||||||
|
|
||||||
|
my $tarballsCache = $ENV{'NIX_TARBALLS_CACHE'} // "/tarballs";
|
||||||
|
|
||||||
|
my $xml = `nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/find-tarballs.nix>'`;
|
||||||
|
die "$0: evaluation failed\n" if $? != 0;
|
||||||
|
|
||||||
|
my $data = XMLin($xml) or die;
|
||||||
|
|
||||||
|
mkpath($tarballsCache);
|
||||||
|
mkpath("$tarballsCache/md5");
|
||||||
|
mkpath("$tarballsCache/sha1");
|
||||||
|
mkpath("$tarballsCache/sha256");
|
||||||
|
|
||||||
|
foreach my $file (@{$data->{list}->{attrs}}) {
|
||||||
|
my $url = $file->{attr}->{url}->{string}->{value};
|
||||||
|
my $algo = $file->{attr}->{type}->{string}->{value};
|
||||||
|
my $hash = $file->{attr}->{hash}->{string}->{value};
|
||||||
|
|
||||||
|
if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) {
|
||||||
|
print STDERR "skipping $url (unsupported scheme)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
$url =~ /([^\/]+)$/;
|
||||||
|
my $fn = $1;
|
||||||
|
|
||||||
|
if (!defined $fn) {
|
||||||
|
print STDERR "skipping $url (no file name)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($fn =~ /[&?=%]/ || $fn =~ /^\./) {
|
||||||
|
print STDERR "skipping $url (bad character in file name)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($fn !~ /[a-zA-Z]/) {
|
||||||
|
print STDERR "skipping $url (no letter in file name)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($fn !~ /[0-9]/) {
|
||||||
|
print STDERR "skipping $url (no digit in file name)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($fn !~ /[-_\.]/) {
|
||||||
|
print STDERR "skipping $url (no dash/dot/underscore in file name)\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
|
my $dstPath = "$tarballsCache/$fn";
|
||||||
|
|
||||||
|
next if -e $dstPath;
|
||||||
|
|
||||||
|
print "downloading $url to $dstPath...\n";
|
||||||
|
|
||||||
|
next if $ENV{DRY_RUN};
|
||||||
|
|
||||||
|
$ENV{QUIET} = 1;
|
||||||
|
$ENV{PRINT_PATH} = 1;
|
||||||
|
my $fh;
|
||||||
|
my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die;
|
||||||
|
waitpid($pid, 0) or die;
|
||||||
|
if ($? != 0) {
|
||||||
|
print STDERR "failed to fetch $url: $?\n";
|
||||||
|
last if $? >> 8 == 255;
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
<$fh>; my $storePath = <$fh>; chomp $storePath;
|
||||||
|
|
||||||
|
die unless -e $storePath;
|
||||||
|
|
||||||
|
cp($storePath, $dstPath) or die;
|
||||||
|
|
||||||
|
my $md5 = hashFile("md5", 0, $storePath) or die;
|
||||||
|
symlink("../$fn", "$tarballsCache/md5/$md5");
|
||||||
|
|
||||||
|
my $sha1 = hashFile("sha1", 0, $storePath) or die;
|
||||||
|
symlink("../$fn", "$tarballsCache/sha1/$sha1");
|
||||||
|
|
||||||
|
my $sha256 = hashFile("sha256", 0, $storePath) or die;
|
||||||
|
symlink("../$fn", "$tarballsCache/sha256/$sha256");
|
||||||
|
}
|
|
@ -1,27 +0,0 @@
|
||||||
#! /bin/sh -e
|
|
||||||
|
|
||||||
urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/eval-release.nix>' \
|
|
||||||
| grep -A2 'name="urls"' \
|
|
||||||
| grep '<string value=' \
|
|
||||||
| sed 's/.*"\(.*\)".*/\1/' \
|
|
||||||
| sort | uniq)
|
|
||||||
|
|
||||||
for url in $urls; do
|
|
||||||
if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
|
|
||||||
|
|
||||||
# Check the URL scheme.
|
|
||||||
if ! echo "$url" | grep -q -E "^[a-z]+://"; then echo "skipping $url (no URL scheme)"; continue; fi
|
|
||||||
|
|
||||||
# Check the basename. It should include something resembling a version.
|
|
||||||
base="$(basename "$url")"
|
|
||||||
#if ! echo "$base" | grep -q -E "[-_].*[0-9].*"; then echo "skipping $url (no version)"; continue; fi
|
|
||||||
if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi
|
|
||||||
if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi
|
|
||||||
if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi
|
|
||||||
if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi
|
|
||||||
if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi
|
|
||||||
|
|
||||||
$(dirname $0)/copy-tarball.sh "$url"
|
|
||||||
done
|
|
||||||
|
|
||||||
echo DONE
|
|
45
maintainers/scripts/find-tarballs.nix
Normal file
45
maintainers/scripts/find-tarballs.nix
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
# This expression returns a list of all fetchurl calls used by all
|
||||||
|
# packages reachable from release.nix.
|
||||||
|
|
||||||
|
with import ../.. { };
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
root = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ];
|
||||||
|
|
||||||
|
uniqueUrls = map (x: x.file) (genericClosure {
|
||||||
|
startSet = map (file: { key = file.url; inherit file; }) urls;
|
||||||
|
operator = const [ ];
|
||||||
|
});
|
||||||
|
|
||||||
|
urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;
|
||||||
|
|
||||||
|
fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv ? urls) dependencies;
|
||||||
|
|
||||||
|
dependencies = map (x: x.value) (genericClosure {
|
||||||
|
startSet = map keyDrv (derivationsIn' root);
|
||||||
|
operator = { key, value }: map keyDrv (immediateDependenciesOf value);
|
||||||
|
});
|
||||||
|
|
||||||
|
derivationsIn' = x:
|
||||||
|
if !canEval x then []
|
||||||
|
else if isDerivation x then optional (canEval x.drvPath) x
|
||||||
|
else if isList x then concatLists (map derivationsIn' x)
|
||||||
|
else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x)
|
||||||
|
else [ ];
|
||||||
|
|
||||||
|
keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { };
|
||||||
|
|
||||||
|
immediateDependenciesOf = drv:
|
||||||
|
concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv ["meta" "passthru"]));
|
||||||
|
|
||||||
|
derivationsIn = x:
|
||||||
|
if !canEval x then []
|
||||||
|
else if isDerivation x then optional (canEval x.drvPath) x
|
||||||
|
else if isList x then concatLists (map derivationsIn x)
|
||||||
|
else [ ];
|
||||||
|
|
||||||
|
canEval = val: (builtins.tryEval val).success;
|
||||||
|
|
||||||
|
in uniqueUrls
|
|
@ -1183,7 +1183,7 @@ driver from a set of X.org drivers (such as <literal>vesa</literal>
|
||||||
and <literal>intel</literal>). You can also specify a driver
|
and <literal>intel</literal>). You can also specify a driver
|
||||||
manually, e.g.
|
manually, e.g.
|
||||||
<programlisting>
|
<programlisting>
|
||||||
services.xserver.videoDrivers = [ "r128" ];
|
hardware.opengl.videoDrivers = [ "r128" ];
|
||||||
</programlisting>
|
</programlisting>
|
||||||
to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
|
to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
|
||||||
|
|
||||||
|
@ -1226,7 +1226,7 @@ $ systemctl start display-manager.service
|
||||||
has better 3D performance than the X.org drivers. It is not enabled
|
has better 3D performance than the X.org drivers. It is not enabled
|
||||||
by default because it’s not free software. You can enable it as follows:
|
by default because it’s not free software. You can enable it as follows:
|
||||||
<programlisting>
|
<programlisting>
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
hardware.opengl.videoDrivers = [ "nvidia" ];
|
||||||
</programlisting>
|
</programlisting>
|
||||||
You may need to reboot after enabling this driver to prevent a clash
|
You may need to reboot after enabling this driver to prevent a clash
|
||||||
with other kernel modules.</para>
|
with other kernel modules.</para>
|
||||||
|
|
|
@ -295,7 +295,7 @@ $ reboot</screen>
|
||||||
}</screen>
|
}</screen>
|
||||||
</example>
|
</example>
|
||||||
|
|
||||||
<section>
|
<section xml:id="sec-uefi-installation">
|
||||||
|
|
||||||
<title>UEFI Installation</title>
|
<title>UEFI Installation</title>
|
||||||
|
|
||||||
|
@ -305,14 +305,15 @@ changes:
|
||||||
|
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>You should boot the livecd in UEFI mode (consult your specific
|
<para>You should boot the live CD in UEFI mode (consult your
|
||||||
hardware's documentation for instructions how).</para>
|
specific hardware's documentation for instructions).</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Instead of <command>fdisk</command>, you should use <command>
|
<para>Instead of <command>fdisk</command>, you should use
|
||||||
gdisk</command> to partition your disks. You will need to have a
|
<command>gdisk</command> to partition your disks. You will need to
|
||||||
separate partition for <filename>/boot</filename> with partition code
|
have a separate partition for <filename>/boot</filename> with
|
||||||
EF00, and it should be formatted with a vfat filesystem.</para>
|
partition code EF00, and it should be formatted as a
|
||||||
|
<literal>vfat</literal> filesystem.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>You must set <option>boot.loader.gummiboot.enable</option> to
|
<para>You must set <option>boot.loader.gummiboot.enable</option> to
|
||||||
|
@ -327,8 +328,8 @@ changes:
|
||||||
as well.</para>
|
as well.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>To see console messages during early boot, put <literal>"fbcon"</literal>
|
<para>To see console messages during early boot, add <literal>"fbcon"</literal>
|
||||||
in your <option>boot.initrd.kernelModules</option></para>
|
to your <option>boot.initrd.kernelModules</option>.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -55,9 +55,12 @@
|
||||||
<!-- <xi:include href="userconfiguration.xml" /> -->
|
<!-- <xi:include href="userconfiguration.xml" /> -->
|
||||||
<xi:include href="troubleshooting.xml" />
|
<xi:include href="troubleshooting.xml" />
|
||||||
<xi:include href="development.xml" />
|
<xi:include href="development.xml" />
|
||||||
<chapter xml:id="ch-options">
|
|
||||||
|
<xi:include href="release-notes.xml" />
|
||||||
|
|
||||||
|
<appendix xml:id="ch-options">
|
||||||
<title>List of options</title>
|
<title>List of options</title>
|
||||||
<xi:include href="options-db.xml" />
|
<xi:include href="options-db.xml" />
|
||||||
</chapter>
|
</appendix>
|
||||||
|
|
||||||
</book>
|
</book>
|
||||||
|
|
53
nixos/doc/manual/release-notes.xml
Normal file
53
nixos/doc/manual/release-notes.xml
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
<appendix xmlns="http://docbook.org/ns/docbook"
|
||||||
|
xml:id="ch-release-notes">
|
||||||
|
|
||||||
|
<title>Release notes</title>
|
||||||
|
|
||||||
|
<!--==================================================================-->
|
||||||
|
|
||||||
|
<section xml:id="sec-release-14.02">
|
||||||
|
|
||||||
|
<title>Release 14.02 (“Baboon”, 2014/02/??)</title>
|
||||||
|
|
||||||
|
<para>This is the second stable release branch of NixOS. The main
|
||||||
|
enhancements are the following:
|
||||||
|
|
||||||
|
<itemizedlist>
|
||||||
|
|
||||||
|
<listitem><para>Installation on UEFI systems is now supported. See
|
||||||
|
<xref linkend="sec-uefi-installation"/> for
|
||||||
|
details.</para></listitem>
|
||||||
|
|
||||||
|
<listitem><para>NixOS is now based on Glibc 2.18 and GCC
|
||||||
|
4.8.</para></listitem>
|
||||||
|
|
||||||
|
</itemizedlist>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
<para>When upgrading from a previous release, please be aware of the
|
||||||
|
following incompatible changes:
|
||||||
|
|
||||||
|
<itemizedlist>
|
||||||
|
|
||||||
|
<listitem><para>The option
|
||||||
|
<option>boot.loader.grub.memtest86</option> has been renamed to
|
||||||
|
<option>boot.loader.grub.memtest86.enable</option>.</para></listitem>
|
||||||
|
|
||||||
|
</itemizedlist>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<!--==================================================================-->
|
||||||
|
|
||||||
|
<section xml:id="sec-release-13.10">
|
||||||
|
|
||||||
|
<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
|
||||||
|
|
||||||
|
<para>This is the first stable release branch of NixOS.</para>
|
||||||
|
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</appendix>
|
|
@ -138,8 +138,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
# Setting vesa, we don't get the nvidia driver, which can't work in arm.
|
# Setting vesa, we don't get the nvidia driver, which can't work in arm.
|
||||||
services.xserver.videoDriver = "vesa";
|
hardware.opengl.videoDrivers = [ "vesa" ];
|
||||||
services.xserver.videoDrivers = [];
|
|
||||||
services.nixosManual.enable = false;
|
services.nixosManual.enable = false;
|
||||||
|
|
||||||
# Include the firmware for various wireless cards.
|
# Include the firmware for various wireless cards.
|
||||||
|
|
|
@ -163,7 +163,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
|
||||||
pciCheck $path;
|
pciCheck $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
|
push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
|
||||||
|
|
||||||
|
|
||||||
# Idem for USB devices.
|
# Idem for USB devices.
|
||||||
|
|
|
@ -15,5 +15,5 @@ with pkgs.lib;
|
||||||
|
|
||||||
# Add some more video drivers to give X11 a shot at working in
|
# Add some more video drivers to give X11 a shot at working in
|
||||||
# VMware and QEMU.
|
# VMware and QEMU.
|
||||||
services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
|
hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,6 +112,8 @@
|
||||||
cgminer = 101;
|
cgminer = 101;
|
||||||
munin = 102;
|
munin = 102;
|
||||||
logcheck = 103;
|
logcheck = 103;
|
||||||
|
nix-ssh = 104;
|
||||||
|
dictd = 105;
|
||||||
|
|
||||||
# When adding a uid, make sure it doesn't match an existing gid.
|
# When adding a uid, make sure it doesn't match an existing gid.
|
||||||
|
|
||||||
|
@ -203,6 +205,7 @@
|
||||||
connman = 94;
|
connman = 94;
|
||||||
munin = 95;
|
munin = 95;
|
||||||
keys = 96;
|
keys = 96;
|
||||||
|
dictd = 105;
|
||||||
|
|
||||||
# When adding a gid, make sure it doesn't match an existing uid.
|
# When adding a gid, make sure it doesn't match an existing uid.
|
||||||
|
|
||||||
|
|
|
@ -125,6 +125,7 @@
|
||||||
./services/misc/gpsd.nix
|
./services/misc/gpsd.nix
|
||||||
./services/misc/nix-daemon.nix
|
./services/misc/nix-daemon.nix
|
||||||
./services/misc/nix-gc.nix
|
./services/misc/nix-gc.nix
|
||||||
|
./services/misc/nix-ssh-serve.nix
|
||||||
./services/misc/nixos-manual.nix
|
./services/misc/nixos-manual.nix
|
||||||
./services/misc/rogue.nix
|
./services/misc/rogue.nix
|
||||||
./services/misc/svnserve.nix
|
./services/misc/svnserve.nix
|
||||||
|
|
|
@ -28,34 +28,36 @@ in
|
||||||
echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
|
echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! test -L $HOME/.nix-profile; then
|
if test -w $HOME; then
|
||||||
if test "$USER" != root; then
|
if ! test -L $HOME/.nix-profile; then
|
||||||
ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
|
if test "$USER" != root; then
|
||||||
else
|
ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
|
||||||
# Root installs in the system-wide profile by default.
|
else
|
||||||
ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
|
# Root installs in the system-wide profile by default.
|
||||||
fi
|
ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Subscribe the root user to the NixOS channel by default.
|
# Subscribe the root user to the NixOS channel by default.
|
||||||
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
|
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
|
||||||
echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
|
echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create the per-user garbage collector roots directory.
|
# Create the per-user garbage collector roots directory.
|
||||||
NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
|
NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
|
||||||
mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
|
mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
|
||||||
if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
|
if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
|
||||||
echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
|
echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set up a default Nix expression from which to install stuff.
|
# Set up a default Nix expression from which to install stuff.
|
||||||
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
|
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
|
||||||
rm -f $HOME/.nix-defexpr
|
rm -f $HOME/.nix-defexpr
|
||||||
mkdir $HOME/.nix-defexpr
|
mkdir $HOME/.nix-defexpr
|
||||||
if [ "$USER" != root ]; then
|
if [ "$USER" != root ]; then
|
||||||
ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
|
ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -79,5 +79,10 @@ in {
|
||||||
preStart = "mkdir -p /var/spool";
|
preStart = "mkdir -p /var/spool";
|
||||||
serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
|
serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
|
||||||
|
'') ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,10 +43,12 @@ with pkgs.lib;
|
||||||
group = "dictd";
|
group = "dictd";
|
||||||
description = "DICT.org dictd server";
|
description = "DICT.org dictd server";
|
||||||
home = "${dictdb}/share/dictd";
|
home = "${dictdb}/share/dictd";
|
||||||
|
uid = config.ids.uids.dictd;
|
||||||
};
|
};
|
||||||
|
|
||||||
users.extraGroups = singleton
|
users.extraGroups = singleton
|
||||||
{ name = "dictd";
|
{ name = "dictd";
|
||||||
|
gid = config.ids.gids.dictd;
|
||||||
};
|
};
|
||||||
|
|
||||||
jobs.dictd =
|
jobs.dictd =
|
||||||
|
|
|
@ -286,8 +286,8 @@ in
|
||||||
systemd.services."nix-daemon" =
|
systemd.services."nix-daemon" =
|
||||||
{ description = "Nix Daemon";
|
{ description = "Nix Daemon";
|
||||||
|
|
||||||
path = [ nix pkgs.openssl pkgs.utillinux ]
|
path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]
|
||||||
++ optionals cfg.distributedBuilds [ pkgs.openssh pkgs.gzip ];
|
++ optionals cfg.distributedBuilds [ pkgs.gzip ];
|
||||||
|
|
||||||
environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; };
|
environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; };
|
||||||
|
|
||||||
|
|
45
nixos/modules/services/misc/nix-ssh-serve.nix
Normal file
45
nixos/modules/services/misc/nix-ssh-serve.nix
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
serveOnly = pkgs.writeScript "nix-store-serve" ''
|
||||||
|
#!${pkgs.stdenv.shell}
|
||||||
|
if [ "$SSH_ORIGINAL_COMMAND" != "nix-store --serve" ]; then
|
||||||
|
echo 'Error: You are only allowed to run `nix-store --serve'\'''!' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
exec /run/current-system/sw/bin/nix-store --serve
|
||||||
|
'';
|
||||||
|
|
||||||
|
inherit (lib) mkIf mkOption types;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
nix.sshServe = {
|
||||||
|
enable = mkOption {
|
||||||
|
description = "Whether to enable serving the nix store over ssh.";
|
||||||
|
default = false;
|
||||||
|
type = types.bool;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf config.nix.sshServe.enable {
|
||||||
|
users.extraUsers.nix-ssh = {
|
||||||
|
description = "User for running nix-store --serve.";
|
||||||
|
uid = config.ids.uids.nix-ssh;
|
||||||
|
shell = pkgs.stdenv.shell;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
services.openssh.extraConfig = ''
|
||||||
|
Match User nix-ssh
|
||||||
|
AllowAgentForwarding no
|
||||||
|
AllowTcpForwarding no
|
||||||
|
PermitTTY no
|
||||||
|
PermitTunnel no
|
||||||
|
X11Forwarding no
|
||||||
|
ForceCommand ${serveOnly}
|
||||||
|
Match All
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -128,6 +128,17 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPortRanges = mkOption {
|
||||||
|
default = [];
|
||||||
|
example = [ { from = 8999; to = 9003; } ];
|
||||||
|
type = types.listOf (types.attrsOf types.int);
|
||||||
|
description =
|
||||||
|
''
|
||||||
|
A range of TCP ports on which incoming connections are
|
||||||
|
accepted.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
networking.firewall.allowedUDPPorts = mkOption {
|
networking.firewall.allowedUDPPorts = mkOption {
|
||||||
default = [];
|
default = [];
|
||||||
example = [ 53 ];
|
example = [ 53 ];
|
||||||
|
@ -138,6 +149,16 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.firewall.allowedUDPPortRanges = mkOption {
|
||||||
|
default = [];
|
||||||
|
example = [ { from = 60000; to = 61000; } ];
|
||||||
|
type = types.listOf (types.attrsOf types.int);
|
||||||
|
description =
|
||||||
|
''
|
||||||
|
Range of open UDP ports.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
networking.firewall.allowPing = mkOption {
|
networking.firewall.allowPing = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -322,6 +343,15 @@ in
|
||||||
) cfg.allowedTCPPorts
|
) cfg.allowedTCPPorts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Accept connections to the allowed TCP port ranges.
|
||||||
|
${concatMapStrings (rangeAttr:
|
||||||
|
let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
|
||||||
|
''
|
||||||
|
ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept
|
||||||
|
''
|
||||||
|
) cfg.allowedTCPPortRanges
|
||||||
|
}
|
||||||
|
|
||||||
# Accept packets on the allowed UDP ports.
|
# Accept packets on the allowed UDP ports.
|
||||||
${concatMapStrings (port:
|
${concatMapStrings (port:
|
||||||
''
|
''
|
||||||
|
@ -330,6 +360,15 @@ in
|
||||||
) cfg.allowedUDPPorts
|
) cfg.allowedUDPPorts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Accept packets on the allowed UDP port ranges.
|
||||||
|
${concatMapStrings (rangeAttr:
|
||||||
|
let range = toString rangeAttr.from + ":" + toString rangeAttr.to; in
|
||||||
|
''
|
||||||
|
ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept
|
||||||
|
''
|
||||||
|
) cfg.allowedUDPPortRanges
|
||||||
|
}
|
||||||
|
|
||||||
# Accept IPv4 multicast. Not a big security risk since
|
# Accept IPv4 multicast. Not a big security risk since
|
||||||
# probably nobody is listening anyway.
|
# probably nobody is listening anyway.
|
||||||
#iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept
|
#iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept
|
||||||
|
|
|
@ -34,7 +34,7 @@ in {
|
||||||
export GTK_DATA_PREFIX=${config.system.path}
|
export GTK_DATA_PREFIX=${config.system.path}
|
||||||
|
|
||||||
# find theme engines
|
# find theme engines
|
||||||
export GTK_PATH=${config.system.path}/lib/gtk-3.0:{config.system.path}/lib/gtk-2.0
|
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
|
||||||
|
|
||||||
export XDG_MENU_PREFIX=gnome
|
export XDG_MENU_PREFIX=gnome
|
||||||
|
|
||||||
|
@ -43,9 +43,17 @@ in {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules";
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
[ gnome3.evince
|
[ gnome3.evince
|
||||||
gnome3.eog
|
gnome3.eog
|
||||||
|
gnome3.dconf
|
||||||
|
gnome3.vino
|
||||||
|
gnome3.epiphany
|
||||||
|
gnome3.baobab
|
||||||
|
gnome3.gucharmap
|
||||||
|
gnome3.nautilus
|
||||||
|
gnome3.yelp
|
||||||
pkgs.ibus
|
pkgs.ibus
|
||||||
gnome3.gnome_shell
|
gnome3.gnome_shell
|
||||||
gnome3.gnome_settings_daemon
|
gnome3.gnome_settings_daemon
|
||||||
|
@ -56,4 +64,5 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ in
|
||||||
config = {
|
config = {
|
||||||
|
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.videoDrivers = [];
|
hardware.opengl.videoDrivers = [];
|
||||||
|
|
||||||
# Enable KDM. Any display manager will do as long as it supports XDMCP.
|
# Enable KDM. Any display manager will do as long as it supports XDMCP.
|
||||||
services.xserver.displayManager.kdm.enable = true;
|
services.xserver.displayManager.kdm.enable = true;
|
||||||
|
|
|
@ -7,7 +7,6 @@ with pkgs.lib;
|
||||||
let
|
let
|
||||||
memtest86 = pkgs.memtest86plus;
|
memtest86 = pkgs.memtest86plus;
|
||||||
cfg = config.boot.loader.grub.memtest86;
|
cfg = config.boot.loader.grub.memtest86;
|
||||||
params = concatStringsSep " " cfg.params;
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -82,7 +81,7 @@ in
|
||||||
if config.boot.loader.grub.version == 2 then
|
if config.boot.loader.grub.version == 2 then
|
||||||
''
|
''
|
||||||
menuentry "Memtest86+" {
|
menuentry "Memtest86+" {
|
||||||
linux16 @bootRoot@/memtest.bin ${params}
|
linux16 @bootRoot@/memtest.bin ${toString cfg.params}
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
else
|
else
|
||||||
|
|
|
@ -386,7 +386,6 @@ in
|
||||||
|
|
||||||
# When building a regular system configuration, override whatever
|
# When building a regular system configuration, override whatever
|
||||||
# video driver the host uses.
|
# video driver the host uses.
|
||||||
services.xserver.videoDriver = mkVMOverride null;
|
|
||||||
hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ];
|
hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ];
|
||||||
services.xserver.defaultDepth = mkVMOverride 0;
|
services.xserver.defaultDepth = mkVMOverride 0;
|
||||||
services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
|
services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
|
||||||
|
|
|
@ -6,17 +6,16 @@
|
||||||
, perl, pkgconfig, python, serd, sord, sratom, suil }:
|
, perl, pkgconfig, python, serd, sord, sratom, suil }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# Ardour 3.0 tag
|
tag = "3.5.357";
|
||||||
rev = "79db9422";
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "ardour-3.0";
|
name = "ardour-${tag}";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = git://git.ardour.org/ardour/ardour.git;
|
url = git://git.ardour.org/ardour/ardour.git;
|
||||||
inherit rev;
|
rev = "refs/tags/${tag}";
|
||||||
sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096";
|
sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -28,13 +27,16 @@ stdenv.mkDerivation {
|
||||||
];
|
];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc
|
# The funny revision number is from `git describe rev`
|
||||||
|
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc
|
||||||
|
# Note the different version number
|
||||||
|
sed -i '33i rev = \"3.5-357-gce4d125\"' wscript
|
||||||
|
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
|
||||||
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
|
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
|
||||||
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
|
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
|
||||||
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configurePhase = "python waf configure --prefix=$out";
|
configurePhase = "python waf configure --optimize --prefix=$out";
|
||||||
|
|
||||||
buildPhase = "python waf";
|
buildPhase = "python waf";
|
||||||
|
|
||||||
|
@ -43,7 +45,7 @@ stdenv.mkDerivation {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
python waf install
|
python waf install
|
||||||
mkdir -pv $out/gtk2/engines
|
mkdir -pv $out/gtk2/engines
|
||||||
mv $out/lib/ardour3/libclearlooks.so $out/gtk2/engines/
|
cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
|
||||||
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
|
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||||
Also read "The importance of Paying Something" on their homepage, please!
|
Also read "The importance of Paying Something" on their homepage, please!
|
||||||
'';
|
'';
|
||||||
homepage = http://ardour.org/;
|
homepage = http://ardour.org/;
|
||||||
|
branch = "2";
|
||||||
license = "GPLv2";
|
license = "GPLv2";
|
||||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
|
|
@ -1,19 +1,20 @@
|
||||||
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
|
{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
|
||||||
, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
|
, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2
|
||||||
|
, pkgconfig, python }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "guitarix-${version}";
|
name = "guitarix-${version}";
|
||||||
version = "0.25.2";
|
version = "0.28.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
|
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
|
||||||
sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
|
sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [
|
||||||
[ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
|
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio
|
||||||
gtkmm fftw librdf ladspaH boost
|
ladspaH librdf libsndfile lv2 pkgconfig python
|
||||||
];
|
];
|
||||||
|
|
||||||
configurePhase = "python waf configure --prefix=$out";
|
configurePhase = "python waf configure --prefix=$out";
|
||||||
|
|
||||||
|
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
installPhase = "python waf install";
|
installPhase = "python waf install";
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "A virtual guitar amplifier for Linux running with JACK";
|
description = "A virtual guitar amplifier for Linux running with JACK";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
guitarix is a virtual guitar amplifier for Linux running with
|
guitarix is a virtual guitar amplifier for Linux running with
|
||||||
|
@ -46,8 +47,8 @@ stdenv.mkDerivation rec {
|
||||||
crazy sounds never heard before.
|
crazy sounds never heard before.
|
||||||
'';
|
'';
|
||||||
homepage = http://guitarix.sourceforge.net/;
|
homepage = http://guitarix.sourceforge.net/;
|
||||||
license = stdenv.lib.licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = [ stdenv.lib.maintainers.astsmtl ];
|
maintainers = with maintainers; [ astsmtl goibhniu ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,8 +19,6 @@ pythonPackages.buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = pythonPath;
|
propagatedBuildInputs = pythonPath;
|
||||||
|
|
||||||
installCommand = "python setup.py install --prefix=$out";
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/aszlig/LastWatch";
|
homepage = "https://github.com/aszlig/LastWatch";
|
||||||
description = "An inotify-based last.fm audio scrobbler";
|
description = "An inotify-based last.fm audio scrobbler";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject
|
{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool
|
||||||
, pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null
|
, pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null
|
||||||
, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
|
, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
|
||||||
|
|
||||||
|
@ -29,6 +29,11 @@ buildPythonPackage {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
# TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
|
||||||
|
sed -i /distclass/d setup.py
|
||||||
|
'';
|
||||||
|
|
||||||
sourceRoot = "quodlibet-${version}";
|
sourceRoot = "quodlibet-${version}";
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
# the patch searches for plugins in directory ../plugins
|
# the patch searches for plugins in directory ../plugins
|
||||||
|
@ -42,7 +47,7 @@ buildPythonPackage {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
mutagen pygtk pygobject pythonDBus gst_python
|
mutagen pygtk pygobject pythonDBus gst_python intltool
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = stdenv.lib.optionalString withGstPlugins ''
|
postInstall = stdenv.lib.optionalString withGstPlugins ''
|
||||||
|
|
|
@ -2,27 +2,25 @@
|
||||||
|
|
||||||
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
|
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
|
||||||
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
|
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
|
||||||
, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland
|
, libsndfile, pkgconfig, pulseaudio, qt5, redland
|
||||||
, rubberband, vampSDK
|
, rubberband, serd, sord, vampSDK
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "sonic-visualiser-${version}";
|
name = "sonic-visualiser-${version}";
|
||||||
version = "1.9";
|
version = "2.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz";
|
|
||||||
sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq";
|
url = "http://code.soundsoftware.ac.uk/attachments/download/918/${name}.tar.gz";
|
||||||
|
sha256 = "1f06w2rin4r2mbi00bg3nmqdi2xdy9vq4jcmfanxzj3ld66ik40c";
|
||||||
};
|
};
|
||||||
patches = [(fetchurl {
|
|
||||||
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch;
|
|
||||||
sha256 = "0dhh111crvjvhcjqp7j9jqnvs8zmd6xrcirmzqrrnca1h0vbpkay";
|
|
||||||
name = "gcc47.patch";
|
|
||||||
})];
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
|
[ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
|
||||||
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
|
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
|
||||||
|
serd
|
||||||
|
sord
|
||||||
pkgconfig
|
pkgconfig
|
||||||
# optional
|
# optional
|
||||||
jackaudio
|
jackaudio
|
||||||
|
@ -33,11 +31,10 @@ stdenv.mkDerivation rec {
|
||||||
# fishsound
|
# fishsound
|
||||||
liblo
|
liblo
|
||||||
libX11
|
libX11
|
||||||
makeWrapper
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
for i in sonic-visualiser svapp svcore svgui;
|
for i in sonic-visualiser svapp svcore svgui;
|
||||||
do cd $i && qmake -makefile PREFIX=$out && cd ..;
|
do cd $i && qmake -makefile PREFIX=$out && cd ..;
|
||||||
done
|
done
|
||||||
make
|
make
|
||||||
|
@ -45,19 +42,15 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/{bin,share/sonic-visualiser}
|
mkdir -p $out/{bin,share/sonic-visualiser}
|
||||||
cp sonic-visualiser/sonic-visualiser $out/bin
|
cp sonic-visualiser $out/bin/
|
||||||
cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
|
cp -r samples $out/share/sonic-visualiser/
|
||||||
wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "View and analyse contents of music audio files";
|
description = "View and analyse contents of music audio files";
|
||||||
homepage = http://www.sonicvisualiser.org/;
|
homepage = http://www.sonicvisualiser.org/;
|
||||||
license = "GPLv2";
|
license = licenses.gpl2Plus;
|
||||||
maintainers =
|
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||||
[ stdenv.lib.maintainers.marcweber
|
platforms = platforms.linux;
|
||||||
stdenv.lib.maintainers.goibhniu
|
|
||||||
];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,10 +9,6 @@ buildPythonPackage rec {
|
||||||
sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
|
sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
|
||||||
};
|
};
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mv $out/lib/${python.libPrefix}/site-packages/*.egg/share $out
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
buildInputs = [ stdenv libX11 gettext ];
|
buildInputs = [ stdenv libX11 gettext ];
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "oiio-${version}";
|
name = "oiio-${version}";
|
||||||
version = "1.1.12";
|
version = "1.3.12";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
||||||
sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
|
sha256 = "114jx4pcqhzdchzpxbwrfzqmnxr2bm8cw13g4akz1hg8pvr1dhsb";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
|
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "viewnior-1.3";
|
name = "viewnior-1.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz";
|
url = "https://www.dropbox.com/s/zytq0suabesv933/${name}.tar.gz";
|
||||||
sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10";
|
sha256 = "0vv1133phgfzm92md6bbccmcvfiqb4kz28z1572c0qj971yz457a";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
||||||
shared_mime_info glib gdk_pixbuf perl
|
shared_mime_info glib gdk_pixbuf perl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
rm $out/share/icons/*/icon-theme.cache
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Viewnior is a fast and simple image viewer for GNU/Linux";
|
description = "Viewnior is a fast and simple image viewer for GNU/Linux";
|
||||||
longDescription =
|
longDescription =
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "blender-2.67";
|
name = "blender-2.69";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||||
sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l";
|
sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -35,11 +35,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "3D Creation/Animation/Publishing System";
|
description = "3D Creation/Animation/Publishing System";
|
||||||
homepage = http://www.blender.org;
|
homepage = http://www.blender.org;
|
||||||
# They comment two licenses: GPLv2 and Blender License, but they
|
# They comment two licenses: GPLv2 and Blender License, but they
|
||||||
# say: "We've decided to cancel the BL offering for an indefinite period."
|
# say: "We've decided to cancel the BL offering for an indefinite period."
|
||||||
license = "GPLv2+";
|
license = licenses.gpl2Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.goibhniu ];
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
|
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "girara-0.1.9";
|
name = "girara-0.2.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
|
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
|
||||||
sha256 = "1kd20dalnpy07hajv0rkmkbsym4bpfxh0gby7j2mvkvl5qr3vx70";
|
sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig gtk gettext ];
|
buildInputs = [ pkgconfig gtk gettext ];
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "gnome-terminator-0.96";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz";
|
|
||||||
sha256 = "d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ python pygtk vte gettext intltool makeWrapper
|
|
||||||
];
|
|
||||||
|
|
||||||
phases = "unpackPhase installPhase";
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
python setup.py --without-icon-cache install --prefix=$out
|
|
||||||
for i in $(cd $out/bin && ls); do
|
|
||||||
wrapProgram $out/bin/$i \
|
|
||||||
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Gnome terminal emulator with support for tiling and tabs";
|
|
||||||
homepage = http://www.tenshu.net/p/terminator.html;
|
|
||||||
license = "GPLv2";
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,14 +1,14 @@
|
||||||
{ stdenv, fetchurl, kdelibs, gettext }:
|
{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "wacomtablet-1.3.5";
|
name = "wacomtablet-2.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";
|
url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2";
|
||||||
sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
|
sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ kdelibs ];
|
buildInputs = [ kdelibs xf86_input_wacom ];
|
||||||
|
|
||||||
nativeBuildInputs = [ gettext ];
|
nativeBuildInputs = [ gettext ];
|
||||||
|
|
||||||
|
|
17
pkgs/applications/misc/lxappearance/default.nix
Normal file
17
pkgs/applications/misc/lxappearance/default.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "lxappearance-0.5.5";
|
||||||
|
src = fetchurl{
|
||||||
|
url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz";
|
||||||
|
sha256 = "8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c";
|
||||||
|
};
|
||||||
|
buildInputs = [ intltool libX11 pkgconfig gtk ];
|
||||||
|
meta = {
|
||||||
|
description = "A lightweight program for configuring the theme and fonts of gtk applications";
|
||||||
|
maintainers = [ stdenv.lib.maintainers.hinton ];
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
license = stdenv.lib.licenses.gpl2;
|
||||||
|
homepage = "http://lxappearance.sourceforce.net/";
|
||||||
|
};
|
||||||
|
}
|
16
pkgs/applications/misc/nc-indicators/default.nix
Normal file
16
pkgs/applications/misc/nc-indicators/default.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "nc-indicators";
|
||||||
|
version = "0.1";
|
||||||
|
sha256 = "19amwfcbwfxcj0gr7w0vgxl427l43q3l2s3n3zsxhqwkfblxmfy5";
|
||||||
|
isLibrary = false;
|
||||||
|
isExecutable = true;
|
||||||
|
buildDepends = [ attoparsec gtk hflags lens pipes stm ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/nilcons/nc-indicators/issues";
|
||||||
|
description = "CPU load and memory usage indicators for i3bar";
|
||||||
|
license = self.stdenv.lib.licenses.asl20;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
};
|
||||||
|
})
|
40
pkgs/applications/misc/terminator/default.nix
Normal file
40
pkgs/applications/misc/terminator/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool
|
||||||
|
, makeWrapper
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "terminator-${version}";
|
||||||
|
version = "0.97";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
|
||||||
|
sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
python pygtk notify keybinder vte gettext intltool makeWrapper
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
python setup.py --without-icon-cache install --prefix="$out"
|
||||||
|
|
||||||
|
for file in "$out"/bin/*; do
|
||||||
|
wrapProgram "$file" \
|
||||||
|
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Terminal emulator with support for tiling and tabs";
|
||||||
|
longDescription = ''
|
||||||
|
The goal of this project is to produce a useful tool for arranging
|
||||||
|
terminals. It is inspired by programs such as gnome-multi-term,
|
||||||
|
quadkonsole, etc. in that the main focus is arranging terminals in grids
|
||||||
|
(tabs is the most common default method, which Terminator also supports).
|
||||||
|
'';
|
||||||
|
homepage = http://gnometerminator.blogspot.no/p/introduction.html;
|
||||||
|
license = licenses.gpl2;
|
||||||
|
maintainers = [ maintainers.bjornfor ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
29
pkgs/applications/misc/twmn/default.nix
Normal file
29
pkgs/applications/misc/twmn/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ fetchurl, stdenv, fetchgit, qt4, pkgconfig, boost, dbus }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
rev = "9f52882688ba03d7aaab2e3fd83cb05cfbf1a374";
|
||||||
|
name = "twmn-${rev}";
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
inherit rev;
|
||||||
|
url = "https://github.com/sboli/twmn.git";
|
||||||
|
sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ qt4 pkgconfig boost ];
|
||||||
|
propagatedBuildInputs = [ dbus ];
|
||||||
|
|
||||||
|
configurePhase = "qmake";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p "$out/bin"
|
||||||
|
cp bin/* "$out/bin"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A notification system for tiling window managers";
|
||||||
|
homepage = "https://github.com/sboli/twmn";
|
||||||
|
platforms = with stdenv.lib.platforms; linux;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,12 +1,12 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
|
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.2.6";
|
version = "0.2.7";
|
||||||
name = "zathura-core-${version}";
|
name = "zathura-core-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
|
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
|
||||||
sha1 = "d84878388969d523027a1661f49fd29638bd460b";
|
sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
|
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
|
||||||
|
@ -21,7 +21,12 @@ stdenv.mkDerivation rec {
|
||||||
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
|
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin"
|
wrapProgram "$out/bin/zathura" \
|
||||||
|
--prefix PATH ":" "${file}/bin" \
|
||||||
|
--prefix XDG_CONFIG_DIRS ":" "$out/etc"
|
||||||
|
|
||||||
|
mkdir -pv $out/etc
|
||||||
|
echo "set window-icon ${zathura_icon}" > $out/etc/zathurarc
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -3,8 +3,11 @@
|
||||||
rec {
|
rec {
|
||||||
inherit (pkgs) stdenv;
|
inherit (pkgs) stdenv;
|
||||||
|
|
||||||
|
icon = ./icon.xpm;
|
||||||
|
|
||||||
zathura_core = callPackage ./core {
|
zathura_core = callPackage ./core {
|
||||||
gtk = pkgs.gtk3;
|
gtk = pkgs.gtk3;
|
||||||
|
zathura_icon = icon;
|
||||||
};
|
};
|
||||||
|
|
||||||
zathura_pdf_poppler = callPackage ./pdf-poppler { };
|
zathura_pdf_poppler = callPackage ./pdf-poppler { };
|
||||||
|
@ -19,7 +22,7 @@ rec {
|
||||||
|
|
||||||
zathuraWrapper = stdenv.mkDerivation {
|
zathuraWrapper = stdenv.mkDerivation {
|
||||||
|
|
||||||
inherit zathura_core;
|
inherit zathura_core icon;
|
||||||
|
|
||||||
name = "zathura-${zathura_core.version}";
|
name = "zathura-${zathura_core.version}";
|
||||||
|
|
||||||
|
@ -29,8 +32,6 @@ rec {
|
||||||
zathura_ps
|
zathura_ps
|
||||||
];
|
];
|
||||||
|
|
||||||
icon = ./icon.xpm;
|
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
|
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.2.4";
|
version = "0.2.5";
|
||||||
name = "zathura-pdf-poppler-${version}";
|
name = "zathura-pdf-poppler-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
|
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
|
||||||
sha256 = "1x1n21naixb87g1knznjfjfibazzwbn1cv7d42kxgwlnf1p1wbzm";
|
sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
|
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
# This file is autogenerated from update.sh in the same directory.
|
# This file is autogenerated from update.sh in the same directory.
|
||||||
{
|
{
|
||||||
dev = {
|
dev = {
|
||||||
version = "34.0.1809.0";
|
version = "34.0.1847.3";
|
||||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
|
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz";
|
||||||
sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
|
sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg";
|
||||||
};
|
};
|
||||||
beta = {
|
beta = {
|
||||||
version = "33.0.1750.46";
|
version = "33.0.1750.117";
|
||||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
|
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz";
|
||||||
sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
|
sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f";
|
||||||
};
|
};
|
||||||
stable = {
|
stable = {
|
||||||
version = "32.0.1700.107";
|
version = "33.0.1750.117";
|
||||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.107.tar.xz";
|
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.117.tar.xz";
|
||||||
sha256 = "1bf1gbjf4r9nf3xdn7zgq0ny1ihak21ka4rkkiadxsg8aq9vdsqz";
|
sha256 = "0nyaqrxz8kcnppcya68qpr47fw4d959p4l63kqzvd9ifdqfgk18f";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
firefoxVersion = "27.0";
|
firefoxVersion = "27.0.1";
|
||||||
|
|
||||||
xulVersion = "27.0"; # this attribute is used by other packages
|
xulVersion = "27.0.1"; # this attribute is used by other packages
|
||||||
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
@ -29,7 +29,7 @@ rec {
|
||||||
# Fall back to this url for versions not available at releases.mozilla.org.
|
# Fall back to this url for versions not available at releases.mozilla.org.
|
||||||
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
|
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
|
||||||
];
|
];
|
||||||
sha1 = "ec2031385237e30be829817ac79caa8e80cc2a14";
|
sha256 = "13qd53yf8dn9m03p4x5ml9h3mys60nba5nz82lcvaq7ycp1pl1bn";
|
||||||
};
|
};
|
||||||
|
|
||||||
commonConfigureFlags =
|
commonConfigureFlags =
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# -> http://get.adobe.com/flashplayer/
|
# -> http://get.adobe.com/flashplayer/
|
||||||
version = "11.2.202.336";
|
version = "11.2.202.341";
|
||||||
|
|
||||||
src =
|
src =
|
||||||
if stdenv.system == "x86_64-linux" then
|
if stdenv.system == "x86_64-linux" then
|
||||||
|
@ -47,7 +47,7 @@ let
|
||||||
else rec {
|
else rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
|
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
|
||||||
sha256 = "1wri6y5vllgs452dfklv23k7bp5daajnaqblkn5cb2gl28l5xcni";
|
sha256 = "0d1ic70awdig0v699svmq8mmnil8xmmwsap30sgi0r94saxmq49j";
|
||||||
}
|
}
|
||||||
else if stdenv.system == "i686-linux" then
|
else if stdenv.system == "i686-linux" then
|
||||||
if debug then {
|
if debug then {
|
||||||
|
@ -58,7 +58,7 @@ let
|
||||||
} else rec {
|
} else rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
|
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
|
||||||
sha256 = "0mjxjbj75r74gqpmqzqa6vlrk2wv7r358wcqbmg132bhv8kaph85";
|
sha256 = "0bfz1id4035jnkwy4xm0dj8l9lygrrzqdbf8dgc9pcy8c63d1hac";
|
||||||
}
|
}
|
||||||
else throw "Flash Player is not supported on this platform";
|
else throw "Flash Player is not supported on this platform";
|
||||||
|
|
||||||
|
|
|
@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
|
||||||
name = "google-talk-plugin-${version}";
|
name = "google-talk-plugin-${version}";
|
||||||
# Use the following to determine the current upstream 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'
|
# curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
|
||||||
version = "4.2.1.0";
|
version = "5.1.4.0";
|
||||||
|
|
||||||
src =
|
src =
|
||||||
if stdenv.system == "x86_64-linux" then
|
if stdenv.system == "x86_64-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
|
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
|
||||||
sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd";
|
sha256 = "19x1ss6kx7w8833f40pg1mwqr6sygz4ij4a7r7h3flmk67zywj4c";
|
||||||
}
|
}
|
||||||
else if stdenv.system == "i686-linux" then
|
else if stdenv.system == "i686-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
|
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
|
||||||
sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r";
|
sha256 = "1jxcridpqx46sdy4bw381rvffn1z93s280vhihwbgmiwjq5h4g41";
|
||||||
}
|
}
|
||||||
else throw "Google Talk does not support your platform.";
|
else throw "Google Talk does not support your platform.";
|
||||||
|
|
||||||
|
|
25
pkgs/applications/networking/davmail/default.nix
Normal file
25
pkgs/applications/networking/davmail/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "davmail-4.4.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://downloads.sourceforge.net/project/davmail/davmail/4.4.1/davmail-linux-x86_64-4.4.1-2225.tgz";
|
||||||
|
sha256 = "66c7ae23c0242860cca1576e5fc29343431789a821f7623e420b91ba91e480a9";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
|
||||||
|
maintainers = [ stdenv.lib.maintainers.hinton ];
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
homepage = "http://davmail.sourceforce.net/";
|
||||||
|
license = stdenv.lib.licenses.gpl2;
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ./* $out/bin/ -R
|
||||||
|
wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
|
||||||
|
'';
|
||||||
|
}
|
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = "--enable-call";
|
configureFlags = "--enable-call";
|
||||||
|
|
||||||
|
installFlags = "gsettingsschemadir=\${out}/share/telepathy/logger/glib-2.0/schemas/";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Logger service for Telepathy framework";
|
description = "Logger service for Telepathy framework";
|
||||||
homepage = http://telepathy.freedesktop.org/wiki/Logger ;
|
homepage = http://telepathy.freedesktop.org/wiki/Logger ;
|
||||||
|
|
|
@ -2,17 +2,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
pname = "rdesktop";
|
pname = "rdesktop";
|
||||||
version = "1.7.1";
|
version = "1.8.1";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
||||||
sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
|
sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [openssl libX11];
|
buildInputs = [openssl libX11];
|
||||||
|
|
||||||
configureFlags = [ "--with-openssl=${openssl}" ];
|
configureFlags = [
|
||||||
|
"--with-openssl=${openssl}"
|
||||||
|
"--disable-credssp"
|
||||||
|
"--disable-smartcard"
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "rdesktop is an open source client for Windows Terminal Services";
|
description = "rdesktop is an open source client for Windows Terminal Services";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
|
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
|
||||||
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
|
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
|
||||||
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
|
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
|
||||||
, libgsf, libart_lgpl, perlPackages
|
, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
|
||||||
}:
|
}:
|
||||||
|
|
||||||
/* If you experience GConf errors when running GnuCash on NixOS, see
|
/* If you experience GConf errors when running GnuCash on NixOS, see
|
||||||
|
@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
|
||||||
pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
|
pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
|
||||||
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
|
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
|
||||||
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
|
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
|
||||||
perlPackages.DateManip perlPackages.FinanceQuote
|
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx";
|
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# Auto-updaters don't make sense in Nix.
|
# Auto-updaters don't make sense in Nix.
|
||||||
|
|
|
@ -65,7 +65,7 @@ stdenv.mkDerivation {
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install'';
|
installPhase = ''make MKDIR_P="mkdir -p" install'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "git-annex";
|
pname = "git-annex";
|
||||||
version = "5.20140210";
|
version = "5.20140221";
|
||||||
sha256 = "0l5fny743v27yv7spppms64qca0mizh776b6wv8wca0wmcbc6j88";
|
sha256 = "0z6awqbk6kagssx26ddixbrl381c1kmsmlgaqmx087g4rwp43wqb";
|
||||||
isLibrary = false;
|
isLibrary = false;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
|
|
|
@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
version = "1.8.5";
|
version = "1.8.8";
|
||||||
|
|
||||||
name = "subversion-${version}";
|
name = "subversion-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/subversion/${name}.tar.bz2";
|
url = "mirror://apache/subversion/${name}.tar.bz2";
|
||||||
sha256 = "0r3mxrrlr1l9s2nh829bf0qmrfaafkq3di6ndr10j76sxkqjnlpx";
|
sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ zlib apr aprutil sqlite ]
|
buildInputs = [ zlib apr aprutil sqlite ]
|
||||||
|
|
|
@ -40,10 +40,6 @@ buildPythonPackage rec {
|
||||||
plat/resources.py
|
plat/resources.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installCommand = ''
|
|
||||||
python setup.py install --prefix= --root="$out"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Disabled for now, because it requires networking and even if we skip those
|
# Disabled for now, because it requires networking and even if we skip those
|
||||||
# tests, the whole test run takes around 10-20 minutes.
|
# tests, the whole test run takes around 10-20 minutes.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -51,6 +47,12 @@ buildPythonPackage rec {
|
||||||
HOME="$TEMPDIR" LANG=en_US.UTF-8 python miro.real --unittest
|
HOME="$TEMPDIR" LANG=en_US.UTF-8 python miro.real --unittest
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
preInstall = ''
|
||||||
|
# see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
|
||||||
|
${python}/bin/${python.executable} setup.py install_data --root=$out
|
||||||
|
sed -i '/data_files=data_files/d' setup.py
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mv "$out/bin/miro.real" "$out/bin/miro"
|
mv "$out/bin/miro.real" "$out/bin/miro"
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vlc-${version}";
|
name = "vlc-${version}";
|
||||||
version = "2.1.2";
|
version = "2.1.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
|
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
|
||||||
sha256 = "1i4fzjv2x8mzx0bg52mgh1rrlircmb81jr58z90blbmww4mq36r1";
|
sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "Cross-platform media player and streaming server";
|
description = "Cross-platform media player and streaming server";
|
||||||
homepage = http://www.videolan.org/vlc/;
|
homepage = http://www.videolan.org/vlc/;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
license = licenses.lgpl21Plus;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
version = "4.2.18"; # changes ./guest-additions as well
|
version = "4.2.22"; # changes ./guest-additions as well
|
||||||
|
|
||||||
forEachModule = action: ''
|
forEachModule = action: ''
|
||||||
for mod in \
|
for mod in \
|
||||||
|
@ -31,13 +31,13 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
||||||
extpackRevision = "88780";
|
extpackRevision = "91556";
|
||||||
extensionPack = requireFile rec {
|
extensionPack = requireFile rec {
|
||||||
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
|
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
|
||||||
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
|
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
|
||||||
# VBoxExtPackHelperApp!
|
# VBoxExtPackHelperApp!
|
||||||
# Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS
|
# Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS
|
||||||
sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba";
|
sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a";
|
||||||
message = ''
|
message = ''
|
||||||
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
|
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:
|
and Evaluation License (PUEL) by downloading the related binaries from:
|
||||||
|
@ -56,7 +56,7 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||||
sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74";
|
sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||||
sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
|
sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76";
|
||||||
};
|
};
|
||||||
|
|
||||||
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
|
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
|
||||||
|
|
|
@ -23,6 +23,8 @@
|
||||||
server admins start using the new version?
|
server admins start using the new version?
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
assert md5 != "" || sha256 != "";
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "git-export";
|
name = "git-export";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
|
@ -66,6 +66,7 @@ in
|
||||||
showURLs ? false
|
showURLs ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
assert builtins.isList urls;
|
||||||
assert urls != [] -> url == "";
|
assert urls != [] -> url == "";
|
||||||
assert url != "" -> urls == [];
|
assert url != "" -> urls == [];
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "man-pages-3.54";
|
name = "man-pages-3.60";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
|
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
|
||||||
sha256 = "0rb75dl9hh4v2s95bcssy12j8qrbd2dmlzry68gphyxk5c7yipbl";
|
sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild =
|
preBuild =
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "xkeyboard-config-2.7";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
|
|
||||||
sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ gettext ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ];
|
|
||||||
|
|
||||||
patches = [ ./eo.patch ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps"
|
|
||||||
sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -1,71 +0,0 @@
|
||||||
diff --git a/rules/base.xml.in b/rules/base.xml.in
|
|
||||||
index ec321f8..e9c3546 100644
|
|
||||||
--- a/rules/base.xml.in
|
|
||||||
+++ b/rules/base.xml.in
|
|
||||||
@@ -1786,6 +1786,13 @@
|
|
||||||
</layout>
|
|
||||||
<layout>
|
|
||||||
<configItem>
|
|
||||||
+ <name>eo</name>
|
|
||||||
+ <_shortDescription>Esp</_shortDescription>
|
|
||||||
+ <_description>Esperanto</_description>
|
|
||||||
+ </configItem>
|
|
||||||
+ </layout>
|
|
||||||
+ <layout>
|
|
||||||
+ <configItem>
|
|
||||||
<name>ir</name>
|
|
||||||
<_shortDescription>Irn</_shortDescription>
|
|
||||||
<_description>Iran</_description>
|
|
||||||
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
|
|
||||||
index 97c816d..d7e3a4e 100644
|
|
||||||
--- a/symbols/Makefile.am
|
|
||||||
+++ b/symbols/Makefile.am
|
|
||||||
@@ -10,7 +10,7 @@ bt by braille \
|
|
||||||
ca cd \
|
|
||||||
ch cn cz \
|
|
||||||
de dk \
|
|
||||||
-ee es et epo \
|
|
||||||
+ee eo es et epo \
|
|
||||||
fi fo fr \
|
|
||||||
gb ge gh gn \
|
|
||||||
gr hr hu \
|
|
||||||
diff --git a/symbols/Makefile.in b/symbols/Makefile.in
|
|
||||||
index b5be077..5cddcc7 100644
|
|
||||||
--- a/symbols/Makefile.in
|
|
||||||
+++ b/symbols/Makefile.in
|
|
||||||
@@ -222,7 +222,7 @@ bt by braille \
|
|
||||||
ca cd \
|
|
||||||
ch cn cz \
|
|
||||||
de dk \
|
|
||||||
-ee es et epo \
|
|
||||||
+ee eo es et epo \
|
|
||||||
fi fo fr \
|
|
||||||
gb ge gh gn \
|
|
||||||
gr hr hu \
|
|
||||||
diff --git a/symbols/eo b/symbols/eo
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..d6358c9
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/symbols/eo
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+// $XFree86$
|
|
||||||
+
|
|
||||||
+partial alphanumeric_keys
|
|
||||||
+xkb_symbols "basic" {
|
|
||||||
+
|
|
||||||
+ // Describes the differences between a very simple en_US
|
|
||||||
+ // keyboard and a simple Esperanto keyboard
|
|
||||||
+ // Press AltGr or Windows Menu key together with C, H, J, S, U
|
|
||||||
+ // to get accented letters.
|
|
||||||
+ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
|
|
||||||
+
|
|
||||||
+ key.type = "FOUR_LEVEL";
|
|
||||||
+
|
|
||||||
+ key <AD02> { [w,W, ubreve,Ubreve ] };
|
|
||||||
+ key <AD07> { [u,U, ubreve, Ubreve ] };
|
|
||||||
+ key <AC02> { [s,S, scircumflex, Scircumflex ] };
|
|
||||||
+ key <AC05> { [g,G, gcircumflex,Gcircumflex ] };
|
|
||||||
+ key <AC06> { [h,H, hcircumflex,Hcircumflex ] };
|
|
||||||
+ key <AC07> { [j,J, jcircumflex,Jcircumflex ] };
|
|
||||||
+ key <AB03> { [c,C, ccircumflex,Ccircumflex ] };
|
|
||||||
+};
|
|
|
@ -1,95 +0,0 @@
|
||||||
|
|
||||||
// Grabbed from http://lists.freedesktop.org/archives/xorg/2007-July/026686.html
|
|
||||||
// Submitted there by Adriaan van Nijendaal, he says he submitted it to X.org
|
|
||||||
// for inclusion, so it should be OK to use it as if it were part of X.org
|
|
||||||
|
|
||||||
// The keyboard section in the X-server config file
|
|
||||||
// (/etc/X11/xorg.conf on my system) looks like this:
|
|
||||||
//
|
|
||||||
// Section "InputDevice"
|
|
||||||
// Driver "kbd"
|
|
||||||
// Identifier "Keyboard[0]"
|
|
||||||
// Option "XkbModel" "pc101"
|
|
||||||
// Option "XkbLayout" "us"
|
|
||||||
// Option "XkbVariant" "altgr-intl"
|
|
||||||
// EndSection
|
|
||||||
//
|
|
||||||
// To be effective, you need to install this file, change the X config
|
|
||||||
// file and restart the X-server. Or, alternatively, you can do this
|
|
||||||
// run-time:
|
|
||||||
//
|
|
||||||
// setxkbmap -v -rules xorg -model pc101 -layout us -variant altgr-intl
|
|
||||||
//
|
|
||||||
// Once the X-server has loaded the new config, a keyboard can be
|
|
||||||
// displayed with: (if you change "-ll 1" into "-ll 2", you'll see
|
|
||||||
// the special keys ONLY.)
|
|
||||||
//
|
|
||||||
// xkbcomp -o /tmp/keyboard.xkm -opt cgkst -xkb $DISPLAY
|
|
||||||
// xkbprint -o /tmp/keyboard.xkm.ps -kc -nkg 2 -ntg 4 -lg 1 -ll 1 \
|
|
||||||
// -lc en_US.iso885915 -level2 -mono -label symbols -w 3 $DISPLAY;
|
|
||||||
// gv -seascape /tmp/keyboard.xkm.ps
|
|
||||||
// rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm
|
|
||||||
//
|
|
||||||
|
|
||||||
partial hidden alphanumeric_keys
|
|
||||||
xkb_symbols "altgr-intl-rich" {
|
|
||||||
|
|
||||||
name[Group1]= "U.S. English - International (AltGr dead keys)";
|
|
||||||
|
|
||||||
include "us(basic)"
|
|
||||||
|
|
||||||
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
|
|
||||||
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
|
|
||||||
key <AE02> { [ 2, at, twosuperior, dead_doubleacute] };
|
|
||||||
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
|
|
||||||
key <AE04> { [ 4, dollar, currency, sterling ] };
|
|
||||||
key <AE05> { [ 5, percent, EuroSign, approxeq ] };
|
|
||||||
key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
|
|
||||||
key <AE07> { [ 7, ampersand, dead_horn ] };
|
|
||||||
key <AE08> { [ 8, asterisk, dead_ogonek, infinity ] };
|
|
||||||
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };
|
|
||||||
key <AE10> { [ 0, parenright,rightsinglequotemark,dead_abovering ] };
|
|
||||||
key <AE11> { [ minus, underscore, yen, dead_belowdot ] };
|
|
||||||
key <AE12> { [ equal, plus, multiply, division ] };
|
|
||||||
|
|
||||||
key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
|
|
||||||
key <AD02> { [ w, W, aring, Aring ] };
|
|
||||||
key <AD03> { [ e, E, eacute, Eacute ] };
|
|
||||||
key <AD04> { [ r, R, ediaeresis, Ediaeresis ] };
|
|
||||||
key <AD05> { [ t, T, thorn, THORN ] };
|
|
||||||
key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
|
|
||||||
key <AD07> { [ u, U, uacute, Uacute ] };
|
|
||||||
key <AD08> { [ i, I, iacute, Iacute ] };
|
|
||||||
key <AD09> { [ o, O, oacute, Oacute ] };
|
|
||||||
key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
|
|
||||||
key <AD11> { [ bracketleft, braceleft, guillemotleft, lessthanequal ] };
|
|
||||||
key <AD12> { [ bracketright,braceright, guillemotright, greaterthanequal] };
|
|
||||||
|
|
||||||
key <AC01> { [ a, A, aacute, Aacute ] };
|
|
||||||
key <AC02> { [ s, S, ssharp, section ] };
|
|
||||||
key <AC03> { [ d, D, eth, ETH ] };
|
|
||||||
key <AC04> { [ f, F, union, intersection ] };
|
|
||||||
key <AC05> { [ g, G, eng, ENG ] };
|
|
||||||
key <AC06> { [ h, H, hyphen, nobreakspace ] };
|
|
||||||
key <AC07> { [ j, J, idiaeresis, Idiaeresis ] };
|
|
||||||
key <AC08> { [ k, K ] };
|
|
||||||
key <AC09> { [ l, L, oslash, Ooblique ] };
|
|
||||||
key <AC10> { [semicolon, colon, paragraph, degree ] };
|
|
||||||
key <AC11> { [apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
|
|
||||||
|
|
||||||
key <AB01> { [ z, Z, ae, AE ] };
|
|
||||||
key <AB02> { [ x, X, oe, OE ] };
|
|
||||||
key <AB03> { [ c, C, copyright, cent ] };
|
|
||||||
key <AB04> { [ v, V, registered, trademark ] };
|
|
||||||
key <AB05> { [ b, B, emdash, endash ] };
|
|
||||||
key <AB06> { [ n, N, nu, numerosign ] };
|
|
||||||
key <AB07> { [ m, M, mu, plusminus ] };
|
|
||||||
key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
|
|
||||||
key <AB09> { [ period, greater, dead_abovedot, dead_caron ] };
|
|
||||||
key <AB10> { [ slash, question, questiondown, dead_hook ] };
|
|
||||||
key <BKSL> { [backslash, bar, notsign, brokenbar ] };
|
|
||||||
|
|
||||||
// Let's have free choice
|
|
||||||
//include "level3(ralt_switch)"
|
|
||||||
};
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "terminology-${version}";
|
name = "terminology-${version}";
|
||||||
version = "0.3.0";
|
version = "0.4.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
|
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
|
||||||
sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp";
|
sha256 = "1ing9l19h7f1f843rcabbjaynps1as4mpc31xz2adkafb3xd3wk3";
|
||||||
};
|
};
|
||||||
buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ];
|
buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ];
|
||||||
|
|
||||||
|
|
59
pkgs/desktops/gnome-3/core/empathy/default.nix
Normal file
59
pkgs/desktops/gnome-3/core/empathy/default.nix
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
|
||||||
|
, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
|
||||||
|
, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
|
||||||
|
, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
|
||||||
|
, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
|
||||||
|
, telepathy_logger, libnotify, clutter, libsoup, gnutls
|
||||||
|
, evolution_data_server
|
||||||
|
, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
|
||||||
|
, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }:
|
||||||
|
|
||||||
|
# TODO: enable more features
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "empathy-3.10.3";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
|
||||||
|
gnome3.gnome_icon_theme hicolor_icon_theme
|
||||||
|
gnome_online_accounts shared_mime_info
|
||||||
|
gnome3.gnome_icon_theme_symbolic ];
|
||||||
|
propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
|
||||||
|
telepathy_mission_control ];
|
||||||
|
buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
|
||||||
|
libxml2 libxslt icu file makeWrapper
|
||||||
|
telepathy_glib clutter_gtk clutter-gst cogl
|
||||||
|
gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||||
|
gcr libsecret pulseaudio gnome3.yelp_xsl
|
||||||
|
libnotify clutter libsoup gnutls libgee p11_kit
|
||||||
|
libcanberra_gtk3 telepathy_farstream farstream
|
||||||
|
gnome3.gsettings_desktop_schemas file libtool ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
|
||||||
|
"-I${dbus_libs}/include/dbus-1.0"
|
||||||
|
"-I${dbus_libs}/lib/dbus-1.0/include" ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $out/lib/empathy/gdk-pixbuf-2.0/2.10.0
|
||||||
|
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||||
|
wrapProgram "$out/bin/empathy" \
|
||||||
|
--set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
|
||||||
|
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = https://wiki.gnome.org/Apps/Empathy;
|
||||||
|
description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
|
||||||
|
maintainers = with maintainers; [ lethalman ];
|
||||||
|
license = [ licenses.gpl2 licenses.lgpl2 ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
49
pkgs/desktops/gnome-3/core/epiphany/default.nix
Normal file
49
pkgs/desktops/gnome-3/core/epiphany/default.nix
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
|
||||||
|
, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
|
||||||
|
, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
|
||||||
|
, sqlite, gcr, avahi, nss, isocodes, itstool, file }:
|
||||||
|
|
||||||
|
# TODO: icons and theme still does not work
|
||||||
|
# use packaged gnome3.gnome_icon_theme_symbolic
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "epiphany-3.10.3";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Tests need an X display
|
||||||
|
configureFlags = [ "--disable-static --disable-tests" ];
|
||||||
|
|
||||||
|
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgconfig file ];
|
||||||
|
|
||||||
|
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
||||||
|
|
||||||
|
buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
|
||||||
|
webkitgtk libsoup libsecret gnome_desktop libnotify libtool
|
||||||
|
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
|
||||||
|
gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
|
||||||
|
|
||||||
|
installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram "$out/bin/epiphany" \
|
||||||
|
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = https://wiki.gnome.org/Apps/Epiphany;
|
||||||
|
description = "WebKit based web browser for GNOME";
|
||||||
|
maintainers = with maintainers; [ lethalman ];
|
||||||
|
license = licenses.gpl2;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
|
{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
|
||||||
, p11_kit, db, nspr, nss, libical, gperf }:
|
, p11_kit, db, nspr, nss, libical, gperf, valaSupport ? true, vala }:
|
||||||
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = with gnome3;
|
buildInputs = with gnome3;
|
||||||
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
|
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
|
||||||
gcr p11_kit db nspr nss libgweather libical libgdata gperf ];
|
gcr p11_kit db nspr nss libgweather libical libgdata gperf ]
|
||||||
|
++ stdenv.lib.optional valaSupport vala;
|
||||||
|
|
||||||
# uoa irrelevant for now
|
# uoa irrelevant for now
|
||||||
configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
|
configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
|
||||||
|
++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
|
||||||
|
|
||||||
|
installFlags = "gsettingsschemadir=\${out}/share/evolution-data-server/glib-2.0/schemas/";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
|
42
pkgs/desktops/gnome-3/core/folks/default.nix
Normal file
42
pkgs/desktops/gnome-3/core/folks/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
|
||||||
|
, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
|
||||||
|
, telepathy_glib, evolution_data_server, libsecret, db }:
|
||||||
|
|
||||||
|
# TODO: enable more folks backends
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "folks-0.9.6";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
|
||||||
|
sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
|
||||||
|
# dbus_daemon needed for tests
|
||||||
|
buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
|
||||||
|
vala libsecret libxml2 libsoup nspr nss intltool db ];
|
||||||
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
|
configureFlags = "--disable-fatal-warnings";
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
|
||||||
|
"-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
postBuild = "rm -rf $out/share/gtk-doc";
|
||||||
|
|
||||||
|
installFlags = "gsettingsschemadir=\${out}/share/folks/glib-2.0/schemas/";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Folks";
|
||||||
|
|
||||||
|
homepage = https://wiki.gnome.org/Projects/Folks;
|
||||||
|
|
||||||
|
license = "LGPLv2+";
|
||||||
|
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ lethalman ];
|
||||||
|
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||||
|
};
|
||||||
|
}
|
17
pkgs/desktops/gnome-3/core/gnome-common/default.nix
Normal file
17
pkgs/desktops/gnome-3/core/gnome-common/default.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{ stdenv, fetchurl, which, autoconf, automake }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "gnome-common-3.10.0";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [(fetchurl {
|
||||||
|
url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
|
||||||
|
sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
|
||||||
|
})];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "gnome-icon-theme-symbolic-3.10.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412";
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = "--enable-icon-mapping";
|
||||||
|
|
||||||
|
# Avoid postinstall make hooks
|
||||||
|
installPhase = ''
|
||||||
|
make install-exec-am install-data-local install-pkgconfigDATA
|
||||||
|
make -C src install
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ pkgconfig iconnamingutils gtk];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
42
pkgs/desktops/gnome-3/core/gucharmap/default.nix
Normal file
42
pkgs/desktops/gnome-3/core/gucharmap/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
{ stdenv, intltool, fetchurl, pkgconfig, gtk3
|
||||||
|
, glib, desktop_file_utils, bash
|
||||||
|
, makeWrapper, gnome3, file, itstool, libxml2 }:
|
||||||
|
|
||||||
|
# TODO: icons and theme still does not work
|
||||||
|
# use packaged gnome3.gnome_icon_theme_symbolic
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "gucharmap-3.10.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78";
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = [ "--disable-static" ];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
|
||||||
|
|
||||||
|
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
||||||
|
|
||||||
|
buildInputs = [ pkgconfig gtk3 intltool itstool glib
|
||||||
|
gnome3.yelp_tools libxml2 file desktop_file_utils
|
||||||
|
gnome3.gsettings_desktop_schemas makeWrapper ];
|
||||||
|
|
||||||
|
installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram "$out/bin/gucharmap" \
|
||||||
|
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = https://wiki.gnome.org/Apps/Gucharmap;
|
||||||
|
description = "GNOME Character Map, based on the Unicode Character Database";
|
||||||
|
maintainers = with maintainers; [ lethalman ];
|
||||||
|
license = licenses.gpl3;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,18 +1,25 @@
|
||||||
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
|
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
|
||||||
|
let
|
||||||
|
ver_maj = "0.12";
|
||||||
|
ver_min = "0";
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libgee-0.13.4";
|
name = "libgee-${ver_maj}.${ver_min}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz";
|
url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz";
|
||||||
sha256 = "1gzyx8gy5m6r8km3xbb1kszz0v3p9vsbzwb78pf3fw122gwbjj4k";
|
sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
patches = [ ./fix_introspection_paths.patch ];
|
patches = [ ./fix_introspection_paths.patch ];
|
||||||
|
|
||||||
buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
|
buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
|
||||||
|
license = licenses.lgpl21Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
31
pkgs/desktops/gnome-3/core/vino/default.nix
Normal file
31
pkgs/desktops/gnome-3/core/vino/default.nix
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
|
||||||
|
, libnotify, file }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "vino-${versionMajor}.${versionMinor}";
|
||||||
|
versionMajor = "3.10";
|
||||||
|
versionMinor = "1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
|
||||||
|
sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do
|
||||||
|
wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = https://wiki.gnome.org/action/show/Projects/Vino;
|
||||||
|
description = "GNOME desktop sharing server";
|
||||||
|
maintainers = with maintainers; [ lethalman iElectric ];
|
||||||
|
license = licenses.gpl2;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
22
pkgs/desktops/gnome-3/core/yelp-tools/default.nix
Normal file
22
pkgs/desktops/gnome-3/core/yelp-tools/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "yelp-tools-3.10.0";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
|
||||||
|
description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
|
||||||
|
maintainers = with maintainers; [ iElectric ];
|
||||||
|
license = licenses.gpl2;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,8 +1,6 @@
|
||||||
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib, file
|
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
|
||||||
, bash, makeWrapper, itstool, libxml2, libxslt, gnome3, icu }:
|
, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
|
||||||
|
, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
|
||||||
# TODO: icons and theme still does not work
|
|
||||||
# use packaged gnome3.gnome_icon_theme_symbolic
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "yelp-3.10.1";
|
name = "yelp-3.10.1";
|
||||||
|
@ -12,25 +10,24 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
|
sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [ "--disable-static" ];
|
propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
|
||||||
|
gnome3.gnome_icon_theme hicolor_icon_theme
|
||||||
doCheck = true;
|
gnome3.gnome_icon_theme_symbolic ];
|
||||||
|
|
||||||
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
|
|
||||||
|
|
||||||
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
||||||
|
|
||||||
buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file
|
buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
|
||||||
gnome3.gsettings_desktop_schemas makeWrapper gnome3.yelp_xsl ];
|
libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
|
||||||
|
gnome3.gsettings_desktop_schemas ];
|
||||||
|
|
||||||
installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
|
installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
mkdir -p $out/lib/yelp/gdk-pixbuf-2.0/2.10.0
|
||||||
|
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||||
wrapProgram "$out/bin/yelp" \
|
wrapProgram "$out/bin/yelp" \
|
||||||
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
|
--set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
|
||||||
'';
|
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -4,7 +4,7 @@ rec {
|
||||||
inherit (pkgs) glib gtk2 gtk3 gnome2;
|
inherit (pkgs) glib gtk2 gtk3 gnome2;
|
||||||
gtk = gtk3; # just to be sure
|
gtk = gtk3; # just to be sure
|
||||||
libcanberra = pkgs.libcanberra_gtk3; # just to be sure
|
libcanberra = pkgs.libcanberra_gtk3; # just to be sure
|
||||||
inherit (pkgs.gnome2) gnome_common ORBit2;
|
inherit (pkgs.gnome2) ORBit2;
|
||||||
orbit = ORBit2;
|
orbit = ORBit2;
|
||||||
inherit (pkgs) libsoup;
|
inherit (pkgs) libsoup;
|
||||||
|
|
||||||
|
@ -20,6 +20,10 @@ rec {
|
||||||
|
|
||||||
dconf = callPackage ./core/dconf { };
|
dconf = callPackage ./core/dconf { };
|
||||||
|
|
||||||
|
empathy = callPackage ./core/empathy { };
|
||||||
|
|
||||||
|
epiphany = callPackage ./core/epiphany { };
|
||||||
|
|
||||||
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
|
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
|
||||||
|
|
||||||
evolution_data_server = callPackage ./core/evolution-data-server { };
|
evolution_data_server = callPackage ./core/evolution-data-server { };
|
||||||
|
@ -36,14 +40,20 @@ rec {
|
||||||
|
|
||||||
gnome_control_center = callPackage ./core/gnome-control-center { };
|
gnome_control_center = callPackage ./core/gnome-control-center { };
|
||||||
|
|
||||||
|
gnome_common = callPackage ./core/gnome-common { };
|
||||||
|
|
||||||
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
|
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
|
||||||
|
|
||||||
|
gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
|
||||||
|
|
||||||
gnome-menus = callPackage ./core/gnome-menus { };
|
gnome-menus = callPackage ./core/gnome-menus { };
|
||||||
|
|
||||||
gnome_keyring = callPackage ./core/gnome-keyring { };
|
gnome_keyring = callPackage ./core/gnome-keyring { };
|
||||||
|
|
||||||
libgnome_keyring = callPackage ./core/libgnome-keyring { };
|
libgnome_keyring = callPackage ./core/libgnome-keyring { };
|
||||||
|
|
||||||
|
folks = callPackage ./core/folks { };
|
||||||
|
|
||||||
gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
|
gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
|
||||||
|
|
||||||
gnome_session = callPackage ./core/gnome-session { };
|
gnome_session = callPackage ./core/gnome-session { };
|
||||||
|
@ -58,6 +68,8 @@ rec {
|
||||||
|
|
||||||
gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
|
gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
|
||||||
|
|
||||||
|
gucharmap = callPackage ./core/gucharmap { };
|
||||||
|
|
||||||
gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
|
gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
|
||||||
|
|
||||||
eog = callPackage ./core/eog { };
|
eog = callPackage ./core/eog { };
|
||||||
|
@ -84,10 +96,14 @@ rec {
|
||||||
|
|
||||||
vte = callPackage ./core/vte { };
|
vte = callPackage ./core/vte { };
|
||||||
|
|
||||||
|
vino = callPackage ./core/vino { };
|
||||||
|
|
||||||
yelp = callPackage ./core/yelp { };
|
yelp = callPackage ./core/yelp { };
|
||||||
|
|
||||||
yelp_xsl = callPackage ./core/yelp-xsl { };
|
yelp_xsl = callPackage ./core/yelp-xsl { };
|
||||||
|
|
||||||
|
yelp_tools = callPackage ./core/yelp-tools { };
|
||||||
|
|
||||||
zenity = callPackage ./core/zenity { };
|
zenity = callPackage ./core/zenity { };
|
||||||
|
|
||||||
|
|
||||||
|
@ -111,6 +127,6 @@ rec {
|
||||||
|
|
||||||
gitg = callPackage ./misc/gitg { };
|
gitg = callPackage ./misc/gitg { };
|
||||||
|
|
||||||
libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; };
|
libgit2-glib = callPackage ./misc/libgit2-glib { };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig
|
{ stdenv, fetchurl, gnome3, libtool, pkgconfig
|
||||||
, gtk_doc, gobjectIntrospection, libgit2, glib }:
|
, gtk_doc, gobjectIntrospection, libgit2, glib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureScript = "sh ./autogen.sh";
|
configureScript = "sh ./autogen.sh";
|
||||||
|
|
||||||
buildInputs = [ which gnome3.gnome_common autoconf automake libtool
|
buildInputs = [ gnome3.gnome_common libtool pkgconfig
|
||||||
pkgconfig gtk_doc gobjectIntrospection libgit2 glib ];
|
gtk_doc gobjectIntrospection libgit2 glib ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
|
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
branch = "4.10";
|
||||||
# Need callPackageOrig to avoid infinite cycle
|
# Need callPackageOrig to avoid infinite cycle
|
||||||
kde = callPackageOrig ./kde-package {
|
kde = callPackageOrig ./kde-package {
|
||||||
inherit release ignoreList extraSubpkgs callPackage;
|
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||||
};
|
};
|
||||||
|
|
||||||
# The list of igored individual modules
|
# The list of igored individual modules
|
||||||
|
@ -64,7 +65,7 @@ kde.modules // kde.individual //
|
||||||
full = stdenv.lib.attrValues kde.modules;
|
full = stdenv.lib.attrValues kde.modules;
|
||||||
|
|
||||||
l10n = callPackage ./l10n {
|
l10n = callPackage ./l10n {
|
||||||
inherit release;
|
inherit release branch;
|
||||||
inherit (kde.manifest) stable;
|
inherit (kde.manifest) stable;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||||
, release, ignoreList, extraSubpkgs
|
, release, branch, ignoreList, extraSubpkgs
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -19,6 +19,7 @@ rec {
|
||||||
# Default meta attribute
|
# Default meta attribute
|
||||||
defMeta = {
|
defMeta = {
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
|
inherit branch;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
inherit (qt4.meta) maintainers;
|
inherit (qt4.meta) maintainers;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@ let
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE translation for ${lang}";
|
description = "KDE translation for ${lang}";
|
||||||
|
inherit branch;
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
inherit (kdelibs.meta) maintainers homepage;
|
inherit (kdelibs.meta) maintainers homepage;
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
|
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
branch = "4.11";
|
||||||
|
|
||||||
# Need callPackageOrig to avoid infinite cycle
|
# Need callPackageOrig to avoid infinite cycle
|
||||||
kde = callPackageOrig ./kde-package {
|
kde = callPackageOrig ./kde-package {
|
||||||
inherit release ignoreList extraSubpkgs callPackage;
|
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||||
};
|
};
|
||||||
|
|
||||||
# The list of igored individual modules
|
# The list of igored individual modules
|
||||||
|
@ -36,7 +38,7 @@ kde.modules // kde.individual //
|
||||||
full = stdenv.lib.attrValues kde.modules;
|
full = stdenv.lib.attrValues kde.modules;
|
||||||
|
|
||||||
l10n = callPackage ./l10n {
|
l10n = callPackage ./l10n {
|
||||||
inherit release;
|
inherit release branch;
|
||||||
inherit (kde.manifest) stable;
|
inherit (kde.manifest) stable;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||||
, release, ignoreList, extraSubpkgs
|
, release, branch, ignoreList, extraSubpkgs
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -19,6 +19,7 @@ rec {
|
||||||
# Default meta attribute
|
# Default meta attribute
|
||||||
defMeta = {
|
defMeta = {
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
|
inherit branch;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
inherit (qt4.meta) maintainers;
|
inherit (qt4.meta) maintainers;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@ let
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE translation for ${lang}";
|
description = "KDE translation for ${lang}";
|
||||||
|
inherit branch;
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
inherit (kdelibs.meta) maintainers homepage;
|
inherit (kdelibs.meta) maintainers homepage;
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
|
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
branch = "4.12";
|
||||||
|
|
||||||
# Need callPackageOrig to avoid infinite cycle
|
# Need callPackageOrig to avoid infinite cycle
|
||||||
kde = callPackageOrig ./kde-package {
|
kde = callPackageOrig ./kde-package {
|
||||||
inherit release ignoreList extraSubpkgs callPackage;
|
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||||
};
|
};
|
||||||
|
|
||||||
# The list of igored individual modules
|
# The list of igored individual modules
|
||||||
|
@ -36,7 +38,7 @@ kde.modules // kde.individual //
|
||||||
full = stdenv.lib.attrValues kde.modules;
|
full = stdenv.lib.attrValues kde.modules;
|
||||||
|
|
||||||
l10n = callPackage ./l10n {
|
l10n = callPackage ./l10n {
|
||||||
inherit release;
|
inherit release branch;
|
||||||
inherit (kde.manifest) stable;
|
inherit (kde.manifest) stable;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||||
, release, ignoreList, extraSubpkgs
|
, release, branch, ignoreList, extraSubpkgs
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -19,6 +19,7 @@ rec {
|
||||||
# Default meta attribute
|
# Default meta attribute
|
||||||
defMeta = {
|
defMeta = {
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
|
inherit branch;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
inherit (qt4.meta) maintainers;
|
inherit (qt4.meta) maintainers;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@ let
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE translation for ${lang}";
|
description = "KDE translation for ${lang}";
|
||||||
|
inherit branch;
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
inherit (kdelibs.meta) maintainers homepage;
|
inherit (kdelibs.meta) maintainers homepage;
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
brightness_patch = fetchurl {
|
brightness_patch = fetchurl {
|
||||||
url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611";
|
url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611";
|
||||||
sha256 = "0rbldvjwpj93hx59xrmvbdql1pgkbqzjh4vp6gkavn4z6sv535v8";
|
sha256 = "1y8520s0s4d7x1abdwsm5qig4vgm3np7hhagfbdwd5ymiz5nn9mw";
|
||||||
};
|
};
|
||||||
|
|
||||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||||
|
|
|
@ -9,13 +9,12 @@ with stdenv.lib;
|
||||||
let
|
let
|
||||||
|
|
||||||
majorVersion = "2.6";
|
majorVersion = "2.6";
|
||||||
version = "${majorVersion}.8";
|
version = "${majorVersion}.9";
|
||||||
|
|
||||||
# http://www.python.org/download/releases/2.6.8/
|
# python 2.6 will receive security fixes until Oct 2013
|
||||||
# md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||||
md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
|
sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
|
|
|
@ -8,11 +8,11 @@ with stdenv.lib;
|
||||||
let
|
let
|
||||||
|
|
||||||
majorVersion = "2.7";
|
majorVersion = "2.7";
|
||||||
version = "${majorVersion}.5";
|
version = "${majorVersion}.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||||
sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv";
|
sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
|
|
|
@ -17,7 +17,7 @@ with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
majorVersion = "3.3";
|
majorVersion = "3.3";
|
||||||
version = "${majorVersion}.3";
|
version = "${majorVersion}.4";
|
||||||
|
|
||||||
buildInputs = filter (p: p != null) [
|
buildInputs = filter (p: p != null) [
|
||||||
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
||||||
|
@ -28,8 +28,8 @@ stdenv.mkDerivation {
|
||||||
inherit majorVersion version;
|
inherit majorVersion version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||||
sha256 = "1jwd9pw7vx6xpjyi7iv5j3rwwkf3vzrwj36kcj1qh8zn2avfj9p5";
|
sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||||
|
|
|
@ -1,23 +1,28 @@
|
||||||
{ stdenv, fetchurl, gwenhywfar, pkgconfig, gmp, zlib }:
|
{ stdenv, fetchurl, gmp, gwenhywfar, libtool, libxml2, libxslt
|
||||||
|
, pkgconfig, xmlsec, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "aqbanking-5.0.21";
|
name = "aqbanking-5.4.0beta";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-5.0.21.tar.gz";
|
url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=112&file=01&dummy=aqbanking-5.4.0beta.tar.gz";
|
||||||
name = "${name}.tar.gz";
|
name = "${name}.tar.gz";
|
||||||
sha256 = "1xvzg640fswkrjrkrqzj0j9lnij7kcpnyvzd7nsg1by40wxwgp52";
|
sha256 = "0yd588sw9grc2c0bfyx8h39mr30pa1zxrcbv31p6pz6szilk2agh";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gwenhywfar gmp zlib ];
|
buildInputs = [ gmp gwenhywfar libtool libxml2 libxslt xmlsec zlib ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
configureFlags = "--with-gwen-dir=${gwenhywfar}";
|
configureFlags = "--with-gwen-dir=${gwenhywfar}";
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
description = "An interface to banking tasks, file formats and country information";
|
||||||
# Tries to install gwenhywfar plugin, thus `make install` fails
|
homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1";
|
||||||
hydraPlatforms = [];
|
hydraPlatforms = [];
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ goibhniu urkud ];
|
||||||
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,25 +1,30 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, fftw, libsndfile, libsamplerate
|
{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
|
||||||
, python, alsaLib, jackaudio }:
|
, libsndfile, pkgconfig, python
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "aubio-0.3.2";
|
name = "aubio-0.4.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://aubio.org/pub/${name}.tar.gz";
|
url = "http://aubio.org/pub/${name}.tar.bz2";
|
||||||
sha256 = "1k8j2m8wdpa54hvrqy6nqfcx42x6nwa77hi3ym0n22k192q8f4yw";
|
sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [
|
||||||
[ pkgconfig fftw libsndfile libsamplerate python
|
alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
|
||||||
# optional:
|
];
|
||||||
alsaLib jackaudio
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
configurePhase = "python waf configure --prefix=$out";
|
||||||
|
|
||||||
|
buildPhase = "python waf";
|
||||||
|
|
||||||
|
installPhase = "python waf install";
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
description = "Library for audio labelling";
|
description = "Library for audio labelling";
|
||||||
homepage = http://aubio.org/;
|
homepage = http://aubio.org/;
|
||||||
license = "GPLv2";
|
license = licenses.gpl2;
|
||||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,21 +6,21 @@
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
vampSDK = stdenv.mkDerivation {
|
vampSDK = stdenv.mkDerivation {
|
||||||
name = "vamp-sdk-2.2.1";
|
name = "vamp-sdk-2.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/vamp/vamp-plugin-sdk-2.2.1.tar.gz;
|
url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
|
||||||
sha256 = "09iw6gv8aqq5v322fhi872mrhjp0a2w63966g0mks4vhh84q252p";
|
sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig libsndfile];
|
buildInputs = [ pkgconfig libsndfile ];
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
|
description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
|
||||||
homepage = http://sourceforge.net/projects/vamp;
|
homepage = http://sourceforge.net/projects/vamp;
|
||||||
license = "BSD";
|
license = licenses.bsd3;
|
||||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
26
pkgs/development/libraries/clutter-gst/default.nix
Normal file
26
pkgs/development/libraries/clutter-gst/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "clutter-gst-2.0.10";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
|
||||||
|
sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
|
||||||
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
|
postBuild = "rm -rf $out/share/gtk-doc";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Clutter-GST";
|
||||||
|
|
||||||
|
homepage = http://www.clutter-project.org/;
|
||||||
|
|
||||||
|
license = "LGPLv2+";
|
||||||
|
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ lethalman ];
|
||||||
|
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,11 +1,11 @@
|
||||||
{ fetchurl, stdenv, pkgconfig, clutter, gtk3 }:
|
{ fetchurl, stdenv, pkgconfig, clutter, gtk3 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "clutter-gtk-1.0.4";
|
name = "clutter-gtk-1.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz;
|
url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
|
||||||
sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87";
|
sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ clutter gtk3 ];
|
propagatedBuildInputs = [ clutter gtk3 ];
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
|
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
|
||||||
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }:
|
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland
|
||||||
|
, gstreamerSupport ? true, gst_all_1 }:
|
||||||
|
|
||||||
let
|
let
|
||||||
ver_maj = "1.16";
|
ver_maj = "1.16";
|
||||||
|
@ -22,13 +23,15 @@ stdenv.mkDerivation rec {
|
||||||
"--enable-kms-egl-platform"
|
"--enable-kms-egl-platform"
|
||||||
"--enable-wayland-egl-platform"
|
"--enable-wayland-egl-platform"
|
||||||
"--enable-wayland-egl-server"
|
"--enable-wayland-egl-server"
|
||||||
];
|
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
|
||||||
|
|
||||||
propagatedBuildInputs = with xorg; [
|
propagatedBuildInputs = with xorg; [
|
||||||
glib gdk_pixbuf gobjectIntrospection
|
glib gdk_pixbuf gobjectIntrospection
|
||||||
mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland
|
mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland
|
||||||
]
|
]
|
||||||
++ libintlOrEmpty;
|
++ libintlOrEmpty
|
||||||
|
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
|
||||||
|
gst_all_1.gst-plugins-base ];
|
||||||
|
|
||||||
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
|
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue