Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-09-03 11:15:58 -07:00
commit 86ebd3ee25
202 changed files with 3206 additions and 3631 deletions

View File

@ -33,8 +33,10 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 14.12 release](https://hydra.nixos.org/jobset/nixos/release-14.12)
* [Continuous package builds for 15.09 release](https://hydra.nixos.org/jobset/nixos/release-15.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 14.12 release](https://hydra.nixos.org/job/nixos/release-14.12/tested#tabs-constituents)
* [Tests for 15.09 release](https://hydra.nixos.org/job/nixos/release-15.09/tested#tabs-constituents)
Communication:

View File

@ -143,6 +143,7 @@
kragniz = "Louis Taylor <kragniz@gmail.com>";
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
lassulus = "Lassulus <lassulus@gmail.com>";
layus = "Guillaume Maudoux <layus.on@gmail.com>";
lebastr = "Alexander Lebedev <lebastr@gmail.com>";
leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
lethalman = "Luca Bruno <lucabru@src.gnome.org>";

View File

@ -61,6 +61,12 @@ by default because its not free software. You can enable it as follows:
<programlisting>
services.xserver.videoDrivers = [ "nvidia" ];
</programlisting>
Or if you have an older card, you may have to use one of the legacy drivers:
<programlisting>
services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
services.xserver.videoDrivers = [ "nvidiaLegacy173" ];
</programlisting>
You may need to reboot after enabling this driver to prevent a clash
with other kernel modules.</para>

View File

@ -107,4 +107,30 @@ newer Nix version, which may involve an upgrade of Nixs database
schema. This cannot be undone easily, so in that case you will not be
able to go back to your original channel.</para></warning>
<section><title>Automatic Upgrades</title>
<para>You can keep a NixOS system up-to-date automatically by adding
the following to <filename>configuration.nix</filename>:
<programlisting>
system.autoUpgrade.enable = true;
</programlisting>
This enables a periodically executed systemd service named
<literal>nixos-upgrade.service</literal>. It runs
<command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to
the latest version in the current channel. (To see when the service
runs, see <command>systemctl list-timers</command>.) You can also
specify a channel explicitly, e.g.
<programlisting>
system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09;
</programlisting>
</para>
</section>
</chapter>

View File

@ -9,6 +9,7 @@
<para>This section lists the release notes for each stable version of NixOS
and current unstable revision.</para>
<xi:include href="rl-unstable.xml" />
<xi:include href="rl-1509.xml" />
<xi:include href="rl-1412.xml" />
<xi:include href="rl-1404.xml" />

View File

@ -0,0 +1,27 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-unstable">
<title>Unstable</title>
<para>When upgrading from a previous release, please be aware of the
following incompatible changes:
<itemizedlist>
<listitem><para>
<command>wmiiSnap</command> has been replaced with
<command>wmii_hg</command>, but
<command>services.xserver.windowManager.wmii.enable</command>
has been updated respectively so this only affects you if you
have explicitly installed <command>wmiiSnap</command>.
</para></listitem>
<listitem><para>
<command>wmiimenu</command> is removed, as it has been removed by
the developers upstream. Use <command>wimenu</command> from the
<command>wmii-hg</command> package.
</para></listitem>
</itemizedlist>
</para>
</section>

View File

@ -54,11 +54,6 @@ in rec {
# These are the extra arguments passed to every module. In
# particular, Nixpkgs is passed through the "pkgs" argument.
# FIXME: we enable config.allowUnfree to make packages like
# nvidia-x11 available. This isn't a problem because if the user has
# nixpkgs.config.allowUnfree = false, then evaluation will fail on
# the 64-bit package anyway. However, it would be cleaner to respect
# nixpkgs.config here.
extraArgs = extraArgs_ // {
inherit modules baseModules;
};

View File

@ -216,7 +216,7 @@ let
exist. If <option>users.mutableUsers</option> is true, the
password can be changed subsequently using the
<command>passwd</command> command. Otherwise, it's
equivalent to setting the <option>password</option> option.
equivalent to setting the <option>hashedPassword</option> option.
${hashedPasswordDescription}
'';
@ -336,13 +336,13 @@ let
map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
user.subUidRanges);
subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers));
subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.users));
mkSubgidEntry = user: concatStrings (
map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
user.subGidRanges);
subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers));
subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.users));
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
let
@ -354,8 +354,8 @@ let
else { dup = false; acc = newAcc; }
) { dup = false; acc = {}; } (builtins.attrNames set)).dup;
uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.extraUsers) "uid";
gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.extraGroups) "gid";
uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.users) "uid";
gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.groups) "gid";
spec = pkgs.writeText "users-groups.json" (builtins.toJSON {
inherit (cfg) mutableUsers;
@ -364,13 +364,13 @@ let
name uid group description home shell createHome isSystemUser
password passwordFile hashedPassword
initialPassword initialHashedPassword;
}) cfg.extraUsers;
}) cfg.users;
groups = mapAttrsToList (n: g:
{ inherit (g) name gid;
members = g.members ++ (mapAttrsToList (n: u: u.name) (
filterAttrs (n: u: elem g.name u.extraGroups) cfg.extraUsers
filterAttrs (n: u: elem g.name u.extraGroups) cfg.users
));
}) cfg.extraGroups;
}) cfg.groups;
});
in {
@ -388,10 +388,10 @@ in {
<literal>groupadd</literal> commands. On system activation, the
existing contents of the <literal>/etc/passwd</literal> and
<literal>/etc/group</literal> files will be merged with the
contents generated from the <literal>users.extraUsers</literal> and
<literal>users.extraGroups</literal> options.
contents generated from the <literal>users.users</literal> and
<literal>users.groups</literal> options.
The initial password for a user will be set
according to <literal>users.extraUsers</literal>, but existing passwords
according to <literal>users.users</literal>, but existing passwords
will not be changed.
<warning><para>
@ -399,7 +399,7 @@ in {
group files will simply be replaced on system activation. This also
holds for the user passwords; all changed
passwords will be reset according to the
<literal>users.extraUsers</literal> configuration on activation.
<literal>users.users</literal> configuration on activation.
</para></warning>
'';
};
@ -412,7 +412,7 @@ in {
'';
};
users.extraUsers = mkOption {
users.users = mkOption {
default = {};
type = types.loaOf types.optionSet;
example = {
@ -433,7 +433,7 @@ in {
options = [ userOpts ];
};
users.extraGroups = mkOption {
users.groups = mkOption {
default = {};
example =
{ students.gid = 1001;
@ -461,7 +461,7 @@ in {
config = {
users.extraUsers = {
users.users = {
root = {
uid = ids.uids.root;
description = "System administrator";
@ -478,7 +478,7 @@ in {
};
};
users.extraGroups = {
users.groups = {
root.gid = ids.gids.root;
wheel.gid = ids.gids.wheel;
disk.gid = ids.gids.disk;
@ -525,6 +525,27 @@ in {
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
message = "UIDs and GIDs must be unique!";
}
{ # If mutableUsers is false, to prevent users creating a
# configuration that locks them out of the system, ensure that
# there is at least one "privileged" account that has a
# password or an SSH authorized key. Privileged accounts are
# root and users in the wheel group.
assertion = !cfg.mutableUsers ->
any id (mapAttrsToList (name: cfg:
(name == "root"
|| cfg.group == "wheel"
|| elem "wheel" cfg.extraGroups)
&&
((cfg.hashedPassword != null && cfg.hashedPassword != "!")
|| cfg.password != null
|| cfg.passwordFile != null
|| cfg.openssh.authorizedKeys.keys != []
|| cfg.openssh.authorizedKeys.keyFiles != [])
) cfg.users);
message = ''
Neither the root account nor any wheel user has a password or SSH authorized key.
You must set one to prevent being locked out of your system.'';
}
];
};

View File

@ -4,6 +4,11 @@
_module.args = {
pkgs_i686 = import ../../.. {
system = "i686-linux";
# FIXME: we enable config.allowUnfree to make packages like
# nvidia-x11 available. This isn't a problem because if the user has
# nixpkgs.config.allowUnfree = false, then evaluation will fail on
# the 64-bit package anyway. However, it would be cleaner to respect
# nixpkgs.config here.
config.allowUnfree = true;
};

View File

@ -75,7 +75,7 @@ with lib;
mkDefault (if pathExists fn then readFile fn else "master");
# Note: code names must only increase in alphabetical order.
system.nixosCodeName = "Dingo";
system.nixosCodeName = "Emu";
# Generate /etc/os-release. See
# http://0pointer.de/public/systemd-man/os-release.html for the

View File

@ -57,9 +57,9 @@ in
if [ $? = 126 ]; then
"$@"
fi
else
else
# Indicate than there was an error so ZSH falls back to its default handler
return 127
return 127
fi
}
'';

View File

@ -30,11 +30,11 @@ The program $program is currently not installed. It is provided by
the package $package, which I will now install for you.
EOF
;
exit 126 if system("nix-env", "-i", $package) == 0;
exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
} else {
print STDERR <<EOF;
The program $program is currently not installed. You can install it by typing:
nix-env -i $package
nix-env -iA nixos.$package
EOF
}
} else {
@ -42,7 +42,7 @@ EOF
The program $program is currently not installed. It is provided by
several packages. You can install it by typing one of the following:
EOF
print STDERR " nix-env -i $_->{package}\n" foreach @$res;
print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res;
}
exit 127;

View File

@ -77,6 +77,8 @@ in zipModules ([]
++ obsolete [ "environment" "nix" ] [ "nix" "package" ]
++ obsolete [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ]
++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]
++ alias [ "users" "extraUsers" ] [ "users" "users" ]
++ alias [ "users" "extraGroups" ] [ "users" "groups" ]
++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]
++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]

View File

@ -88,10 +88,7 @@ in
environment.systemPackages = [ pkgs.nfs-utils ];
environment.etc = singleton
{ source = exports;
target = "exports";
};
environment.etc.exports.source = exports;
boot.kernelModules = [ "nfsd" ];

View File

@ -214,7 +214,7 @@ in
};
users.extraUsers = mkOption {
users.users = mkOption {
options = [ userOptions ];
};

View File

@ -36,9 +36,7 @@ in
dataDir = mkOption {
default = "/var/lib/syncthing";
description = ''
Path where the `.syncthing` (settings and keys) and `Sync`
(your synced files) directories will exist. This can be your home
directory.
Path where the settings and keys will exist.
'';
};
@ -57,18 +55,12 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.STNORESTART = "placeholder"; # do not self-restart
environment.HOME = "${cfg.dataDir}";
serviceConfig = {
User = "${cfg.user}";
PermissionsStartOnly = true;
Restart = "always";
ExecStart = "${pkgs.syncthing}/bin/syncthing -home=${cfg.dataDir}/.syncthing";
ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}";
};
preStart = ''
mkdir -p ${cfg.dataDir}
chown ${cfg.user} ${cfg.dataDir}
'';
};
environment.systemPackages = [ pkgs.syncthing ];

View File

@ -62,6 +62,7 @@ in
waitPID=$!
'';
}];
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidPrograms = [ "e19_freqset" ];

View File

@ -111,6 +111,7 @@ in
exec ${kde_workspace}/bin/startkde
'';
};
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton
{ program = "kcheckpass";

View File

@ -78,6 +78,7 @@ in
bgSupport = true;
start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
};
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton {
program = "kcheckpass";

View File

@ -25,7 +25,8 @@ in
waitPID=$!
'';
}];
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages = [ pkgs.kodi ];
};
}
}

