mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 19:16:11 +00:00
Merge master into x-updates
This commit is contained in:
Vladimír Čunát
commit
ae5d8f6768
@ -65,6 +65,7 @@
|
||||
sprock = "Roger Mason <rmason@mun.ca>";
|
||||
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
||||
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
|
||||
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
|
||||
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
|
||||
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
|
||||
vcunat = "Vladimír Čunát <vcunat@gmail.com>";
|
||||
|
||||
@ -41,4 +41,13 @@ rec {
|
||||
pathExists readFile isBool isFunction
|
||||
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;
|
||||
value = listToAttrs (
|
||||
imap (elemIdx: elem:
|
||||
{ name = "${elem.name or "unnamed"}-${toString defIdx}.${toString elemIdx}";
|
||||
{ name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
|
||||
value = elem;
|
||||
}) 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
|
||||
manually, e.g.
|
||||
<programlisting>
|
||||
services.xserver.videoDrivers = [ "r128" ];
|
||||
hardware.opengl.videoDrivers = [ "r128" ];
|
||||
</programlisting>
|
||||
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
|
||||
by default because it’s not free software. You can enable it as follows:
|
||||
<programlisting>
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.opengl.videoDrivers = [ "nvidia" ];
|
||||
</programlisting>
|
||||
You may need to reboot after enabling this driver to prevent a clash
|
||||
with other kernel modules.</para>
|
||||
|
||||
@ -295,7 +295,7 @@ $ reboot</screen>
|
||||
}</screen>
|
||||
</example>
|
||||
|
||||
<section>
|
||||
<section xml:id="sec-uefi-installation">
|
||||
|
||||
<title>UEFI Installation</title>
|
||||
|
||||
@ -305,14 +305,15 @@ changes:
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>You should boot the livecd in UEFI mode (consult your specific
|
||||
hardware's documentation for instructions how).</para>
|
||||
<para>You should boot the live CD in UEFI mode (consult your
|
||||
specific hardware's documentation for instructions).</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Instead of <command>fdisk</command>, you should use <command>
|
||||
gdisk</command> to partition your disks. You will need to have a
|
||||
separate partition for <filename>/boot</filename> with partition code
|
||||
EF00, and it should be formatted with a vfat filesystem.</para>
|
||||
<para>Instead of <command>fdisk</command>, you should use
|
||||
<command>gdisk</command> to partition your disks. You will need to
|
||||
have a separate partition for <filename>/boot</filename> with
|
||||
partition code EF00, and it should be formatted as a
|
||||
<literal>vfat</literal> filesystem.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>You must set <option>boot.loader.gummiboot.enable</option> to
|
||||
@ -327,8 +328,8 @@ changes:
|
||||
as well.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>To see console messages during early boot, put <literal>"fbcon"</literal>
|
||||
in your <option>boot.initrd.kernelModules</option></para>
|
||||
<para>To see console messages during early boot, add <literal>"fbcon"</literal>
|
||||
to your <option>boot.initrd.kernelModules</option>.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</para>
|
||||
|
||||
@ -55,9 +55,12 @@
|
||||
<!-- <xi:include href="userconfiguration.xml" /> -->
|
||||
<xi:include href="troubleshooting.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>
|
||||
<xi:include href="options-db.xml" />
|
||||
</chapter>
|
||||
</appendix>
|
||||
|
||||
</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>
|
||||
@ -369,7 +369,7 @@ in
|
||||
home = "/root";
|
||||
shell = cfg.defaultUserShell;
|
||||
group = "root";
|
||||
hashedPassword = config.security.initialRootPassword;
|
||||
hashedPassword = mkDefault config.security.initialRootPassword;
|
||||
};
|
||||
nobody = {
|
||||
uid = ids.uids.nobody;
|
||||
|
||||
@ -138,8 +138,7 @@ in
|
||||
};
|
||||
|
||||
# Setting vesa, we don't get the nvidia driver, which can't work in arm.
|
||||
services.xserver.videoDriver = "vesa";
|
||||
services.xserver.videoDrivers = [];
|
||||
hardware.opengl.videoDrivers = [ "vesa" ];
|
||||
services.nixosManual.enable = false;
|
||||
|
||||
# Include the firmware for various wireless cards.
|
||||
|
||||
@ -163,7 +163,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
|
||||
pciCheck $path;
|
||||
}
|
||||
|
||||
push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
|
||||
push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
|
||||
|
||||
|
||||
# Idem for USB devices.
|
||||
|
||||
@ -15,5 +15,5 @@ with pkgs.lib;
|
||||
|
||||
# Add some more video drivers to give X11 a shot at working in
|
||||
# VMware and QEMU.
|
||||
services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
|
||||
hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
|
||||
}
|
||||
|
||||
@ -112,6 +112,7 @@
|
||||
cgminer = 101;
|
||||
munin = 102;
|
||||
logcheck = 103;
|
||||
nix-ssh = 104;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid.
|
||||
|
||||
|
||||
@ -125,6 +125,7 @@
|
||||
./services/misc/gpsd.nix
|
||||
./services/misc/nix-daemon.nix
|
||||
./services/misc/nix-gc.nix
|
||||
./services/misc/nix-ssh-serve.nix
|
||||
./services/misc/nixos-manual.nix
|
||||
./services/misc/rogue.nix
|
||||
./services/misc/svnserve.nix
|
||||
|
||||
@ -28,34 +28,36 @@ in
|
||||
echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
|
||||
fi
|
||||
|
||||
if ! test -L $HOME/.nix-profile; then
|
||||
if test "$USER" != root; then
|
||||
ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
|
||||
else
|
||||
# Root installs in the system-wide profile by default.
|
||||
ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
|
||||
fi
|
||||
fi
|
||||
if test -w $HOME; then
|
||||
if ! test -L $HOME/.nix-profile; then
|
||||
if test "$USER" != root; then
|
||||
ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
|
||||
else
|
||||
# Root installs in the system-wide profile by default.
|
||||
ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
|
||||
fi
|
||||
fi
|
||||
|
||||
# Subscribe the root user to the NixOS channel by default.
|
||||
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
|
||||
echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
|
||||
fi
|
||||
# Subscribe the root user to the NixOS channel by default.
|
||||
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
|
||||
echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
|
||||
fi
|
||||
|
||||
# Create the per-user garbage collector roots directory.
|
||||
NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
|
||||
mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
|
||||
if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
|
||||
echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
|
||||
fi
|
||||
# Create the per-user garbage collector roots directory.
|
||||
NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
|
||||
mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
|
||||
if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
|
||||
echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
|
||||
fi
|
||||
|
||||
# Set up a default Nix expression from which to install stuff.
|
||||
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
|
||||
rm -f $HOME/.nix-defexpr
|
||||
mkdir $HOME/.nix-defexpr
|
||||
if [ "$USER" != root ]; then
|
||||
ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
|
||||
fi
|
||||
# Set up a default Nix expression from which to install stuff.
|
||||
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
|
||||
rm -f $HOME/.nix-defexpr
|
||||
mkdir $HOME/.nix-defexpr
|
||||
if [ "$USER" != root ]; then
|
||||
ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
|
||||
|
||||
@ -79,5 +79,10 @@ in {
|
||||
preStart = "mkdir -p /var/spool";
|
||||
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
|
||||
'') ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -286,8 +286,8 @@ in
|
||||
systemd.services."nix-daemon" =
|
||||
{ description = "Nix Daemon";
|
||||
|
||||
path = [ nix pkgs.openssl pkgs.utillinux ]
|
||||
++ optionals cfg.distributedBuilds [ pkgs.openssh pkgs.gzip ];
|
||||
path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]
|
||||
++ optionals cfg.distributedBuilds [ pkgs.gzip ];
|
||||
|
||||
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
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -34,7 +34,7 @@ in {
|
||||
export GTK_DATA_PREFIX=${config.system.path}
|
||||
|
||||
# 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
|
||||
|
||||
@ -43,9 +43,17 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules";
|
||||
environment.systemPackages =
|
||||
[ gnome3.evince
|
||||
gnome3.eog
|
||||
gnome3.dconf
|
||||
gnome3.vino
|
||||
gnome3.epiphany
|
||||
gnome3.baobab
|
||||
gnome3.gucharmap
|
||||
gnome3.nautilus
|
||||
gnome3.yelp
|
||||
pkgs.ibus
|
||||
gnome3.gnome_shell
|
||||
gnome3.gnome_settings_daemon
|
||||
@ -56,4 +64,5 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -38,12 +38,12 @@ in {
|
||||
services.redshift.brightness = {
|
||||
day = mkOption {
|
||||
description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
|
||||
default = 1;
|
||||
default = "1";
|
||||
type = types.uniq types.string;
|
||||
};
|
||||
night = mkOption {
|
||||
description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
|
||||
default = 1;
|
||||
default = "1";
|
||||
type = types.uniq types.string;
|
||||
};
|
||||
};
|
||||
|
||||
@ -27,7 +27,7 @@ in
|
||||
config = {
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.xserver.videoDrivers = [];
|
||||
hardware.opengl.videoDrivers = [];
|
||||
|
||||
# Enable KDM. Any display manager will do as long as it supports XDMCP.
|
||||
services.xserver.displayManager.kdm.enable = true;
|
||||
|
||||
@ -7,7 +7,6 @@ with pkgs.lib;
|
||||
let
|
||||
memtest86 = pkgs.memtest86plus;
|
||||
cfg = config.boot.loader.grub.memtest86;
|
||||
params = concatStringsSep " " cfg.params;
|
||||
in
|
||||
|
||||
{
|
||||
@ -82,7 +81,7 @@ in
|
||||
if config.boot.loader.grub.version == 2 then
|
||||
''
|
||||
menuentry "Memtest86+" {
|
||||
linux16 @bootRoot@/memtest.bin ${params}
|
||||
linux16 @bootRoot@/memtest.bin ${toString cfg.params}
|
||||
}
|
||||
''
|
||||
else
|
||||
|
||||
@ -386,7 +386,6 @@ in
|
||||
|
||||
# When building a regular system configuration, override whatever
|
||||
# video driver the host uses.
|
||||
services.xserver.videoDriver = mkVMOverride null;
|
||||
hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ];
|
||||
services.xserver.defaultDepth = mkVMOverride 0;
|
||||
services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
|
||||
|
||||
@ -6,17 +6,18 @@
|
||||
, perl, pkgconfig, python, serd, sord, sratom, suil }:
|
||||
|
||||
let
|
||||
# Ardour 3.0 tag
|
||||
rev = "79db9422";
|
||||
# Ardour 3.5.308 tag
|
||||
rev = "40d8c5ae";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ardour-3.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ardour-${version}";
|
||||
version = "3.5.308";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://git.ardour.org/ardour/ardour.git;
|
||||
inherit rev;
|
||||
sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096";
|
||||
sha256 = "7473c19c2aeb68bd93d512c2d4e976b23dd36d2453c877c859ad37a76f50dc8a";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -28,13 +29,16 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
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 = \"${version}-g40d8c5a\"; }\n' > libs/ardour/revision.cc
|
||||
# Note the different version number
|
||||
sed -i '33i rev = \"3.5-308-g40d8c5a\"' 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/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";
|
||||
|
||||
@ -43,7 +47,7 @@ stdenv.mkDerivation {
|
||||
installPhase = ''
|
||||
python waf install
|
||||
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
|
||||
'';
|
||||
|
||||
|
||||
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
Also read "The importance of Paying Something" on their homepage, please!
|
||||
'';
|
||||
homepage = http://ardour.org/;
|
||||
branch = "2";
|
||||
license = "GPLv2";
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -2,27 +2,25 @@
|
||||
|
||||
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
|
||||
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
|
||||
, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland
|
||||
, rubberband, vampSDK
|
||||
, libsndfile, pkgconfig, pulseaudio, qt5, redland
|
||||
, rubberband, serd, sord, vampSDK
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sonic-visualiser-${version}";
|
||||
version = "1.9";
|
||||
version = "2.3";
|
||||
|
||||
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 =
|
||||
[ 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
|
||||
serd
|
||||
sord
|
||||
pkgconfig
|
||||
# optional
|
||||
jackaudio
|
||||
@ -33,11 +31,10 @@ stdenv.mkDerivation rec {
|
||||
# fishsound
|
||||
liblo
|
||||
libX11
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
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 ..;
|
||||
done
|
||||
make
|
||||
@ -45,19 +42,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share/sonic-visualiser}
|
||||
cp sonic-visualiser/sonic-visualiser $out/bin
|
||||
cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
|
||||
wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib
|
||||
cp sonic-visualiser $out/bin/
|
||||
cp -r samples $out/share/sonic-visualiser/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "View and analyse contents of music audio files";
|
||||
homepage = http://www.sonicvisualiser.org/;
|
||||
license = "GPLv2";
|
||||
maintainers =
|
||||
[ stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.goibhniu
|
||||
];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
|
||||
{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib
|
||||
, libXinerama, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -9,12 +9,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1wlhfbglzc1jzsh80s4s1fawclgzyjy2105ffzx2mw9s0c1xds5l";
|
||||
};
|
||||
|
||||
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
|
||||
buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlags="PREFIX=$out"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A light-weight image viewer";
|
||||
homepage = https://derf.homelinux.org/projects/feh/;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "oiio-${version}";
|
||||
version = "1.1.12";
|
||||
version = "1.3.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
||||
sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
|
||||
sha256 = "114jx4pcqhzdchzpxbwrfzqmnxr2bm8cw13g4akz1hg8pvr1dhsb";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "viewnior-1.3";
|
||||
name = "viewnior-1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz";
|
||||
sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10";
|
||||
url = "https://www.dropbox.com/s/zytq0suabesv933/${name}.tar.gz";
|
||||
sha256 = "0vv1133phgfzm92md6bbccmcvfiqb4kz28z1572c0qj971yz457a";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
||||
shared_mime_info glib gdk_pixbuf perl
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
rm $out/share/icons/*/icon-theme.cache
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Viewnior is a fast and simple image viewer for GNU/Linux";
|
||||
longDescription =
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.67";
|
||||
name = "blender-2.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||
sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l";
|
||||
sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -35,11 +35,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = http://www.blender.org;
|
||||
# They comment two licenses: GPLv2 and Blender License, but they
|
||||
# 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.mkDerivation rec {
|
||||
name = "girara-0.1.9";
|
||||
name = "girara-0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
|
||||
sha256 = "1kd20dalnpy07hajv0rkmkbsym4bpfxh0gby7j2mvkvl5qr3vx70";
|
||||
sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi";
|
||||
};
|
||||
|
||||
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 {
|
||||
name = "wacomtablet-1.3.5";
|
||||
name = "wacomtablet-2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2";
|
||||
sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja";
|
||||
url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2";
|
||||
sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax";
|
||||
};
|
||||
|
||||
buildInputs = [ kdelibs ];
|
||||
buildInputs = [ kdelibs xf86_input_wacom ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
name = "zathura-core-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
|
||||
sha1 = "d84878388969d523027a1661f49fd29638bd460b";
|
||||
sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
name = "zathura-pdf-poppler-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
|
||||
sha256 = "1x1n21naixb87g1knznjfjfibazzwbn1cv7d42kxgwlnf1p1wbzm";
|
||||
sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
dev = {
|
||||
version = "34.0.1809.0";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
|
||||
sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
|
||||
version = "34.0.1847.3";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.3.tar.xz";
|
||||
sha256 = "1jm9cr1qqfqd82fy3f1q4d0qg94vsrzyq8dbn4hrxyzqbjc4sclg";
|
||||
};
|
||||
beta = {
|
||||
version = "33.0.1750.46";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
|
||||
sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
|
||||
version = "33.0.1750.115";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
|
||||
sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
|
||||
};
|
||||
stable = {
|
||||
version = "32.0.1700.107";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.107.tar.xz";
|
||||
sha256 = "1bf1gbjf4r9nf3xdn7zgq0ny1ihak21ka4rkkiadxsg8aq9vdsqz";
|
||||
version = "33.0.1750.115";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.115.tar.xz";
|
||||
sha256 = "1whr5vz8w8h9la219ah1bcsa5r84jby306w12gfzlsbk9czxchrp";
|
||||
};
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ rec {
|
||||
"--disable-javaxpcom"
|
||||
] ++ commonConfigureFlags;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
#enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
|
||||
@ -2,17 +2,21 @@
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "rdesktop";
|
||||
version = "1.7.1";
|
||||
version = "1.8.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
||||
sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
|
||||
sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n";
|
||||
};
|
||||
|
||||
buildInputs = [openssl libX11];
|
||||
|
||||
configureFlags = [ "--with-openssl=${openssl}" ];
|
||||
configureFlags = [
|
||||
"--with-openssl=${openssl}"
|
||||
"--disable-credssp"
|
||||
"--disable-smartcard"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "rdesktop is an open source client for Windows Terminal Services";
|
||||
|
||||
@ -65,7 +65,7 @@ stdenv.mkDerivation {
|
||||
)
|
||||
'';
|
||||
|
||||
installPhase = ''make DESTDIR="$out" MKDIR_P="mkdir -p" install'';
|
||||
installPhase = ''make MKDIR_P="mkdir -p" install'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vlc-${version}";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
|
||||
sha256 = "1i4fzjv2x8mzx0bg52mgh1rrlircmb81jr58z90blbmww4mq36r1";
|
||||
sha256 = "04d1lr7lxrq2767rjy4j0wr3sirx5sf1s9wdl3p4x500r7z64dp0";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Cross-platform media player and streaming server";
|
||||
homepage = http://www.videolan.org/vlc/;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
version = "4.2.18"; # changes ./guest-additions as well
|
||||
version = "4.2.22"; # changes ./guest-additions as well
|
||||
|
||||
forEachModule = action: ''
|
||||
for mod in \
|
||||
@ -31,13 +31,13 @@ let
|
||||
'';
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
||||
extpackRevision = "88780";
|
||||
extpackRevision = "91556";
|
||||
extensionPack = requireFile rec {
|
||||
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
|
||||
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
|
||||
# VBoxExtPackHelperApp!
|
||||
# Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS
|
||||
sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba";
|
||||
# Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS
|
||||
sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a";
|
||||
message = ''
|
||||
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
|
||||
and Evaluation License (PUEL) by downloading the related binaries from:
|
||||
@ -56,7 +56,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||
sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74";
|
||||
sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
|
||||
sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
|
||||
|
||||
@ -23,6 +23,8 @@
|
||||
server admins start using the new version?
|
||||
*/
|
||||
|
||||
assert md5 != "" || sha256 != "";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "git-export";
|
||||
builder = ./builder.sh;
|
||||
|
||||
@ -66,6 +66,7 @@ in
|
||||
showURLs ? false
|
||||
}:
|
||||
|
||||
assert builtins.isList urls;
|
||||
assert urls != [] -> url == "";
|
||||
assert url != "" -> urls == [];
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "man-pages-3.54";
|
||||
name = "man-pages-3.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
|
||||
sha256 = "0rb75dl9hh4v2s95bcssy12j8qrbd2dmlzry68gphyxk5c7yipbl";
|
||||
sha256 = "0h4wzjcrz1hqbzwn1g0q11byzss7l4f1ynj7vzgbxar7z10gr5b6";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "terminology-${version}";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
|
||||
sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp";
|
||||
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
|
||||
sha256 = "1ing9l19h7f1f843rcabbjaynps1as4mpc31xz2adkafb3xd3wk3";
|
||||
};
|
||||
buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ];
|
||||
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
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,13 +1,15 @@
|
||||
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgee-0.13.4";
|
||||
name = "libgee-0.13.90";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz";
|
||||
sha256 = "1gzyx8gy5m6r8km3xbb1kszz0v3p9vsbzwb78pf3fw122gwbjj4k";
|
||||
sha256 = "9496f8fb249f7850db32b50e8675998db8b5276d4568cbf043faa7e745d7b7d6";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
patches = [ ./fix_introspection_paths.patch ];
|
||||
|
||||
buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
23
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
Normal file
23
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, intltool, fetchurl, pkgconfig, bash
|
||||
, itstool, libxml2, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yelp-xsl-3.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz";
|
||||
sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Yelp;
|
||||
description = "Yelp's universal stylesheets for Mallard and DocBook";
|
||||
maintainers = with maintainers; [ lethalman ];
|
||||
license = [licenses.gpl2 licenses.lgpl2];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
39
pkgs/desktops/gnome-3/core/yelp/default.nix
Normal file
39
pkgs/desktops/gnome-3/core/yelp/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
|
||||
, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
|
||||
, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yelp-3.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz";
|
||||
sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
|
||||
gnome3.gnome_icon_theme hicolor_icon_theme
|
||||
gnome3.gnome_icon_theme_symbolic ];
|
||||
|
||||
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
||||
|
||||
buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
|
||||
libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
|
||||
gnome3.gsettings_desktop_schemas ];
|
||||
|
||||
installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
|
||||
|
||||
postInstall = ''
|
||||
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache
|
||||
wrapProgram "$out/bin/yelp" \
|
||||
--set GDK_PIXBUF_MODULE_FILE `readlink -e $out/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}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Yelp;
|
||||
description = "Yelp is the help viewer in Gnome.";
|
||||
maintainers = with maintainers; [ lethalman ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@ rec {
|
||||
inherit (pkgs) glib gtk2 gtk3 gnome2;
|
||||
gtk = 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;
|
||||
inherit (pkgs) libsoup;
|
||||
|
||||
@ -20,6 +20,8 @@ rec {
|
||||
|
||||
dconf = callPackage ./core/dconf { };
|
||||
|
||||
epiphany = callPackage ./core/epiphany { };
|
||||
|
||||
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
|
||||
|
||||
evolution_data_server = callPackage ./core/evolution-data-server { };
|
||||
@ -36,8 +38,12 @@ rec {
|
||||
|
||||
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_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
|
||||
|
||||
gnome-menus = callPackage ./core/gnome-menus { };
|
||||
|
||||
gnome_keyring = callPackage ./core/gnome-keyring { };
|
||||
@ -58,6 +64,8 @@ rec {
|
||||
|
||||
gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
|
||||
|
||||
gucharmap = callPackage ./core/gucharmap { };
|
||||
|
||||
gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
|
||||
|
||||
eog = callPackage ./core/eog { };
|
||||
@ -84,6 +92,14 @@ rec {
|
||||
|
||||
vte = callPackage ./core/vte { };
|
||||
|
||||
vino = callPackage ./core/vino { };
|
||||
|
||||
yelp = callPackage ./core/yelp { };
|
||||
|
||||
yelp_xsl = callPackage ./core/yelp-xsl { };
|
||||
|
||||
yelp_tools = callPackage ./core/yelp-tools { };
|
||||
|
||||
zenity = callPackage ./core/zenity { };
|
||||
|
||||
|
||||
@ -107,6 +123,6 @@ rec {
|
||||
|
||||
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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureScript = "sh ./autogen.sh";
|
||||
|
||||
buildInputs = [ which gnome3.gnome_common autoconf automake libtool
|
||||
pkgconfig gtk_doc gobjectIntrospection libgit2 glib ];
|
||||
buildInputs = [ gnome3.gnome_common libtool pkgconfig
|
||||
gtk_doc gobjectIntrospection libgit2 glib ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
|
||||
|
||||
let
|
||||
branch = "4.10";
|
||||
# Need callPackageOrig to avoid infinite cycle
|
||||
kde = callPackageOrig ./kde-package {
|
||||
inherit release ignoreList extraSubpkgs callPackage;
|
||||
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||
};
|
||||
|
||||
# The list of igored individual modules
|
||||
@ -64,7 +65,7 @@ kde.modules // kde.individual //
|
||||
full = stdenv.lib.attrValues kde.modules;
|
||||
|
||||
l10n = callPackage ./l10n {
|
||||
inherit release;
|
||||
inherit release branch;
|
||||
inherit (kde.manifest) stable;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||
, release, ignoreList, extraSubpkgs
|
||||
, release, branch, ignoreList, extraSubpkgs
|
||||
}:
|
||||
|
||||
let
|
||||
@ -19,6 +19,7 @@ rec {
|
||||
# Default meta attribute
|
||||
defMeta = {
|
||||
homepage = http://www.kde.org;
|
||||
inherit branch;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (qt4.meta) maintainers;
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||
|
||||
let
|
||||
|
||||
@ -22,6 +22,7 @@ let
|
||||
|
||||
meta = {
|
||||
description = "KDE translation for ${lang}";
|
||||
inherit branch;
|
||||
license = "GPL";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (kdelibs.meta) maintainers homepage;
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
|
||||
|
||||
let
|
||||
branch = "4.11";
|
||||
|
||||
# Need callPackageOrig to avoid infinite cycle
|
||||
kde = callPackageOrig ./kde-package {
|
||||
inherit release ignoreList extraSubpkgs callPackage;
|
||||
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||
};
|
||||
|
||||
# The list of igored individual modules
|
||||
@ -36,7 +38,7 @@ kde.modules // kde.individual //
|
||||
full = stdenv.lib.attrValues kde.modules;
|
||||
|
||||
l10n = callPackage ./l10n {
|
||||
inherit release;
|
||||
inherit release branch;
|
||||
inherit (kde.manifest) stable;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||
, release, ignoreList, extraSubpkgs
|
||||
, release, branch, ignoreList, extraSubpkgs
|
||||
}:
|
||||
|
||||
let
|
||||
@ -19,6 +19,7 @@ rec {
|
||||
# Default meta attribute
|
||||
defMeta = {
|
||||
homepage = http://www.kde.org;
|
||||
inherit branch;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (qt4.meta) maintainers;
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||
|
||||
let
|
||||
|
||||
@ -22,6 +22,7 @@ let
|
||||
|
||||
meta = {
|
||||
description = "KDE translation for ${lang}";
|
||||
inherit branch;
|
||||
license = "GPL";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (kdelibs.meta) maintainers homepage;
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
|
||||
|
||||
let
|
||||
branch = "4.12";
|
||||
|
||||
# Need callPackageOrig to avoid infinite cycle
|
||||
kde = callPackageOrig ./kde-package {
|
||||
inherit release ignoreList extraSubpkgs callPackage;
|
||||
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||
};
|
||||
|
||||
# The list of igored individual modules
|
||||
@ -36,7 +38,7 @@ kde.modules // kde.individual //
|
||||
full = stdenv.lib.attrValues kde.modules;
|
||||
|
||||
l10n = callPackage ./l10n {
|
||||
inherit release;
|
||||
inherit release branch;
|
||||
inherit (kde.manifest) stable;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||
, release, ignoreList, extraSubpkgs
|
||||
, release, branch, ignoreList, extraSubpkgs
|
||||
}:
|
||||
|
||||
let
|
||||
@ -19,6 +19,7 @@ rec {
|
||||
# Default meta attribute
|
||||
defMeta = {
|
||||
homepage = http://www.kde.org;
|
||||
inherit branch;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (qt4.meta) maintainers;
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||
|
||||
let
|
||||
|
||||
@ -22,6 +22,7 @@ let
|
||||
|
||||
meta = {
|
||||
description = "KDE translation for ${lang}";
|
||||
inherit branch;
|
||||
license = "GPL";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (kdelibs.meta) maintainers homepage;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
|
||||
|
||||
let
|
||||
version = "0.12.3";
|
||||
version = "0.12.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "elixir-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
|
||||
sha256 = "1im00cki38ldsig93djlsap8zbgwv74kpgw7xg9l6ik2cbpk0131";
|
||||
sha256 = "0f9jbijby8alwn9yv1fncr2yn0pghdqsvixkdcd6s8yvjyhylm1l";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang rebar makeWrapper ];
|
||||
|
||||
@ -9,13 +9,12 @@ with stdenv.lib;
|
||||
let
|
||||
|
||||
majorVersion = "2.6";
|
||||
version = "${majorVersion}.8";
|
||||
version = "${majorVersion}.9";
|
||||
|
||||
# http://www.python.org/download/releases/2.6.8/
|
||||
# md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013
|
||||
# python 2.6 will receive security fixes until Oct 2013
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
||||
md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||
sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@ -8,11 +8,11 @@ with stdenv.lib;
|
||||
let
|
||||
|
||||
majorVersion = "2.7";
|
||||
version = "${majorVersion}.5";
|
||||
version = "${majorVersion}.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
||||
sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv";
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||
sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@ -17,7 +17,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
majorVersion = "3.3";
|
||||
version = "${majorVersion}.3";
|
||||
version = "${majorVersion}.4";
|
||||
|
||||
buildInputs = filter (p: p != null) [
|
||||
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
|
||||
@ -28,8 +28,8 @@ stdenv.mkDerivation {
|
||||
inherit majorVersion version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
||||
sha256 = "1jwd9pw7vx6xpjyi7iv5j3rwwkf3vzrwj36kcj1qh8zn2avfj9p5";
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
|
||||
sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
@ -1,25 +1,30 @@
|
||||
{ stdenv, fetchurl, pkgconfig, fftw, libsndfile, libsamplerate
|
||||
, python, alsaLib, jackaudio }:
|
||||
{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
|
||||
, libsndfile, pkgconfig, python
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aubio-0.3.2";
|
||||
name = "aubio-0.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://aubio.org/pub/${name}.tar.gz";
|
||||
sha256 = "1k8j2m8wdpa54hvrqy6nqfcx42x6nwa77hi3ym0n22k192q8f4yw";
|
||||
url = "http://aubio.org/pub/${name}.tar.bz2";
|
||||
sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig fftw libsndfile libsamplerate python
|
||||
# optional:
|
||||
alsaLib jackaudio
|
||||
];
|
||||
buildInputs = [
|
||||
alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
|
||||
];
|
||||
|
||||
meta = {
|
||||
configurePhase = "python waf configure --prefix=$out";
|
||||
|
||||
buildPhase = "python waf";
|
||||
|
||||
installPhase = "python waf install";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library for audio labelling";
|
||||
homepage = http://aubio.org/;
|
||||
license = "GPLv2";
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,21 +6,21 @@
|
||||
rec {
|
||||
|
||||
vampSDK = stdenv.mkDerivation {
|
||||
name = "vamp-sdk-2.2.1";
|
||||
name = "vamp-sdk-2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/vamp/vamp-plugin-sdk-2.2.1.tar.gz;
|
||||
sha256 = "09iw6gv8aqq5v322fhi872mrhjp0a2w63966g0mks4vhh84q252p";
|
||||
url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
|
||||
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";
|
||||
homepage = http://sourceforge.net/projects/vamp;
|
||||
license = "BSD";
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -62,6 +62,7 @@ stdenv.mkDerivation (rec {
|
||||
homepage = http://www.gnu.org/software/gnutls/;
|
||||
license = "LGPLv2.1+";
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -70,4 +71,15 @@ stdenv.mkDerivation (rec {
|
||||
(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
|
||||
# FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
|
||||
patches = [ ./guile-gnulib-includes.patch ];
|
||||
}))
|
||||
})
|
||||
|
||||
//
|
||||
|
||||
(stdenv.lib.optionalAttrs stdenv.isDarwin {
|
||||
# multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail.
|
||||
# the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db
|
||||
# discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html
|
||||
patches = [ ./fix_gnutls_x86_cpuid_s_multi_definitions.patch ];
|
||||
})
|
||||
|
||||
)
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001
|
||||
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
|
||||
Date: Mon, 10 Feb 2014 10:43:52 +0100
|
||||
Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol
|
||||
|
||||
---
|
||||
lib/accelerated/x86/aes-cbc-x86-aesni.c | 2 --
|
||||
lib/accelerated/x86/aes-cbc-x86-ssse3.c | 2 --
|
||||
lib/accelerated/x86/x86.h | 3 ++-
|
||||
3 files changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
|
||||
index 6d4526f..1a2681f 100644
|
||||
--- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
|
||||
+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
|
||||
@@ -39,8 +39,6 @@ struct aes_ctx {
|
||||
int enc;
|
||||
};
|
||||
|
||||
-unsigned int _gnutls_x86_cpuid_s[4];
|
||||
-
|
||||
static int
|
||||
aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
|
||||
{
|
||||
diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
|
||||
index ff24578..2b2440a 100644
|
||||
--- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
|
||||
+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
|
||||
@@ -39,8 +39,6 @@ struct aes_ctx {
|
||||
int enc;
|
||||
};
|
||||
|
||||
-unsigned int _gnutls_x86_cpuid_s[4];
|
||||
-
|
||||
static int
|
||||
aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc)
|
||||
{
|
||||
diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h
|
||||
index ae04d32..03fc8de 100644
|
||||
--- a/lib/accelerated/x86/x86.h
|
||||
+++ b/lib/accelerated/x86/x86.h
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+extern unsigned int _gnutls_x86_cpuid_s[4];
|
||||
+
|
||||
#if defined(ASM_X86)
|
||||
|
||||
void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
|
||||
@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void);
|
||||
(nettle_hash_digest_func *) digest_func \
|
||||
}
|
||||
|
||||
-
|
||||
#endif
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-bad-1.2.2";
|
||||
name = "gst-plugins-bad-1.2.3";
|
||||
|
||||
meta = {
|
||||
homepage = "http://gstreamer.freedesktop.org";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
|
||||
sha256 = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c";
|
||||
sha256 = "1317hik9fdmy300p7c2y3aw43y6v9dr8f1906zm7s876m48pjpar";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-base-1.2.2";
|
||||
name = "gst-plugins-base-1.2.3";
|
||||
|
||||
meta = {
|
||||
description = "Base plugins and helper libraries";
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
|
||||
sha256 = "fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69";
|
||||
sha256 = "1qfs4lv91ggcck61pw0ybn3gzvx4kl2vsd6lp8l6ky3hq8syrvb1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gstreamer-1.2.2";
|
||||
name = "gstreamer-1.2.3";
|
||||
|
||||
meta = {
|
||||
description = "Open source multimedia framework";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
|
||||
sha256 = "b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6";
|
||||
sha256 = "1syqn0kki5disx01q3y0z6p5qhr2a5g388wc6s649cw4lcbri6hg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-good-1.2.2";
|
||||
name = "gst-plugins-good-1.2.3";
|
||||
|
||||
meta = {
|
||||
homepage = "http://gstreamer.freedesktop.org";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
|
||||
sha256 = "6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81";
|
||||
sha256 = "0w74hms2zg0rnhilj9cbhx9wfiryrkcvhr1g90scrg8mllv3bcxz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
assert withSystemLibav -> libav != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-libav-1.2.2";
|
||||
name = "gst-libav-1.2.3";
|
||||
|
||||
meta = {
|
||||
homepage = "http://gstreamer.freedesktop.org";
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
|
||||
sha256 = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418";
|
||||
sha256 = "1mmwyp6wahrx73zxiv67bwh9dqp7fn86igy4rkv0vx2m17hzpizb";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optionalString withSystemLibav
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-ugly-1.2.2";
|
||||
name = "gst-plugins-ugly-1.2.3";
|
||||
|
||||
meta = {
|
||||
homepage = "http://gstreamer.freedesktop.org";
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
|
||||
sha256 = "4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3";
|
||||
sha256 = "0fzbazgqrbyckbh2xqlzslzmm638bddp1fw8cc19kr7f0xv0lysk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "JuicyPixels";
|
||||
version = "3.1.3.2";
|
||||
sha256 = "0c0vavqisljsl8v8hvmxj8q3hmjq5layanbbyp0zcbj6yxv8s62a";
|
||||
version = "3.1.3.3";
|
||||
sha256 = "1j1kdr6x7rhpa45is04haxgf4i2jghcgak4km0f2i0k3pyiv647x";
|
||||
buildDepends = [
|
||||
binary deepseq mtl primitive transformers vector zlib
|
||||
];
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bert";
|
||||
version = "1.2.2";
|
||||
sha256 = "1dlq9fl5d2adprcybs4d4cyhj9q2c1l4kcc6vnnyhbyn201gxgpn";
|
||||
version = "1.2.2.1";
|
||||
sha256 = "1x23grykamyclx6a5jzyqwp3hwr2ma61zvmz89f3cj06sa49cgs0";
|
||||
buildDepends = [
|
||||
binary binaryConduit conduit mtl network networkConduit parsec time
|
||||
void
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "charset";
|
||||
version = "0.3.6";
|
||||
sha256 = "1g8m8nd5f100jlhvs6hbny96wy8iaggmp1lv36a5jxc54gmyxjd1";
|
||||
version = "0.3.7";
|
||||
sha256 = "1x912dx5650x8ql3ivhpiwmxd6kv7zghark3s8ljvl1g3qr1pxd6";
|
||||
buildDepends = [ semigroups unorderedContainers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/charset";
|
||||
|
||||
19
pkgs/development/libraries/haskell/chunked-data/default.nix
Normal file
19
pkgs/development/libraries/haskell/chunked-data/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath
|
||||
, text, transformers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "chunked-data";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l";
|
||||
buildDepends = [
|
||||
blazeBuilder monoTraversable semigroups systemFilepath text
|
||||
transformers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/fpco/chunked-data";
|
||||
description = "Typeclasses for dealing with various chunked data representations";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,14 +1,15 @@
|
||||
{ cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck
|
||||
, resourcet, systemFileio, transformers, void
|
||||
{ cabal, classyPrelude, conduit, conduitCombinators, hspec
|
||||
, monadControl, QuickCheck, resourcet, systemFileio, transformers
|
||||
, void
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude-conduit";
|
||||
version = "0.7.0";
|
||||
sha256 = "0njhfqbcbsy1rv61fc4xqzqlb68hzqg9cr31f8bs6h7pa12n38zq";
|
||||
version = "0.8.0";
|
||||
sha256 = "1br2gjzafxgq6ksxl895m5acaffnswd1dhcjppx6gnyfa6i3fq1m";
|
||||
buildDepends = [
|
||||
classyPrelude conduit monadControl resourcet systemFileio
|
||||
transformers void
|
||||
classyPrelude conduit conduitCombinators monadControl resourcet
|
||||
systemFileio transformers void
|
||||
];
|
||||
testDepends = [ conduit hspec QuickCheck transformers ];
|
||||
meta = {
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase
|
||||
, monadControl, monoTraversable, QuickCheck, semigroups
|
||||
{ cabal, basicPrelude, chunkedData, enclosedExceptions, hashable
|
||||
, hspec, liftedBase, monoTraversable, QuickCheck, semigroups
|
||||
, systemFilepath, text, time, transformers, unorderedContainers
|
||||
, vector, vectorInstances
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude";
|
||||
version = "0.7.0";
|
||||
sha256 = "19n2kzzskrdwyacq14y8gf1avcy7clp7gzqh36dhw7pypy3x0k9n";
|
||||
version = "0.8.0";
|
||||
sha256 = "02zf6v7a6bjf9z391bravx10mw0w4m4p5b78zap08z2i6fk5h91g";
|
||||
buildDepends = [
|
||||
async basicPrelude deepseq hashable liftedBase monadControl
|
||||
basicPrelude chunkedData enclosedExceptions hashable liftedBase
|
||||
monoTraversable semigroups systemFilepath text time transformers
|
||||
unorderedContainers vector vectorInstances
|
||||
];
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
|
||||
, primitive, silently, systemFileio, systemFilepath, text
|
||||
, transformers, transformersBase, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit-combinators";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0m4qfcm66likasvsvfriw8xiz5ibqhq5sk1wiwx0gk2d1qcnb3wx";
|
||||
buildDepends = [
|
||||
chunkedData conduit monoTraversable primitive systemFileio
|
||||
systemFilepath text transformers transformersBase vector
|
||||
];
|
||||
testDepends = [
|
||||
basicPrelude chunkedData hspec monoTraversable silently text
|
||||
transformers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/fpco/conduit-combinators";
|
||||
description = "Commonly used conduit functions, for both chunked and unchunked data";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,14 +1,15 @@
|
||||
{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, QuickCheck
|
||||
, resourcet, text, transformers, transformersBase, void
|
||||
, resourcet, text, textStreamDecode, transformers, transformersBase
|
||||
, void
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "1.0.13.1";
|
||||
sha256 = "0kxfck6d72fdnymf2rj6m7h97svq1d2fq1ss5mlhsrks5fflia9y";
|
||||
version = "1.0.15";
|
||||
sha256 = "1ciys2b7a6n5k0ld66wpjxnrs5ys5dvg9n5k8282bc5zsd54mb59";
|
||||
buildDepends = [
|
||||
liftedBase mmorph monadControl mtl resourcet text transformers
|
||||
transformersBase void
|
||||
liftedBase mmorph monadControl mtl resourcet text textStreamDecode
|
||||
transformers transformersBase void
|
||||
];
|
||||
testDepends = [
|
||||
hspec mtl QuickCheck resourcet text transformers void
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ cabal, attoparsec, hspec, HUnit, QuickCheck, text }:
|
||||
{ cabal, attoparsec, hspec, QuickCheck, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "css-text";
|
||||
version = "0.1.1";
|
||||
sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y";
|
||||
version = "0.1.2.0.1";
|
||||
sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp";
|
||||
buildDepends = [ attoparsec text ];
|
||||
testDepends = [ attoparsec hspec HUnit QuickCheck text ];
|
||||
testDepends = [ attoparsec hspec QuickCheck text ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/";
|
||||
description = "CSS parser and renderer";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dbus";
|
||||
version = "0.10.5";
|
||||
sha256 = "1wblqkwlwv3bxhz2n4qm0w0npawng86y2hyacjxmx8cw25gkw41x";
|
||||
version = "0.10.6";
|
||||
sha256 = "0jbysa7czhp7yl3fb6sxiqppg8yb3cdk4v8hcs4y8yzwjj0lm7mf";
|
||||
buildDepends = [
|
||||
cereal libxmlSax network parsec random text transformers vector
|
||||
xmlTypes
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dns";
|
||||
version = "1.0.0";
|
||||
sha256 = "16h7c332qdj77dw8kvrdn1jzhzsnrcybbbm5x7pxvgpnn0wzz8si";
|
||||
version = "1.1.1";
|
||||
sha256 = "1vyi0rqddaqpnh87gjracp0j3f7ai18qzr6zl6rjkszw3zfngww9";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecConduit binary blazeBuilder conduit iproute
|
||||
mtl network networkConduit random
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
{ cabal, async, deepseq, hspec, liftedBase, monadControl
|
||||
, QuickCheck, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "enclosed-exceptions";
|
||||
version = "1.0.0.1";
|
||||
sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0";
|
||||
buildDepends = [
|
||||
async deepseq liftedBase monadControl transformers
|
||||
];
|
||||
testDepends = [
|
||||
async deepseq hspec liftedBase monadControl QuickCheck transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/jcristovao/enclosed-exceptions";
|
||||
description = "Catching all exceptions from within an enclosed computation";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,13 +1,15 @@
|
||||
{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec
|
||||
, HUnit, parsec, shakespeare, text
|
||||
, HUnit, parsec, shakespeare, systemFileio, systemFilepath, text
|
||||
, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hamlet";
|
||||
version = "1.1.7.7";
|
||||
sha256 = "1qwx0gn367gp2a4kb1q3xc23addjyawr9gvs7bzv8vfx5xnkxglx";
|
||||
version = "1.1.8";
|
||||
sha256 = "093igcaycg2d29ncj9l8qbzi21drynjk8kvqfl70zqvgsm8nai7x";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
|
||||
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare
|
||||
systemFileio systemFilepath text time
|
||||
];
|
||||
testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ];
|
||||
meta = {
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hit";
|
||||
version = "0.5.4";
|
||||
sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz";
|
||||
version = "0.5.5";
|
||||
sha256 = "18k2fgwflzs2lpkhxg2xvni3l9cdn3hk9ajrd4flz12j7vp0ga4c";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "2.0.0.5";
|
||||
sha256 = "1vgfg2jgr7gavfbys33rd2l0dxyqk7ig7v357jhy8imxsm0xykp9";
|
||||
version = "2.0.0.6";
|
||||
sha256 = "0jgv17cxf8javcy4vcaayw9ajbr7dj43pba23xr6416hs6cv21hl";
|
||||
buildDepends = [
|
||||
conduit httpClient httpClientConduit httpClientTls httpTypes
|
||||
liftedBase resourcet transformers
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user