View File

@ -37,6 +37,7 @@ in
exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
'';
};
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages =
[ pkgs.gtk # To get GTK+'s themes.

View File

@ -62,7 +62,7 @@ let
if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
export _INHIBITION_LOCK_TAKEN=1
if ! ${config.systemd.package}/bin/loginctl show-session $XDG_SESSION_ID | grep -q '^RemoteHost='; then
exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information." "$0" "$sessionType"
exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="Desktop environment handles power events" "$0" "$sessionType"
fi
fi
@ -161,7 +161,11 @@ let
exit 0
'';
mkDesktops = names: pkgs.runCommand "desktops" {}
mkDesktops = names: pkgs.runCommand "desktops"
{ # trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
}
''
mkdir -p $out
${concatMapStrings (n: ''
@ -225,7 +229,7 @@ in
desktopManagerHandlesLidAndPower = mkOption {
type = types.bool;
default = true;
default = false;
description = ''
Whether the display manager should prevent systemd from handling
lid and power events. This is normally handled by the desktop

View File

@ -1,47 +1,43 @@
{ config, lib, pkgs, ... }:
with lib;
{ config, lib, pkgs, options, modulesPath }:
let
inherit (lib) mkOption mkIf singleton;
cfg = config.services.xserver.windowManager.wmii;
wmii = pkgs.wmii_hg;
in
{
options = {
services.xserver.windowManager.wmii.enable = mkOption {
default = false;
example = true;
description = "Enable the wmii window manager.";
};
};
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton
# stop wmii by
# $wmiir xwrite /ctl quit
# this will cause wmii exiting with exit code 0
# (or "mod+a quit", which is bound to do the same thing in wmiirc
# by default)
#
# why this loop?
# wmii crashes once a month here. That doesn't matter that much
# wmii can recover very well. However without loop the x session terminates and then your workspace setup is
# lost and all applications running on X will terminate.
# wmii can recover very well. However without loop the X session
# terminates and then your workspace setup is lost and all
# applications running on X will terminate.
# Another use case is kill -9 wmii; after rotating screen.
# Note: we don't like kill for that purpose. But it works (-> subject "wmii and xrandr" on mailinglist)
# Note: we don't like kill for that purpose. But it works (->
# subject "wmii and xrandr" on mailinglist)
{ name = "wmii";
start = ''
while :; do
${pkgs.wmiiSnap}/bin/wmii && break
${wmii}/bin/wmii && break
done
'';
};
environment.systemPackages = [ pkgs.wmiiSnap ];
environment.systemPackages = [ wmii ];
};
}

View File

@ -643,6 +643,10 @@ in
if ! [ -e /etc/machine-id ]; then
${systemd}/bin/systemd-machine-id-setup
fi
# Keep a persistent journal. Note that systemd-tmpfiles will
# set proper ownership/permissions.
mkdir -m 0700 -p /var/log/journal
'';
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;

View File

@ -128,6 +128,6 @@ in {
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
services.virtualboxGuest.enable = true;
virtualisation.virtualbox.guest.enable = true;
};
}

View File

@ -6,7 +6,7 @@ let
{ config, pkgs, ... }:
{ fileSystems = pkgs.lib.mkVMOverride
[ { mountPoint = "/data";
device = "server:${if version == 4 then "/" else "/data"}";
device = "server:/data";
fsType = "nfs";
options = "vers=${toString version}";
}

View File

@ -1,11 +1,11 @@
# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks
# the default Qt audio capture source!
{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full
, alsaSupport ? false, alsaLib ? null
, jackSupport ? false, libjack2 ? null }:
{ stdenv, fetchFromGitHub, fftw, freeglut, qt5
, alsaSupport ? true, alsaLib ? null
, jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }:
assert alsaSupport -> alsaLib != null;
assert jackSupport -> libjack2 != null;
assert portaudioSupport -> portaudio != null;
let version = "1.0.8"; in
stdenv.mkDerivation {
@ -18,9 +18,10 @@ stdenv.mkDerivation {
owner = "gillesdegottex";
};
buildInputs = [ fftw freeglut qt5Full ]
buildInputs = [ fftw freeglut qt5.base qt5.multimedia ]
++ stdenv.lib.optional alsaSupport [ alsaLib ]
++ stdenv.lib.optional jackSupport [ libjack2 ];
++ stdenv.lib.optional jackSupport [ libjack2 ]
++ stdenv.lib.optional portaudioSupport [ portaudio ];
configurePhase = ''
mkdir build
@ -28,6 +29,7 @@ stdenv.mkDerivation {
qmake \
CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \
PREFIX="$out" PREFIXSHORTCUT="$out" \
../fmit.pro
'';

View File

@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip";
name = "helmholtz.zip";
curlOpts = "--user-agent ''";
sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
};

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
let version = "5401"; in
let version = "5417"; in
stdenv.mkDerivation {
name = "praat-${version}";
src = fetchurl {
url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz";
sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3";
sha256 = "1bspl963pb1s6k3cd9p3g5j518pxg6hkrann945lqsrvbzaa20kl";
};
configurePhase = ''

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation (rec {
libsndfile libsamplerate perl makedepend libjack2 ]
++ stdenv.lib.optional withLirc [ lirc ];
enableParallelBuilding = true;
#enableParallelBuilding = true; issues on hydra
meta = with stdenv.lib; {
homepage = http://www.rosegardenmusic.com/;

View File

@ -16,11 +16,11 @@ let
};
in stdenv.mkDerivation rec {
name = "atom-${version}";
version = "1.0.0";
version = "1.0.10";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e";
sha256 = "16rbp76c46n24a9a3cygg94bx6y7j038h34w4qr7j24aiy5bfzwv";
name = "${name}.deb";
};

View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
emacsName = "emacs-24.5";
name = "${emacsName}-mac-5.9";
name = "${emacsName}-mac-5.10";
#builder = ./builder.sh;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr";
sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf";
};
buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];

View File

@ -1,13 +1,14 @@
{stdenv, fetchurl, emacs}:
let version = "1.5.0";
in stdenv.mkDerivation {
let
version = "2.11.0";
in
stdenv.mkDerivation {
name = "emacs-dash-${version}";
src = fetchurl {
url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
sha256 = "0c6jknzy306vn22vqlabxkwxfnllrd33spymi74fkirbxaxvp8kp";
sha256 = "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q";
};
buildInputs = [ emacs ];

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, emacs }:
let
version = "0.15.0-8-g4e10851";
version = "1.2.0";
in
stdenv.mkDerivation {
name = "git-modes-${version}";
@ -9,8 +9,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
rev = "4e10851843145e0c05fc665683d3b487a57ad114";
sha256 = "13j794a2p4ql9dnw2z0c1m0ybclxsicbk8cmmfqcchs4ygiyc6ag";
rev = version;
sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
};
buildInputs = [ emacs ];

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, emacs, texinfo }:
let
version = "13.14-153-g318ccab"; # git describe --tags
version = "13.14-169-g0d3569d"; # git describe --tags
in
stdenv.mkDerivation {
name = "haskell-mode-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "haskell";
repo = "haskell-mode";
rev = "v${version}";
sha256 = "1n08fmaf7q13y68xyzs4h686hvb7n5mdyvn1zy81d7gh0m5013k4";
sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k";
};
buildInputs = [ emacs texinfo ];

View File

@ -1,33 +1,41 @@
{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }:
{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
stdenv.mkDerivation rec {
name = "magit-90141025";
let
version = "2.2.1";
in
stdenv.mkDerivation {
name = "magit-${version}";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9";
sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk";
rev = version;
sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz";
};
buildInputs = [ emacs texinfo git ];
propagatedUserEnvPkgs = [ gitModes ];
propagatedUserEnvPkgs = [ gitModes dash ];
configurePhase = ''
makeFlagsArray=(
PREFIX="$out"
EFLAGS="-L ${gitModes}/share/emacs/site-lisp"
lispdir="$out/share/emacs/site-lisp"
DASH_DIR="${dash}/share/emacs/site-lisp"
VERSION="${version}"
)
make ''${makeFlagsArray[@]} -C lisp magit-version.el
cp lisp/magit-version.el Documentation/
cp lisp/magit-version.el .
'';
doCheck = true;
doCheck = false; # one out of 5 tests fails, not sure why
checkTarget = "test";
preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
postInstall = ''
mkdir -p $out/bin
mv "bin/"* $out/bin/
'';
# postInstall = ''
# mkdir -p $out/bin
# mv "bin/"* $out/bin/
# '';
meta = {
homepage = "https://github.com/magit/magit";

View File

@ -4,22 +4,19 @@
}:
let
version = "6.9.1-0";
arch =
if stdenv.system == "i686-linux" then "i686"
else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
else throw "ImageMagick is not supported on this platform.";
in
stdenv.mkDerivation rec {
name = "imagemagick-${version}";
version = "6.9.2-0";
src = fetchurl {
url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz";
sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j";
sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
};
outputs = [ "out" "doc" ];
@ -43,7 +40,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs =
[ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';
postInstall = ''
(cd "$out/include" && ln -s ImageMagick* ImageMagick)
'' + lib.optionalString (ghostscript != null) ''
for la in $out/lib/*.la; do
sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la
done
'';
meta = with stdenv.lib; {
homepage = http://www.imagemagick.org/;

View File

@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
broken = stdenv.isLinux && stdenv.isi686;
};
}

View File

@ -0,0 +1,58 @@
{ stdenv, fetchurl, dpkg, bash, python27Packages }:
let
py = python27Packages;
in
stdenv.mkDerivation rec {
name = "cura-lulzbot";
version = "15.02.1-1.03-5064";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb";
sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb";
sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1";
}
else throw "${name} is not supported on ${stdenv.system}";
python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
pythonPath = python_deps;
propagatedBuildInputs = python_deps;
buildInputs = [ dpkg bash py.wrapPython ];
phases = [ "unpackPhase" "installPhase" ];
unpackPhase = "dpkg-deb -x ${src} ./";
installPhase = ''
mkdir -p $out/bin
cp -r usr/share $out/share
find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \;
cat <<EOT > $out/bin/cura
#!${bash}/bin/bash
PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@"
EOT
chmod 555 $out/bin/cura
'';
meta = with stdenv.lib; {
description = "3D printing host software for the Lulzbot";
longDescription = ''
Cura LulzBot Edition is a fork of the 3D printing/slicing
software from Ultimaker, with changes to support 3D printers
from Aleph Objects.
'';
homepage = https://www.lulzbot.com/cura/;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pjones ];
};
}

View File

@ -5,8 +5,8 @@
let
mupdf_src = fetchurl {
url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz;
sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4";
url = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz;
sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq";
};
tess_src = fetchurl {
@ -21,10 +21,10 @@ let
in stdenv.mkDerivation rec {
name = "k2pdfopt-${version}";
version = "2.30";
version = "2.32";
src = fetchzip {
url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip";
sha256 = "1fjjznkplrbyrg48wbij4kqgkz9i5icq7savl6brsf9haahdz6q5";
sha256 = "1v3cj5bwpjvy7s66sfqcmkxs91f7nxaykjpdjm2wn87vn6q7n19m";
};
buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib
@ -41,8 +41,8 @@ in stdenv.mkDerivation rec {
plibs=`pwd`/patched_libraries
tar zxf ${mupdf_src}
cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/
cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf
cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.6-source/source/fitz/
cp $src/mupdf_mod/pdf-* mupdf-1.6-source/source/pdf
tar zxf ${tess_src}
cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
make libs
cp src/libPgm2asc.a $plibs/lib
cd ../mupdf-1.5-source
cd ../mupdf-1.6-source
make prefix=$plibs install
install -Dm644 build/debug/libmujs.a $plibs/lib

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "0.7.76";
version = "0.7.77";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "0.7.76";
version = "0.7.77";
name = "mediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];

View File

@ -1,40 +0,0 @@
{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }:
with stdenv.lib;
let
nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
neededNatives = [ libusb1 pkgconfig python utillinux ];
self = nodePackages;
generated = ./package.nix;
};
in nodePackages.buildNodePackage rec {
name = "tessel-0.3.16";
bin = true;
src = [
(fetchurl {
url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz";
name = "tessel-0.3.16.tgz";
sha1 = "900a8d897ba03d7a9d5927697180284772d70738";
})
];
deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
postInstall = ''
mkdir -p $out/etc/udev/rules.d
cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/
'';
passthru.names = [ "tessel" ];
meta = {
description = "Command line tools and programmatic access library for Tessel devices";
homepage = https://tessel.io;
license = licenses.mit;
maintainers = with maintainers; [ goibhniu ];
platforms = with platforms; linux;
};
}

File diff suppressed because it is too large Load Diff

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "xca-${version}";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "mirror://sourceforge/xca/${name}.tar.gz";
sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg";
sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2";
};
postInstall = ''

View File

@ -1,21 +1,21 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
version = "46.0.2486.0";
sha256 = "19p99lnmpizmhdlr73z43jjaip95kv5y6nj5yqni9dfbjnlb7cah";
sha256bin32 = "1sxfszv50yw6vjd9mj9xc2crf51slsllhwnhlfp2qhg7l3f1l9a9";
sha256bin64 = "0262jlpz4869w6nqc3aadygl5byldg5h8ivwwcz8v1dzjwm7nlhy";
version = "47.0.2498.0";
sha256 = "1dvp7wwfbdzyvbqcfn538gf0dk6w6gc88nms0wl0ir4ka7rf7mz1";
sha256bin32 = "15jsmvhyzscf6g6czkg5vxzyj7vnkndmsapx0xf8hlw8d5zw3nq7";
sha256bin64 = "1mx605dh93ak0p68rrpb6xf46jygggk0jwj7k6ks21l4wnxha8d5";
};
beta = {
version = "45.0.2454.46";
sha256 = "14q5bsiw7ns4gwgpqlw8mcl500n13wq8v7p34v0gj2fazm948j37";
sha256bin32 = "0cqw11sg4w665b50nybcg189wj78lr9h9amh5nqzi1qdqsk9vn8w";
sha256bin64 = "1lm8ykpcbzcbmiyj2z35l6ypx1ahi7asqkzkdavnrqawjafskygc";
version = "45.0.2454.78";
sha256 = "1n3yp0jm3jqyw0xwji1451qjjpkvpsqabn7d2r9fj75gspsiwv6z";
sha256bin32 = "11x8f2nyhf4n1jdd8npvr3ddkp3himi6lxpml64h5gjd5j9gf32b";
sha256bin64 = "16gk14q3pc1fzg9dbwlqsay4jwddsh5b37h4p8zkqqymv9fp5qq9";
};
stable = {
version = "44.0.2403.157";
sha256 = "1d7k74sa3qbwwcgi6zvx6z7mqkjvyh8x8h78d56nhhh80gyxb971";
sha256bin32 = "0nqfb46299jhzsrlqfkjrj4g639hd4xdcj683pm0iszwq5mf9gbq";
sha256bin64 = "02g1q1x1pwrbzd8v350bzwkqfgmsmq955bvif8sr0bi1sy9b16z3";
version = "45.0.2454.85";
sha256 = "14acjc80dmypybbvm087szp0g0m1gil5hjj02x8c6k7alsjh731y";
sha256bin32 = "1945m765a05wfdfslrb22r1jpicyghfkf4h7ijzw1z9whmxa9y1v";
sha256bin64 = "0d63akpr3yp128v01xgz1nd364w7p89gkvjpr4qz99q67dh3z1q1";
};
}

View File

@ -4,7 +4,7 @@
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
, enableGTK3 ? false
, enableGTK3 ? false, fetchpatch
, debugBuild ? false
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
@ -16,16 +16,27 @@
assert stdenv.cc ? libc && stdenv.cc.libc != null;
let version = "40.0.3"; in
let
stdenv.mkDerivation rec {
name = "firefox-${version}";
common = { pname, version, sha1 }: stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
inherit sha1;
};
patches = if !enableGTK3 then null else [(fetchpatch {
name = "crash_OTMC+GTK3.patch";
# backported from 40.1
# https://bugzilla.mozilla.org/show_bug.cgi?id=1127752
# https://bugzilla.redhat.com/show_bug.cgi?id=1256875
url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/"
+ "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1";
sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5";
})];
patchFlags = "-p2";
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
@ -80,7 +91,7 @@ stdenv.mkDerivation rec {
''
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
configureScript=../mozilla-*/configure
'';
preInstall =
@ -97,14 +108,20 @@ stdenv.mkDerivation rec {
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
'' + lib.optionalString enableGTK3
# argv[0] must point to firefox itself
''
wrapProgram "$out/bin/firefox" \
--argv0 "$out/bin/.firefox-wrapped" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
'' +
# some basic testing
''
"$out/bin/firefox" --version
'';
meta = {
description = "Web browser";
description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = with lib.maintainers; [ eelco ];
platforms = lib.platforms.linux;
@ -114,4 +131,20 @@ stdenv.mkDerivation rec {
inherit gtk nspr version;
isFirefox3Like = true;
};
};
in {
firefox = common {
pname = "firefox";
version = "40.0.3";
sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
};
firefox-esr = common {
pname = "firefox-esr";
version = "38.2.1esr";
sha1 = "c596174e7273be5079bf55aecde33ec191d99538";
};
}

View File

@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
homepage = http://www.openshift.org;
maintainers = with maintainers; [offline];
platforms = [ "x86_64-linux" ];
broken = true;
};
}

View File

@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \;
find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \;
sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb"
# fix libv8 dependency
substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11"
'';
configurePhase = ''

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } :
stdenv.mkDerivation rec {
name = "pidgin-opensteamworks-1.5.1";
name = "pidgin-opensteamworks-${version}";
version = "1.6.1";
# Temporarily sourcing this from a mirror in my github account, until such time as the project is officially migrated away from the deprecated google code service
src = fetchFromGitHub {
owner = "Shados";
owner = "EionRobb";
repo = "pidgin-opensteamworks";
rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd";
sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025";
rev = "${version}";
sha256 = "6ab27831e454ad3b440e4f06b52e0b3671a4f8417ba4da3ab6f56c56d82cc29b";
};
preConfigure = "cd steam-mobile";

View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib
, libevent, pkgconfig, python, jansson, bash
{ stdenv, fetchgit, bash, libconfig, libevent, openssl,
readline, zlib, lua5_2, python, pkgconfig, jansson
}:
stdenv.mkDerivation rec {
@ -11,14 +11,17 @@ stdenv.mkDerivation rec {
rev = "2052f4b381337d75e783facdbfad56b04dec1a9c";
};
buildInputs = [ libconfig lua5_2 openssl readline zlib libevent pkgconfig python jansson ];
buildInputs = [
libconfig libevent openssl readline zlib
lua5_2 python pkgconfig jansson
];
installPhase = ''
mkdir -p $out/bin
cp ./bin/telegram-cli $out/bin/telegram-wo-key
cp ./tg-server.pub $out/
cat > $out/bin/telegram-cli <<EOF
#!${bash}/bin/sh
$out/bin/telegram-wo-key -k $out/tg-server.pub
$out/bin/telegram-wo-key -k $out/tg-server.pub "\$@"
EOF
chmod +x $out/bin/telegram-cli
'';

View File

@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
(if webuiSupport then "" else "--disable-webui")
] ++ optional debugSupport "--enable-debug";
enableParallelBuilding = true;
# https://github.com/qbittorrent/qBittorrent/issues/1992
enableParallelBuilding = false;
meta = {
description = "Free Software alternative to µtorrent";

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
, openssl, curl, libevent, inotifyTools, systemd
, openssl, curl, libevent, inotify-tools, systemd
, enableGTK3 ? false, gtk3
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
};
buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]
buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools ]
++ optionals enableGTK3 [ gtk3 makeWrapper ]
++ optional stdenv.isLinux systemd;

View File

@ -1,30 +0,0 @@
{ lib, goPackages, fetchgit, trousers }:
with goPackages;
buildGoPackage rec {
rev = "f4e441c77a2039814046ff8219629c547fe8b689";
name = "pond-${lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/agl/pond";
src = fetchgit {
inherit rev;
url = "git://github.com/agl/pond.git";
sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026";
};
subPackages = [ "client" ];
buildInputs = [ trousers net crypto protobuf ed25519 govers ];
buildFlags = "--tags nogui";
dontInstallSrc = true;
meta = with lib; {
description = "Forward secure, asynchronous messaging for the discerning";
homepage = https://pond.imperialviolet.org;
license = licenses.bsd3;
platforms = platforms.linux;
};
}

View File

@ -19,6 +19,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
, withHelp ? true
}:
let
@ -137,6 +138,8 @@ stdenv.mkDerivation rec {
configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES"
"--with-lang=${langsSpaces}"
"${if withHelp then "" else "--without-help"}"
);
chmod a+x ./bin/unpack-sources
@ -182,13 +185,13 @@ stdenv.mkDerivation rec {
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
for f in $out/share/applications/*.desktop; do
substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice"
substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice"
substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice"
substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
done
mkdir -p "$out/share/desktop"
cp -r sysui/desktop/icons "$out/share/desktop"
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
'';

View File

@ -31,5 +31,6 @@ in
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
broken = true;
};
}

View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk }:
stdenv.mkDerivation rec {
name = "geda-${version}";
version = "1.8.2-20130925";
src = fetchurl {
url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz";
sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";
};
configureFlags = "--disable-update-xdg-database";
buildInputs = [ pkgconfig guile gtk flex gawk ];
meta = with stdenv.lib; {
description = "Full GPL'd suite of Electronic Design Automation tools";
homepage = http://www.geda-project.org/;
maintainers = with maintainers; [ pjones ];
platforms = platforms.linux;
license = licenses.gpl2;
};
}

View File

@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec {
name = "hol_light-${version}";
version = "232";
version = "244";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = version;
sha256 = "1cips2cb5wqxb6n2qi28af2ap1vhklqbhjy7pnifgz4dilkz10m8";
sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq";
};
buildInputs = [ ocaml findlib camlp5 ];

View File

@ -63,5 +63,6 @@ rec {
license = with a.lib.licenses;
gpl2;
homepage = "http://gap-system.org/";
broken = true;
};
}) x

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }:
stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}";
version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/qalculate/${name}.tar.gz";
sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4";
};
nativeBuildInputs = [ intltool pkgconfig ];
buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ];
meta = with stdenv.lib; {
description = "The ultimate desktop calculator";
homepage = http://qalculate.sourceforge.net;
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran
, libX11,libXpm, libXft, libXext, zlib }:
stdenv.mkDerivation rec {
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i";
};
buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];
buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ];
NIX_CFLAGS_LINK = "-lX11";
# CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
# <rootsrc>/cmake/modules/RootBuildOptions.cmake.

View File

@ -45,13 +45,7 @@ in stdenv.mkDerivation rec {
mkdir -p vendor/cache
${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)}
bundle config build.nokogiri \
--use-system-libraries \
--with-iconv-dir=${libiconv} \
--with-xslt-dir=${libxslt} \
--with-xml2-dir=${libxml2} \
--with-pkg-config \
--with-pg-config=${postgresql}/bin/pg_config
bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt}" --with-xml2-dir="${libxml2}"
bundle install --verbose --local --deployment

View File

@ -17,11 +17,11 @@ assert legacyGUI -> wxGTK != null;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
version = "7.9.0";
version = "8.3.0";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r";
sha256 = "0dzwmwa76y4nhb5brp5a1kxgxjr71czd8vj218qmrlwm54i85gc7";
};
patchPhase = ''

View File

@ -1,7 +1,10 @@
{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
, fetchFromGitHub }:
, fetchurl, fetchFromGitHub }:
stdenv.mkDerivation rec {
let
coreosImageRelease = "738.1.0";
in stdenv.mkDerivation rec {
version = "0.8.0";
name = "rkt-${version}";
@ -12,17 +15,29 @@ stdenv.mkDerivation rec {
sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0";
};
stage1image = fetchurl {
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
};
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
preConfigure = ''
./autogen.sh
'';
preBuild = ''
# hack to avoid downloading image during build, this has been
# improved in rkt master
mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos
cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img
'';
installPhase = ''
mkdir -p $out/bin
cp -Rv build-rkt-${version}/bin/* $out/bin
'';
meta = with lib; {
description = "A fast, composable, and secure App Container runtime for Linux";
homepage = http://rkt.io;

View File

@ -1,8 +1,7 @@
diff --git a/src/Kconfig b/src/Kconfig
index 45ca59c..faf8951 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -144,13 +144,13 @@ menu "Hardware support"
diff -uNr a/src/Kconfig b/src/Kconfig
--- a/src/Kconfig 2015-08-31 10:15:13.231134858 +0200
+++ b/src/Kconfig 2015-08-31 10:14:24.039180178 +0200
@@ -144,13 +144,13 @@
config ATA_DMA
depends on ATA
bool "ATA DMA"
@ -16,8 +15,5 @@ index 45ca59c..faf8951 100644
- default n
+ default y
help
Use 32bit PIO accesses on ATA (minor optimization on PCI
transfers).
Use 32bit PIO accesses on ATA (minor optimization on PCI transfers).
config AHCI
--
1.7.10.4

View File

@ -1,50 +0,0 @@
{ callPackage, fetchurl, ... } @ args:
let
# Xen 4.4.1
xenConfig = {
name = "xen-4.4.1";
version = "4.4.1";
src = fetchurl {
url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz";
sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m";
};
# Sources needed to build the xen tools and tools/firmware.
toolsGits =
[ # tag qemu-xen-4.4.1
{ git = { name = "qemu-xen";
url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git;
rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4";
sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18";
};
}
# tag xen-4.4.1
{ git = { name = "qemu-xen-traditional";
url = git://xenbits.xen.org/qemu-xen-4.4-testing.git;
rev = "6ae4e588081620b141071eb010ec40aca7e12876";
sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded";
};
}
];
firmwareGits =
[ # tag 1.7.3.1
{ git = { name = "seabios";
url = git://xenbits.xen.org/seabios.git;
rev = "7d9cbe613694924921ed1a6f8947d711c5832eee";
sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87";
};
}
{ git = { name = "ovmf";
url = git://xenbits.xen.org/ovmf.git;
rev = "447d264115c476142f884af0be287622cd244423";
sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
};
}
];
};
in callPackage ./generic.nix (args // { xenConfig=xenConfig; })

View File

@ -58,17 +58,18 @@ let
}
];
xenserverPatches = let
patches = {
url = https://github.com/ts468/xen-4.5.pg.git;
rev = "3442b65b490f43c817cbc53369220d0b1ab9b785";
sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845";
};
xenserverPatches =
let
patches = {
url = https://github.com/ts468/xen-4.5.pg.git;
rev = "3442b65b490f43c817cbc53369220d0b1ab9b785";
sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845";
};
in ''
cp -r ${fetchgit patches}/master patches
quilt push -a
substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE"
'';
'';
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch

View File

@ -76,79 +76,9 @@ stdenv.mkDerivation {
pythonPath = [ pythonPackages.curses ];
patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches;
patchPhase = stdenv.lib.optional ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches;
preConfigure = ''
# Fake wget: copy prefetched downloads instead
mkdir wget
echo "#!/bin/sh" > wget/wget
echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget
echo "cp \$4 \$3" >> wget/wget
chmod +x wget/wget
export PATH=$PATH:$PWD/wget
export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio"
'';
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
buildFlags = "xen tools stubdom";
preBuild =
''
substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
--replace /usr $out
substituteInPlace tools/blktap2/lvm/lvm-util.c \
--replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
--replace /usr/sbin/lvs ${lvm2}/sbin/lvs
substituteInPlace tools/hotplug/Linux/network-bridge \
--replace /usr/bin/logger ${utillinux}/bin/logger
substituteInPlace tools/xenmon/xenmon.py \
--replace /usr/bin/pkill ${procps}/bin/pkill
substituteInPlace tools/xenstat/Makefile \
--replace /usr/include/curses.h ${ncurses}/include/curses.h
substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \
--replace /usr/include/pci ${pciutils}/include/pci
substituteInPlace tools/hotplug/Linux/xen-backend.rules \
--replace /etc/xen/scripts $out/etc/xen/scripts
# blktap is not provided by xen, but by xapi
sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
# Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
# print the GCC version number properly.
substituteInPlace xen/Makefile \
--replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
substituteInPlace tools/python/xen/xend/server/BlktapController.py \
--replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2
substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
--replace /usr/sbin/qcow-create $out/sbin/qcow-create
substituteInPlace tools/python/xen/remus/save.py \
--replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save
substituteInPlace tools/python/xen/remus/device.py \
--replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt
# Allow the location of the xendomains config file to be
# overriden at runtime.
substituteInPlace tools/hotplug/Linux/init.d/xendomains \
--replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
--replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
--replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
--replace /bin/ls ls
substituteInPlace tools/hotplug/Linux/xendomains \
--replace /bin/ls ls
postPatch = ''
${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches}
# Xen's tools and firmares need various git repositories that it
# usually checks out at time using git. We can't have that.
@ -171,12 +101,76 @@ stdenv.mkDerivation {
${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in ''
cp ${src} xen_ext_files/${src.name}
'')}
'';
preConfigure = ''
# Fake wget: copy prefetched downloads instead
mkdir wget
echo "#!/bin/sh" > wget/wget
echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget
echo "cp \$4 \$3" >> wget/wget
chmod +x wget/wget
export PATH=$PATH:$PWD/wget
export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio"
'';
postConfigure =
''
substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
--replace /usr $out
substituteInPlace tools/blktap2/lvm/lvm-util.c \
--replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
--replace /usr/sbin/lvs ${lvm2}/sbin/lvs
substituteInPlace tools/hotplug/Linux/network-bridge \
--replace /usr/bin/logger ${utillinux}/bin/logger
substituteInPlace tools/xenmon/xenmon.py \
--replace /usr/bin/pkill ${procps}/bin/pkill
substituteInPlace tools/xenstat/Makefile \
--replace /usr/include/curses.h ${ncurses}/include/curses.h
substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \
--replace /usr/include/pci ${pciutils}/include/pci
substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \
--replace /usr/include/pci ${pciutils}/include/pci
substituteInPlace tools/hotplug/Linux/xen-backend.rules \
--replace /etc/xen/scripts $out/etc/xen/scripts
# blktap is not provided by xen, but by xapi
sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
# Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
# print the GCC version number properly.
substituteInPlace xen/Makefile \
--replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
# Allow the location of the xendomains config file to be
# overriden at runtime.
substituteInPlace tools/hotplug/Linux/init.d/xendomains \
--replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
--replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
--replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
--replace /bin/ls ls
substituteInPlace tools/hotplug/Linux/xendomains \
--replace /bin/ls ls
# Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
mkdir -p tools/include/gnu
touch tools/include/gnu/stubs-32.h
'';
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
buildFlags = "xen tools stubdom";
postBuild =
''
make -C docs man-pages

View File

@ -0,0 +1,45 @@
{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
stdenv.mkDerivation rec {
rev = "2823";
version = "hg-2012-12-09";
name = "wmii-${version}";
src = fetchhg {
url = https://code.google.com/p/wmii/;
sha256 = "1wqw41jb2fhq902a04ixfzmx0lia1pawahm1ymyrs3is6mm32r51";
inherit rev;
};
# for dlopen-ing
patchPhase = ''
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so"
'';
configurePhase = ''
for file in $(grep -lr '#!.*sh'); do
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file
done
cat <<EOF >> config.mk
PREFIX = $out
LIBIXP = ${libixp_hg}/lib/libixp.a
BINSH = ${dash}/bin/dash
EOF
'';
buildInputs = [ pkgconfig libixp_hg txt2tags dash python
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
makeFlags = "WMII_HGVERSION=hg${rev}";
meta = {
homepage = "https://code.google.com/p/wmii/";
description = "A small window manager controlled by a 9P filesystem";
maintainers = with stdenv.lib.maintainers; [ kovirobi ];
license = stdenv.lib.licenses.mit;
inherit version;
};
}

View File

@ -1,35 +0,0 @@
args: with args; stdenv.mkDerivation {
name = "wmii-3.6";
src = fetchurl {
url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;
sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216";
};
buildInputs = [ libX11 libixp xextproto libXt libXext ];
inherit libixp;
phases = "unpackPhase installPhase";
installPhase = "
for i in libfmt libutf libregexp libbio; do
cd $i; make; cd ..
done
mkdir -p \$out/lib
cp ${libixp}/lib/libixp.a \$out/lib
export CFLAGS=\$NIX_CFLAGS_COMPILE
export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
-e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\
config.mk
# don't use the default one installed by nixos!
#sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
make install
";
meta = { homepage = "www.suckless.org";
description = "a really cool window manager which can by driven by keyboard only";
license = stdenv.lib.licenses.mit;
};
}

View File

@ -1,35 +0,0 @@
args: with args; stdenv.mkDerivation {
name = "wmiimenu-3.1";
src = fetchurl {
url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz;
sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk";
};
buildInputs = [ libX11 libixp ];
inherit libixp;
phases = "unpackPhase installPhase";
installPhase = "
export CFLAGS=\$NIX_CFLAGS_COMPILE
export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
config.mk
# don't use the default one installed by nixos!
# sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
# This will fail but wmiimenu has been built (hack!)
set +e
make &> /dev/null
set -e
mkdir -p \$out/bin
cp cmd/wmiimenu \$out/bin
";
meta = { homepage = "www.suckless.org";
description = "One small tool of the wmii window manger to let the user select an item from a list by filtering";
license = stdenv.lib.licenses.mit;
};
}

View File

@ -13,4 +13,8 @@ in stdenv.mkDerivation {
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
'';
# trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
}

View File

@ -280,6 +280,7 @@ rec {
http://archive.apache.org/dist/ # fallback for old releases
ftp://ftp.funet.fi/pub/mirrors/apache.org/
http://apache.cs.uu.nl/dist/
http://apache.cs.utah.edu/
];
postgresql = [

View File

@ -85,7 +85,7 @@ let
let boolToKernOpt = b: if b then "y" else "n";
# Disable RANDSTRUCT under virtualbox, as it has some kind of
# breakage with the vbox guest drivers
#randstruct = optionalString config.services.virtualboxGuest.enable
#randstruct = optionalString config.virtualisation.virtualbox.guest.enable
# "GRKERNSEC_RANDSTRUCT n";
# Disable restricting links under the testing kernel, as something

View File

@ -2,7 +2,7 @@ makeWrapper() {
local original=$1
local wrapper=$2
local params varName value command separator n fileNames
local flagsBefore flags
local argv0 flagsBefore flags
mkdir -p "$(dirname $wrapper)"
@ -68,11 +68,17 @@ makeWrapper() {
n=$((n + 1))
flagsBefore="$flagsBefore $flags"
fi
if test "$p" = "--argv0"; then
argv0=${params[$((n + 1))]}
n=$((n + 1))
fi
done
# Note: extraFlagsArray is an array containing additional flags
# that may be set by --run actions.
echo exec -a '"$0"' "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
echo exec ${argv0:+-a $argv0} "$original" \
$flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
chmod +x $wrapper
}
@ -98,5 +104,5 @@ wrapProgram() {
local prog="$1"
local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
mv $prog $hidden
makeWrapper $hidden $prog "$@"
makeWrapper $hidden $prog --argv0 '"$0"' "$@"
}

View File

@ -1,26 +1,59 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }:
stdenv.mkDerivation rec {
name = "gohufont-2.0";
src = fetchurl {
pcf = fetchurl {
url = "http://font.gohu.org/gohufont-2.0.tar.gz";
sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
};
buildInputs = [ mkfontdir mkfontscale ];
bdf = fetchurl {
url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz";
sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr";
};
buildInputs = [ mkfontdir mkfontscale bdf2psf ];
unpackPhase = ''
mkdir pcf bdf
tar -xzf $pcf --strip-components=1 -C pcf
tar -xzf $bdf --strip-components=1 -C bdf
'';
installPhase = ''
# convert bdf to psf fonts
sourceRoot="$(pwd)"
mkdir psf
cd "${bdf2psf}/usr/share/bdf2psf"
for i in $sourceRoot/bdf/*.bdf; do
bdf2psf --fb $i standard.equivalents \
ascii.set+useful.set+linux.set 512 \
"$sourceRoot/psf/$(basename $i .bdf).psf"
done
cd "$sourceRoot"
# install the psf fonts (for the virtual console)
fontDir="$out/share/consolefonts"
mkdir -p "$fontDir"
mv psf/*.psf "$fontDir"
# install the pcf fonts (for xorg applications)
fontDir="$out/share/fonts/misc"
mkdir -p "$fontDir"
mv *.pcf.gz "$fontDir"
mv pcf/*.pcf.gz "$fontDir"
cd "$fontDir"
mkfontdir
mkfontscale
'';
meta = with stdenv.lib; {
description = "A monospace bitmap font well suited for programming and terminal use";
description = ''
A monospace bitmap font well suited for programming and terminal use
'';
homepage = http://font.gohu.org/;
license = licenses.wtfpl;
maintainers = with maintainers; [ epitrochoid ];

View File

@ -8,23 +8,23 @@ let
# Annoyingly, these files are updated without a change in URL. This means that
# builds will start failing every month or so, until the hashes are updated.
version = "2015-08-31";
version = "2015-09-03";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
"04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n";
"11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
"0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd";
"1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
"11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8";
"07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
"1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
"0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc";

View File

@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "julia";
version = "0.3.10";
version = "0.3.11";
name = "${pname}-${version}";
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "refs/tags/v${version}";
sha256 = "0px1zd7qmz6rrjf58k4kq55s7h8mny1w6xvcsrny2wbgckxzhqsg";
sha256 = "06xmv2l8hskdh1s5y2dh28vpb5pc0gzmfl5a03yp0qjjsl5cb284";
name = "julia-git-v${version}";
};

View File

@ -89,6 +89,12 @@ self: super: {
yices-easy = dontDistribute super.yices-easy;
yices-painless = dontDistribute super.yices-painless;
# https://github.com/GaloisInc/RSA/issues/9
RSA = dontCheck super.RSA;
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
@ -289,21 +295,22 @@ self: super: {
hakyll = dontCheck super.hakyll;
Hclip = dontCheck super.Hclip;
HList = dontCheck super.HList;
ide-backend = dontCheck super.ide-backend;
marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69
memcached-binary = dontCheck super.memcached-binary;
msgpack-rpc = dontCheck super.msgpack-rpc;
persistent-zookeeper = dontCheck super.persistent-zookeeper;
pocket-dns = dontCheck super.pocket-dns;
postgresql-simple = dontCheck super.postgresql-simple;
postgrest = dontCheck super.postgrest;
snowball = dontCheck super.snowball;
sophia = dontCheck super.sophia;
test-sandbox = dontCheck super.test-sandbox;
users-postgresql-simple = dontCheck super.users-postgresql-simple;
wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
xkbcommon = dontCheck super.xkbcommon;
xmlgen = dontCheck super.xmlgen;
ide-backend = dontCheck super.ide-backend;
msgpack-rpc = dontCheck super.msgpack-rpc;
# These packages try to access the network.
amqp = dontCheck super.amqp;
@ -575,9 +582,6 @@ self: super: {
# This packages compiles 4+ hours on a fast machine. That's just unreasonable.
CHXHtml = dontDistribute super.CHXHtml;
# https://github.com/bos/bloomfilter/issues/7
bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; });
# https://github.com/NixOS/nixpkgs/issues/6350
paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
@ -751,7 +755,10 @@ self: super: {
zlib = dontCheck super.zlib;
# Override the obsolete version from Hackage with our more up-to-date copy.
cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};
cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};
# https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
@ -1016,4 +1023,10 @@ self: super: {
# https://github.com/GaloisInc/DSA/issues/1
DSA = dontCheck super.DSA;
# https://github.com/bos/bloomfilter/issues/7
bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
# https://github.com/pxqr/base32-bytestring/issues/4
base32-bytestring = dontCheck super.base32-bytestring;
}

View File

@ -22,7 +22,8 @@
, enableStaticLibraries ? true
, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
, homepage ? "http://hackage.haskell.org/package/${pname}"
, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms
, platforms ? ghc.meta.platforms
, hydraPlatforms ? platforms
, hyperlinkSource ? true
, isExecutable ? false, isLibrary ? !isExecutable
, jailbreak ? false
@ -31,7 +32,6 @@
, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
, passthru ? {}
, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
, platforms ? ghc.meta.platforms
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
, testTarget ? ""
, broken ? false

File diff suppressed because it is too large Load Diff

View File

@ -82,7 +82,7 @@ stdenv.mkDerivation {
echo building hoogle database
# FIXME: rehoo is marked as depricated on Hackage
chmod 644 *.hoo *.txt
rehoo -j4 -c64 .
rehoo -j$NIX_BUILD_CORES -c64 .
mv default.hoo .x
rm -fr downloads *.dep *.txt *.hoo

View File

@ -0,0 +1,28 @@
From 35d972b3dc5056110d55315f2256d9c5046299c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 17:58:36 +0200
Subject: [PATCH] Revert "Fix maximum sizing calculation."
This reverts commit 44b01ba38b4fcdb5a85f44fa2f3af1f29cde8f40. The change breaks
this package on 32 bit platforms. See https://github.com/bos/bloomfilter/issues/7
for further details.
---
Data/BloomFilter/Easy.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Data/BloomFilter/Easy.hs b/Data/BloomFilter/Easy.hs
index 5143c6e..a349168 100644
--- a/Data/BloomFilter/Easy.hs
+++ b/Data/BloomFilter/Easy.hs
@@ -72,7 +72,7 @@ safeSuggestSizing capacity errRate
minimum [((-k) * cap / log (1 - (errRate ** (1 / k))), k)
| k <- [1..100]]
roundedBits = nextPowerOfTwo (ceiling bits)
- in if roundedBits <= 0 || roundedBits > 0xffffffff
+ in if roundedBits <= 0
then Left "capacity too large to represent"
else Right (roundedBits, truncate hashes)
--
2.5.1

View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
cd src/build
'';
configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" "--disable-docs"];
configureScript = "../configure";

View File

@ -5,7 +5,7 @@ buildRubyGem {
src = fetchgit {
url = "https://github.com/bundler/bundler.git";
rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
sha256 = "1p7kzhmicfljy9n7nq3qh6lvrsckiq76ddypf6s55gfh1l98z4k9";
sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr";
leaveDotGit = true;
};
dontPatchShebangs = true;

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
version = "2015-07-28";
version = "2015-08-30";
src = fetchFromGitHub {
owner = "accelio";
repo = "accelio";
rev = "0c4b6d535831650112ba9409a5c7d6e1bc436d61";
sha256 = "044m92pnvdl64irvy7bdqr51gz0qr5f14xnsig4gkc3vb0afbb4j";
rev = "3d1f2b2d311aa70de9856832fd02647266624e82";
sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
};
postPatch = ''

View File

@ -1,27 +1,31 @@
{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
, utillinux, yodl }:
let version = "3.25.02"; in
let version = "4.00.00"; in
stdenv.mkDerivation {
name = "bobcat-${version}";
src = fetchurl {
sha256 = "0b1370li4q82fqj982vng9cwkf23k2c1df5jsdcgkrk01r53dxry";
url = "mirror://debian/pool/main/b/bobcat/bobcat_${version}.orig.tar.gz";
src = fetchFromGitHub {
sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs";
rev = version;
repo = "bobcat";
owner = "fbb-git";
};
meta = with stdenv.lib; {
inherit version;
description = "Brokken's Own Base Classes And Templates";
downloadPage = http://sourceforge.net/projects/bobcat/files/;
homepage = https://fbb-git.github.io/bobcat/;
license = licenses.gpl3;
platforms = with platforms; linux;
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ];
sourceRoot = "bobcat-${version}-src/bobcat";
postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out
patchShebangs ./build

View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "dclxvi-2013-01-27";
src = fetchFromGitHub {
owner = "agl";
repo = "dclxvi";
rev = "74009d58f2305be3b95d88717619bde8ecbdd9a2";
sha256 = "1kx4h8iv7yb30c6zjmj8zs9x12vxhi0jwkiwxsxj9swf6bww6p1g";
};
buildFlags = [ "libdclxvipairing.so" ];
installPhase = ''
mkdir -p $out/{include,lib}
find . -name \*.h -exec cp {} $out/include \;
find . -name \*.so -exec cp {} $out/lib \;
'';
meta = with stdenv.lib; {
homepage = "https://github.com/agl/dclxvi";
description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;
};
}

View File

@ -230,11 +230,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
assert x11grabExtlib -> libX11 != null && libXv != null;
stdenv.mkDerivation rec {
name = "ffmpeg-${version}";
name = "ffmpeg-full-${version}";
version = "2.7.2";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
};

View File

@ -1,22 +1,23 @@
{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }:
stdenv.mkDerivation rec {
name = "freenect-${version}";
version = "0.5.2";
src = fetchzip {
url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
};
name = "freenect-${version}";
version = "0.5.2";
buildInputs = [ libusb freeglut mesa libXi libXmu ];
nativeBuildInputs = [ cmake pkgconfig ];
src = fetchzip {
url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
};
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
inherit version;
homepage = http://openkinect.org;
license = with stdenv.lib.licenses; [ gpl2 asl20 ];
maintainers = with stdenv.lib.maintainers; [ bennofs ];
platforms = stdenv.lib.platforms.linux;
};
buildInputs = [ libusb freeglut mesa libXi libXmu ];
nativeBuildInputs = [ cmake pkgconfig ];
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
inherit version;
homepage = http://openkinect.org;
license = with stdenv.lib.licenses; [ gpl2 asl20 ];
maintainers = with stdenv.lib.maintainers; [ bennofs ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "htmlcxx-${version}";
version = "0.85";
src = fetchurl {
url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb";
};
patches = [ ./ptrdiff.patch ];
meta = {
homepage = http://htmlcxx.sourceforge.net/;
description = "htmlcxx is a simple non-validating css1 and html parser for C++.";
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -0,0 +1,13 @@
diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h
*** htmlcxx-orig-0.85/html/tree.h 2015-09-02 13:57:17.988688798 +0200
--- htmlcxx-0.85/html/tree.h 2015-09-02 13:57:52.737768811 +0200
***************
*** 45,50 ****
--- 45,51 ----
#ifndef tree_hh_
#define tree_hh_
+ #include <cstddef>
#include <cassert>
#include <memory>
#include <stdexcept>

View File

@ -1,29 +0,0 @@
{stdenv, fetchurl}:
let version = "1.4.14b"; in
stdenv.mkDerivation {
name = "libevent-${version}";
src = fetchurl {
url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg";
};
meta = {
description = "libevent, an event notification library";
longDescription =
'' The libevent API provides a mechanism to execute a callback function
when a specific event occurs on a file descriptor or after a timeout
has been reached. Furthermore, libevent also support callbacks due
to signals or regular timeouts.
libevent is meant to replace the event loop found in event driven
network servers. An application just needs to call event_dispatch()
and then add or remove events dynamically without having to change
the event loop.
'';
license = "mBSD";
};
}

View File

@ -0,0 +1,27 @@
{ stdenv, fetchhg, txt2tags }:
stdenv.mkDerivation rec {
rev = "148";
version = "hg-2012-12-02";
name = "libixp-${version}";
src = fetchhg {
url = https://code.google.com/p/libixp/;
sha256 = "1nbnh2ff18fsrs28mx4bfgncq1d1nw5dd6iwhwvv5x2g9w7q5vvj";
inherit rev;
};
configurePhase = ''
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
'';
buildInputs = [ txt2tags ];
meta = {
homepage = https://code.google.com/p/libixp/;
description = "Portable, simple C-language 9P client and server libary";
maintainers = with stdenv.lib.maintainers; [ kovirobi ];
license = stdenv.lib.licenses.mit;
inherit version;
};
}

View File

@ -1,26 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "libixp_for_wmii-0.4";
phases = "unpackPhase installPhase";
installPhase = "
export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
config.mk
make
mkdir -p \$out/include
cp -r include/*.h \$out/include
cp -r lib \$out
";
src = fetchurl {
url = http://dl.suckless.org/libs/libixp-0.4.tar.gz;
sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p";
};
meta = {
homepage = http://libs.suckless.org/libixp;
description = "stand-alone client/server 9P library";
license = with stdenv.lib.licenses; [ mit lpl-102 ];
};
}

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
version = "0.7.76";
version = "0.7.77";
name = "libmediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "088hxj3x12ww8zym3g6izz1w9m6wxgdy7hc2m089cd4sv9dlccnq";
sha256 = "1znxdn1jpqkiwshq9s514ak1z9wkrh9flky4s3q8z2xl68jpralq";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc
, icu, libxslt, pkgconfig }:
{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu
, libxslt, pkgconfig }:
let
version = "${libVersion}-list-${listVersion}";
listVersion = "2015-08-07";
listArchive = let
rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab";
in fetchurl {
sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi";
url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
listVersion = "2015-08-27";
listSources = fetchFromGitHub {
sha256 = "14kgxyfvvrwqyxmfy1by1pzbbv6hs9n744v8zr160rz8rln8lzb9";
rev = "1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3";
repo = "list";
owner = "publicsuffix";
};
libVersion = "0.8.0";
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
preConfigure = ''
# The libpsl check phase requires the list's test scripts (tests/) as well
tar --directory=list --strip-components=1 -xf "${listArchive}"
cp -Rv "${listSources}"/* list
'';
configureFlags = "--disable-static --enable-gtk-doc --enable-man";

View File

@ -0,0 +1,15 @@
http://git.savannah.gnu.org/cgit/libunwind.git/commit/?id=396b6c7ab737e2bff244d640601c436a26260ca1
diff --git a/include/dwarf_i.h b/include/dwarf_i.h
index 0e72845..86dcdb8 100644
--- a/include/dwarf_i.h
+++ b/include/dwarf_i.h
@@ -20,7 +20,7 @@
extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
/* REG is evaluated multiple times; it better be side-effects free! */
# define dwarf_to_unw_regnum(reg) \
- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
+ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
#endif
#ifdef UNW_LOCAL_ONLY

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libunwind-1.1";
src = fetchurl {
url = "mirror://savannah/libunwind/${name}.tar.gz";
sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
};
patches = [ ./libunwind-1.1-lzma.patch ];
patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ];
postPatch = ''
sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file
done
'';
meta = with stdenv.lib; {
homepage = http://www.nongnu.org/libunwind;
description = "A portable and efficient API to determine the call-chain of a program";

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "libvdpau-1.1";
name = "libvdpau-1.1.1";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f";
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2";
sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736";
};
buildInputs = with xorg; [ pkgconfig dri2proto libXext ];

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