Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-08-13 11:55:02 -07:00
commit 952def0e3c
146 changed files with 14613 additions and 9539 deletions

View file

@ -1 +1 @@
15.07
15.08

View file

@ -219,5 +219,131 @@ you should modify
</section>
-->
<!--============================================================-->
<section xml:id="sec-eclipse">
<title>Eclipse</title>
<para>
The Nix expressions related to the Eclipse platform and IDE are in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>.
</para>
<para>
Nixpkgs provides a number of packages that will install Eclipse in
its various forms, these range from the bare-bones Eclipse
Platform to the more fully featured Eclipse SDK or Scala-IDE
packages and multiple version are often available. It is possible
to list available Eclipse packages by issuing the command:
<screen>
$ nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses --description
</screen>
Once an Eclipse variant is installed it can be run using the
<command>eclipse</command> command, as expected. From within
Eclipse it is then possible to install plugins in the usual manner
by either manually specifying an Eclipse update site or by
installing the Marketplace Client plugin and using it to discover
and install other plugins. This installation method provides an
Eclipse installation that closely resemble a manually installed
Eclipse.
</para>
<para>
If you prefer to install plugins in a more declarative manner then
Nixpkgs also offer a number of Eclipse plugins that can be
installed in an <emphasis>Eclipse environment</emphasis>. This
type of environment is created using the function
<varname>eclipseWithPlugins</varname> found inside the
<varname>nixpkgs.eclipses</varname> attribute set. This function
takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? []
}</literal> where <varname>eclipse</varname> is a one of the
Eclipse packages described above, <varname>plugins</varname> is a
list of plugin derivations, and <varname>jvmArgs</varname> is a
list of arguments given to the JVM running the Eclipse. For
example, say you wish to install the latest Eclipse Platform with
the popular Eclipse Color Theme plugin and also allow Eclipse to
use more RAM. You could then add
<screen>
packageOverrides = pkgs: {
myEclipse = with pkgs.eclipses; eclipseWithPlugins {
eclipse = eclipse-platform;
jvmArgs = [ "-Xmx2048m" ];
plugins = [ plugins.color-theme ];
};
}
</screen>
to your Nixpkgs configuration
(<filename>~/.nixpkgs/config.nix</filename>) and install it by
running <command>nix-env -f '&lt;nixpkgs&gt;' -iA
myEclipse</command> and afterward run Eclipse as usual. It is
possible to find out which plugins are available for installation
using <varname>eclipseWithPlugins</varname> by running
<screen>
$ nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses.plugins --description
</screen>
</para>
<para>
If there is a need to install plugins that are not available in
Nixpkgs then it may be possible to define these plugins outside
Nixpkgs using the <varname>buildEclipseUpdateSite</varname> and
<varname>buildEclipsePlugin</varname> functions found in the
<varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the
<varname>buildEclipseUpdateSite</varname> function to install a
plugin distributed as an Eclipse update site. This function takes
<literal>{ name, src }</literal> as argument where
<literal>src</literal> indicates the Eclipse update site archive.
All Eclipse features and plugins within the downloaded update site
will be installed. When an update site archive is not available
then the <varname>buildEclipsePlugin</varname> function can be
used to install a plugin that consists of a pair of feature and
plugin JARs. This function takes an argument <literal>{ name,
srcFeature, srcPlugin }</literal> where
<literal>srcFeature</literal> and <literal>srcPlugin</literal> are
the feature and plugin JARs, respectively.
</para>
<para>
Expanding the previous example with two plugins using the above
functions we have
<screen>
packageOverrides = pkgs: {
myEclipse = with pkgs.eclipses; eclipseWithPlugins {
eclipse = eclipse-platform;
jvmArgs = [ "-Xmx2048m" ];
plugins = [
plugins.color-theme
(plugins.buildEclipsePlugin {
name = "myplugin1-1.0";
srcFeature = fetchurl {
url = "http://…/features/myplugin1.jar";
sha256 = "123…";
};
srcPlugin = fetchurl {
url = "http://…/plugins/myplugin1.jar";
sha256 = "123…";
};
});
(plugins.buildEclipseUpdateSite {
name = "myplugin2-1.0";
src = fetchurl {
stripRoot = false;
url = "http://…/myplugin2.zip";
sha256 = "123…";
};
});
];
};
}
</screen>
</para>
</section>
</chapter>

View file

@ -83,6 +83,7 @@
eikek = "Eike Kettner <eike.kettner@posteo.de>";
ellis = "Ellis Whitehead <nixos@ellisw.net>";
emery = "Emery Hemingway <emery@vfemail.net>";
epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
ericbmerritt = "Eric Merritt <eric@afiniate.com>";
ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
exlevan = "Alexey Levan <exlevan@gmail.com>";

View file

@ -36,14 +36,6 @@
</para>
<para>The following new services were added since the last release:
<itemizedlist>
<listitem><para><literal>brltty</literal></para></listitem>
<listitem><para><literal>marathon</literal></para></listitem>
<listitem><para><literal>tvheadend</literal></para></listitem>
</itemizedlist>
</para>
<para>When upgrading from a previous release, please be aware of the
following incompatible changes:
@ -100,6 +92,17 @@ was accordingly renamed to <literal>electron</literal>
</para>
</listitem>
<listitem>
<para>
The VirtualBox host and guest options have been moved/renamed more
consistently and less confusing to be now found in
<literal>virtualisation.virtualbox.host.*</literal> instead of
<literal>services.virtualboxHost.*</literal> and
<literal>virtualisation.virtualbox.guest.*</literal> instead of
<literal>services.virtualboxGuest.*</literal>.
</para>
</listitem>
<listitem>
<para>
Haskell packages can no longer be found by name, i.e. the commands
@ -200,4 +203,26 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
</itemizedlist>
</para>
<para>The following new services were added since the last release:
<itemizedlist>
<listitem><para><literal>brltty</literal></para></listitem>
<listitem><para><literal>marathon</literal></para></listitem>
<listitem><para><literal>tvheadend</literal></para></listitem>
</itemizedlist>
</para>
<para>Other notable improvements:
<itemizedlist>
<listitem><para>The nixos and nixpkgs channels were unified,
so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
instead of <literal>nix-env -iA nixos.pkgs.bash</literal>.
See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
</para></listitem>
</itemizedlist>
</para>
</section>

View file

@ -344,6 +344,7 @@
./services/networking/tlsdated.nix
./services/networking/tox-bootstrapd.nix
./services/networking/tvheadend.nix
./services/networking/ubuntu-fan.nix
./services/networking/unbound.nix
./services/networking/unifi.nix
./services/networking/vsftpd.nix

View file

@ -109,7 +109,14 @@ in zipModules ([]
++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
# VirtualBox
++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ]
++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
++ obsolete [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
++ obsolete [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]
++ obsolete [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]
++ obsolete [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]
++ obsolete [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]
++ obsolete [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]
++ obsolete [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]
# Tarsnap
++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]

View file

@ -20,9 +20,11 @@ let
cfg.collectors)}
'';
cmdLineOpts = concatStringsSep " " (
[ "-h=${cfg.bosunHost}" "-c=${collectors}" ] ++ cfg.extraOpts
);
conf = pkgs.writeText "scollector.toml" ''
Host = "${cfg.bosunHost}"
ColDir = "${collectors}"
${cfg.extraConfig}
'';
in {
@ -92,6 +94,14 @@ in {
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra scollector configuration added to the end of scollector.toml
'';
};
};
};
@ -108,7 +118,7 @@ in {
PermissionsStartOnly = true;
User = cfg.user;
Group = cfg.group;
ExecStart = "${cfg.package}/bin/scollector ${cmdLineOpts}";
ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
};
};

View file

@ -0,0 +1,60 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.networking.ubuntu-fan;
modprobe = "${config.system.sbin.modprobe}/sbin/modprobe";
in
{
###### interface
options = {
networking.ubuntu-fan = {
enable = mkEnableOption "Ubuntu FAN Networking";
};
};
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.fanctl ];
systemd.services.ubuntu-fan = {
description = "Ubuntu FAN Networking";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
before = [ "docker.service" ];
restartIfChanged = false;
preStart = ''
if [ ! -f /proc/sys/net/fan/version ]; then
${modprobe} ipip
if [ ! -f /proc/sys/net/fan/version ]; then
echo "The Ubuntu Fan Networking patches have not been applied to this kernel!" 1>&2
exit 1
fi
fi
mkdir -p /var/lib/ubuntu-fan
'';
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${pkgs.fanctl}/bin/fanctl up -a";
ExecStop = "${pkgs.fanctl}/bin/fanctl down -a";
};
};
};
}

View file

@ -99,6 +99,7 @@ in {
networking.networkmanager.enable = mkDefault true;
services.upower.enable = config.powerManagement.enable;
hardware.bluetooth.enable = mkDefault true;
services.xserver.displayManager.desktopManagerHandlesLidAndPower = false; # true doesn't make sense here, GNOME just doesn't handle it anymore
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];

View file

@ -6,7 +6,7 @@ with lib;
let
cfg = config.services.virtualboxGuest;
cfg = config.virtualisation.virtualbox.guest;
kernel = config.boot.kernelPackages;
in
@ -15,20 +15,11 @@ in
###### interface
options = {
services.virtualboxGuest = {
enable = mkOption {
default = false;
description = "Whether to enable the VirtualBox service and other guest additions.";
};
};
options.virtualisation.virtualbox.guest.enable = mkOption {
default = false;
description = "Whether to enable the VirtualBox service and other guest additions.";
};
###### implementation
config = mkIf cfg.enable {

View file

@ -3,7 +3,7 @@
with lib;
let
cfg = config.services.virtualboxHost;
cfg = config.virtualisation.virtualbox.host;
virtualbox = config.boot.kernelPackages.virtualbox.override {
inherit (cfg) enableHardening;
};
@ -11,12 +11,12 @@ let
in
{
options.services.virtualboxHost = {
options.virtualisation.virtualbox.host = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable host-side support for VirtualBox.
Whether to enable VirtualBox.
<note><para>
In order to pass USB devices from the host to the guests, the user

View file

@ -43,7 +43,6 @@ in rec {
simple;
installer = {
inherit (nixos'.tests.installer)
grub1
lvm
separateBoot
simple;

View file

@ -43,7 +43,7 @@ in {
testScript = ''
startAll;
my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
my $key=`${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f key -N ""`;
$server->waitForUnit("sshd");
@ -52,8 +52,8 @@ in {
$server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
$client->succeed("mkdir -m 700 /root/.ssh");
$client->copyFileFromHost("key", "/root/.ssh/id_dsa");
$client->succeed("chmod 600 /root/.ssh/id_dsa");
$client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
$client->succeed("chmod 600 /root/.ssh/id_ed25519");
$client->waitForUnit("network.target");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");

View file

@ -31,7 +31,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
fsType = "vboxsf";
};
services.virtualboxGuest.enable = true;
virtualisation.virtualbox.guest.enable = true;
boot.initrd.kernelModules = [
"af_packet" "vboxsf"
@ -308,9 +308,9 @@ in {
vmConfigs = mapAttrsToList mkVMConf vboxVMs;
in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
virtualisation.memorySize = 768;
services.virtualboxHost.enable = true;
virtualisation.virtualbox.host.enable = true;
users.extraUsers.alice.extraGroups = let
inherit (config.services.virtualboxHost) enableHardening;
inherit (config.virtualisation.virtualbox.host) enableHardening;
in lib.mkIf enableHardening (lib.singleton "vboxusers");
};

View file

@ -7,12 +7,12 @@
assert alsaSupport -> alsaLib != null;
assert jackSupport -> libjack2 != null;
let version = "1.0.5"; in
let version = "1.0.7"; in
stdenv.mkDerivation {
name = "fmit-${version}";
src = fetchFromGitHub {
sha256 = "1p49ykg7mf62xrn08fqss8yr1nf53mm8w9zp2sgcy48bfsa9xbpy";
sha256 = "14dzrrxjskhqamhfqhzp6napvc1vyjxcc0v8id1iqzsfdn86xqm9";
rev = "v${version}";
repo = "fmit";
owner = "gillesdegottex";
@ -24,28 +24,20 @@ stdenv.mkDerivation {
postPatch = ''
substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
substituteInPlace distrib/fmit.desktop \
--replace "Icon=fmit" "Icon=$out/share/pixmaps/fmit.svg"
substituteInPlace src/main.cpp --replace "PREFIX" "\"$out\""
'';
configurePhase = ''
mkdir build
cd build
qmake \
CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
fmit.pro
PREFIX="$out" PREFIXSHORTCUT="$out" \
../fmit.pro
'';
enableParallelBuilding = true;
installPhase = ''
install -D fmit $out/bin/fmit
install -Dm644 distrib/fmit.desktop $out/share/applications/fmit.desktop
install -Dm644 ui/images/fmit.svg $out/share/pixmaps/fmit.svg
mkdir -p $out/share/fmit
cp -R tr $out/share/fmit
'';
meta = with stdenv.lib; {
inherit version;
description = "Free Musical Instrument Tuner";

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl
, libaudclient }:
stdenv.mkDerivation {
name = "gjay-0.3.2";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/gjay/gjay-0.3.2.tar.gz";
sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ];
meta = with stdenv.lib; {
description = "Generates playlists such that each song sounds good following the previous song";
homepage = http://gjay.sourceforge.net/;
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
};
}

View file

@ -3,12 +3,12 @@
libvorbis, hicolor_icon_theme, gdk_pixbuf }:
stdenv.mkDerivation rec {
version = "2.1.4";
version = "2.1.5";
name = "gtkpod-${version}";
src = fetchurl {
url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa";
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
};
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];

View file

@ -3,22 +3,17 @@
, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "2014-11-01";
version = "2015-07-02";
name = "x42-plugins-${version}";
src = fetchurl {
url = "http://gareus.org/misc/x42-plugins/x42-plugins-20141101.tar.xz";
sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk";
url = "http://gareus.org/misc/x42-plugins/x42-plugins-20150702.tar.xz";
sha256 = "1mq0grabzbl9xsd53v2qajhr8nngk0d4lx9n0n3nwy95y2gmy6sm";
};
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
# remove check for zita-convolver in /usr/
patchPhase = ''
sed -i "38,42d" convoLV2/Makefile
'';
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ];
meta = with stdenv.lib;
{ description = "Collection of LV2 plugins by Robin Gareus";

View file

@ -2,6 +2,8 @@
, freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk, libXtst, jre
, webkitgtk2 ? null # for internal web browser
, buildEnv, writeText, runCommand
, callPackage
}:
assert stdenv ? glibc;
@ -334,4 +336,58 @@ in {
};
};
};
eclipse-platform = buildEclipse {
name = "eclipse-platform-4.5";
description = "Eclipse platform";
sources = {
"x86_64-linux" = fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz";
sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg";
};
"i686-linux" = fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz";
sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd";
};
};
};
eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
let
# Gather up the desired plugins.
pluginEnv = buildEnv {
name = "eclipse-plugins";
paths =
with stdenv.lib;
filter (x: x ? isEclipsePlugin) (closePropagation plugins);
};
# Prepare the JVM arguments to add to the ini file. We here also
# add the property indicating the plugin directory.
dropinPropName = "org.eclipse.equinox.p2.reconciler.dropins.directory";
dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins";
jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]);
# Prepare an eclipse.ini with the plugin directory.
origEclipseIni = builtins.readFile "${eclipse}/eclipse/eclipse.ini";
eclipseIniFile = writeText "eclipse.ini" ''
${origEclipseIni}
${jvmArgsText}
'';
# Base the derivation name on the name of the underlying
# Eclipse.
name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name;
in
runCommand name { buildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin
makeWrapper ${eclipse}/bin/eclipse $out/bin/eclipse \
--add-flags "--launcher.ini ${eclipseIniFile}"
ln -s ${eclipse}/share $out/
'';
plugins = callPackage ./plugins.nix { };
}

View file

@ -0,0 +1,336 @@
{ stdenv, fetchurl, fetchzip, unzip }:
rec {
# A primitive builder of Eclipse plugins. This function is intended
# to be used when building more advanced builders.
buildEclipsePluginBase = { name
, buildInputs ? []
, passthru ? {}
, ... } @ attrs:
stdenv.mkDerivation (attrs // {
name = "eclipse-" + name;
buildInputs = buildInputs ++ [ unzip ];
passthru = {
isEclipsePlugin = true;
} // passthru;
});
# Helper for the common case where we have separate feature and
# plugin JARs.
buildEclipsePlugin = { name, srcFeature, srcPlugin, ... } @ attrs:
buildEclipsePluginBase (attrs // {
srcs = [ srcFeature srcPlugin ];
phases = [ "installPhase" ];
installPhase = ''
dropinDir="$out/eclipse/dropins/${name}"
mkdir -p $dropinDir/features
unzip ${srcFeature} -d $dropinDir/features/
mkdir -p $dropinDir/plugins
cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
'';
});
# Helper for the case where the build directory has the layout of an
# Eclipse update site, that is, it contains the directories
# `features` and `plugins`. All features and plugins inside these
# directories will be installed.
buildEclipseUpdateSite = { name, ... } @ attrs:
buildEclipsePluginBase (attrs // {
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
dropinDir="$out/eclipse/dropins/${name}"
# Install features.
cd features
for feature in *.jar; do
featureName=''${feature%.jar}
mkdir -p $dropinDir/features/$featureName
unzip $feature -d $dropinDir/features/$featureName
done
cd ..
# Install plugins.
mkdir -p $dropinDir/plugins
# A bundle should be unpacked if the manifest matches this
# pattern.
unpackPat="Eclipse-BundleShape:\\s*dir"
cd plugins
for plugin in *.jar ; do
pluginName=''${plugin%.jar}
manifest=$(unzip -p $plugin META-INF/MANIFEST.MF)
if [[ $manifest =~ $unpackPat ]] ; then
mkdir $dropinDir/plugins/$pluginName
unzip $plugin -d $dropinDir/plugins/$pluginName
else
cp -v $plugin $dropinDir/plugins/
fi
done
cd ..
'';
});
acejump = buildEclipsePlugin rec {
name = "acejump-${version}";
version = "1.0.0.201501181511";
srcFeature = fetchurl {
url = "https://tobiasmelcher.github.io/acejumpeclipse/features/acejump.feature_${version}.jar";
sha256 = "127xqrnns4h96g21c9zg0iblxprx3fg6fg0w5f413rf84415z884";
};
srcPlugin = fetchurl {
url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/acejump_${version}.jar";
sha256 = "0mz79ca32yryidd1wijirvnmfg4j5q4g84vdspdi56z0r4xrja13";
};
meta = with stdenv.lib; {
homepage = https://github.com/tobiasmelcher/EclipseAceJump;
description = "Provides fast jumps to text based on initial letter";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
version = "2.4.15.201504172030";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
sha256 = "19hbwgqn02ghflbcp5cw3qy203mym5kwgzq4xrn0xcl8ckl5s2pp";
};
srcPlugin = fetchurl {
url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar";
sha256 = "1i3ghf2mhdfhify30hlyxqmyqcp40pkd5zhsiyg6finn4w81sxv2";
};
meta = with stdenv.lib; {
homepage = http://andrei.gmxhome.de/anyedit/;
description = "Adds new tools to the context menu of text-based editors";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
version = "8.7.0";
src = fetchzip {
stripRoot = false;
url = "http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.7/${name}.zip";
sha256 = "0qpcjcl6n98x7ys4qz8p1x5hhk2ydrgh8w3r1kqk0zc7liqrx7vg";
};
meta = with stdenv.lib; {
homepage = https://eclipse.org/cdt/;
description = "C/C++ development tooling";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
};
};
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
version = "6.5.0.201504121610";
src = fetchzip {
stripRoot = false;
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.5.0/net.sf.eclipsecs-updatesite_6.5.0.201504121610-bin.zip";
sha256 = "1zikpkss0c3l460ipvznp22kpak8w31n7k6yk41nc1w49zflvcf0";
};
meta = with stdenv.lib; {
homepage = http://eclipse-cs.sourceforge.net/;
description = "Checkstyle integration into the Eclipse IDE";
license = licenses.lgpl21;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
color-theme = buildEclipsePlugin rec {
name = "color-theme-${version}";
version = "1.0.0.201410260308";
srcFeature = fetchurl {
url = "https://eclipse-color-theme.github.io/update/features/com.github.eclipsecolortheme.feature_${version}.jar";
sha256 = "128b9b1cib5ff0w1114ns5mrbrhj2kcm358l4dpnma1s8gklm8g2";
};
srcPlugin = fetchurl {
url = "https://eclipse-color-theme.github.io/update/plugins/com.github.eclipsecolortheme_${version}.jar";
sha256 = "0wz61909bhqwzpqwll27ia0cn3anyp81haqx3rj1iq42cbl42h0y";
};
meta = with stdenv.lib; {
homepage = http://eclipsecolorthemes.org/;
description = "Plugin to switch color themes conveniently and without side effects";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
eclemma = buildEclipseUpdateSite rec {
name = "eclemma-${version}";
version = "2.3.2.201409141915";
src = fetchzip {
stripRoot = false;
url = "mirror://sourceforge/project/eclemma/01_EclEmma_Releases/2.3.2/eclemma-2.3.2.zip";
sha256 = "0w1kwcjh45p7msv5vpc8i6dsqwrnfmjama6vavpnxlji56jd3c43";
};
meta = with stdenv.lib; {
homepage = http://www.eclemma.org/;
description = "EclEmma is a free Java code coverage tool for Eclipse";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
emacsplus = buildEclipsePlugin rec {
name = "emacsplus-${version}";
version = "4.2.0";
srcFeature = fetchurl {
url = "http://www.mulgasoft.com/emacsplus/e4/update-site/features/com.mulgasoft.emacsplus.feature_${version}.jar";
sha256 = "0wja3cd7gq8w25797fxnafvcncjnmlv8qkl5iwqj7zja2f45vka8";
};
srcPlugin = fetchurl {
url = "http://www.mulgasoft.com/emacsplus/e4/update-site/plugins/com.mulgasoft.emacsplus_${version}.jar";
sha256 = "08yw45nr90mlpdzim74vsvdaxj41sgpxcrqk5ia6l2dzvrqlsjs1";
};
meta = with stdenv.lib; {
homepage = http://www.mulgasoft.com/emacsplus/;
description = "Provides a more Emacs-like experience in the Eclipse text editors";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
findbugs = buildEclipsePlugin rec {
name = "findbugs-${version}";
version = "3.0.1.20150306-5afe4d1";
srcFeature = fetchurl {
url = "http://findbugs.cs.umd.edu/eclipse/features/edu.umd.cs.findbugs.plugin.eclipse_${version}.jar";
sha256 = "1m9fav2xlb9wrx2d00lpnh2sy0w5yzawynxm6xhhbfdzd0vpfr9v";
};
srcPlugin = fetchurl {
url = "http://findbugs.cs.umd.edu/eclipse/plugins/edu.umd.cs.findbugs.plugin.eclipse_${version}.jar";
sha256 = "10p3mrbp9wi6jhlmmc23qv7frh605a23pqsc7w96569bsfb5wa8q";
};
meta = with stdenv.lib; {
homepage = http://findbugs.sourceforge.net/;
description = "Plugin that uses static analysis to look for bugs in Java code";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
gnuarmeclipse = buildEclipseUpdateSite rec {
name = "gnuarmeclipse-${version}";
version = "2.8.1-201504061754";
src = fetchzip {
stripRoot = false;
url = "mirror://sourceforge/project/gnuarmeclipse/Current%20Releases/2.x/ilg.gnuarmeclipse.repository-${version}.zip";
sha256 = "08jsnyis1ry62cidr9sl11ylyxbkwh834nlhx6qp31gh1l439px9";
};
meta = with stdenv.lib; {
homepage = http://gnuarmeclipse.livius.net/;
description = "GNU ARM Eclipse Plug-ins";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
};
};
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
version = "4.5";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/org.eclipse.jdt-4.5.zip";
sha256 = "0zrdn26f7qsms2xfiyc049bhhh0czsbf989pgyq736b8hfmmh9iy";
};
meta = with stdenv.lib; {
homepage = https://www.eclipse.org/jdt/;
description = "Eclipse Java development tools";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
scala = buildEclipseUpdateSite rec {
name = "scala-${version}";
version = "4.1.1";
src = fetchzip {
url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
sha256 = "0p2dbf56rw733dhsxy9hdwmbzqlk01j8f2hci21bsipq5w2144x6";
};
meta = with stdenv.lib; {
homepage = "http://scala-ide.org/";
description = "The Scala IDE for Eclipse";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
testng = buildEclipsePlugin rec {
name = "testng-${version}";
version = "6.9.5.201506120235";
srcFeature = fetchurl {
url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar";
sha256 = "02imv0rw10pik55a7p00jin65shvhfpzgna02ky94yx7dlf9fyy9";
};
srcPlugin = fetchurl {
url = "http://beust.com/eclipse/plugins/org.testng.eclipse_6.9.5.201506120235.jar";
sha256 = "0ni1ky4p5l1qzph0np1qw9pcyhrvy6zmn9c8q1b5rm5xv1fcvji4";
};
meta = with stdenv.lib; {
homepage = http://testng.org/;
description = "Eclipse plugin for the TestNG testing framework";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, gtk, libXft, dbus, libpng, libjpeg, libungif
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo, acl, gpm
, withX ? !stdenv.isDarwin
@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ]
++ stdenv.lib.optional (withX && withGTK2) [ gtk2 ]
++ stdenv.lib.optional (withX && withGTK3) [ gtk3 ]
++ stdenv.lib.optional (withX && withGTK2) gtk2
++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
configureFlags =

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "vanubi-${version}";
version = "0.0.14";
version = "0.0.16";
src = fetchurl {
url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz";
sha256 = "0cd45zm54j6xz1a31qllg2w7l77sncv7mrpfx9bjzdiqpmzsdypl";
sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
};
buildInputs = [ pkgconfig vala which autoconf automake

View file

@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
"-DUSE_PYTHON=OFF"
];
buildPhase = ''
make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
INSTALLDIR=$out dist_dir=
preBuild = ''
makeFlags="ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0
INSTALLDIR=$out dist_dir="
'';
enableParallelBuilding = true;

View file

@ -2,11 +2,11 @@
buildDotnetPackage rec {
baseName = "keepass";
version = "2.29";
version = "2.30";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
sha256 = "051s0aznyyhbpdbly6h5rs0ax0zvkp45dh93nmq6lwhicswjwn5m";
sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a";
};
sourceRoot = ".";

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:
stdenv.mkDerivation {
name = "keepassx2-2.0alpha6";
name = "keepassx2-2.0beta1";
src = fetchurl {
url = "https://github.com/keepassx/keepassx/archive/2.0-alpha6.tar.gz";
sha256 = "592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0";
url = "https://github.com/keepassx/keepassx/archive/2.0-beta1.tar.gz";
sha256 = "1wnbk9laixz16lmchr1lnv8m9i6rkxv6slnx8f0fyczx90y97qdw";
};
buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];

View file

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "2.1.3";
version = "2.1.4";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz";
sha256 = "10jnqz7ilxppv60h0hpkq7wgc3fbcm3z19xhnqz9hwp3brz2xm9g";
sha256 = "0apkir1rw3msdpps0y0c8skr293h6c4l48c1vx0w4brz337lhdfi";
};
configureFlags = [

View file

@ -1,45 +0,0 @@
diff -urN synergy-1.4.17-Source/CMakeLists.txt synergy-1.4.17-Source-fix/CMakeLists.txt
--- synergy-1.4.17-Source/CMakeLists.txt 2014-03-14 21:34:19.000000000 +0100
+++ synergy-1.4.17-Source-fix/CMakeLists.txt 2014-04-11 13:37:18.839338710 +0200
@@ -145,6 +145,9 @@
check_type_size(long SIZEOF_LONG)
check_type_size(short SIZEOF_SHORT)
+ # let's just assume cryptopp exists (provided by the Nix expression)
+ list(APPEND libs cryptopp)
+
# pthread is used on both Linux and Mac
check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
if (HAVE_PTHREAD)
@@ -317,7 +320,6 @@
endif()
add_subdirectory(src)
-add_subdirectory(ext)
if (WIN32)
# TODO: consider using /analyze to uncover potential bugs in the source code.
diff -urN synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h
--- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h 2014-02-28 13:36:45.000000000 +0100
+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h 2014-04-11 13:36:01.111985556 +0200
@@ -25,6 +25,6 @@
# pragma GCC system_header
#endif
-#include <cryptopp562/gcm.h>
-#include <cryptopp562/modes.h>
-#include <cryptopp562/aes.h>
+#include <cryptopp/gcm.h>
+#include <cryptopp/modes.h>
+#include <cryptopp/aes.h>
diff -urN synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h
--- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h 2014-02-28 13:36:45.000000000 +0100
+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h 2014-04-11 13:36:07.173013005 +0200
@@ -25,5 +25,5 @@
# pragma GCC system_header
#endif
-#include <cryptopp562/osrng.h>
-#include <cryptopp562/sha.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/sha.h>

View file

@ -1,38 +1,44 @@
{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr
, xinput, curl, cryptopp ? null, unzip }:
assert stdenv.isLinux -> cryptopp != null;
, xinput, curl, openssl, unzip }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "synergy-${version}";
version = "1.6.3";
version = "1.7.4";
src = fetchFromGitHub {
owner = "synergy";
repo = "synergy";
rev = version;
sha256 = "0n4zvz669vi2wyn6i6xhxp0j3nvjl4yzm441cqv6hb0d5k26wbcn";
rev = "v${version}-stable";
sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33";
};
patches = optional stdenv.isLinux ./cryptopp.patch;
postPatch = (if stdenv.isLinux then ''
sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt
'' else ''
${unzip}/bin/unzip -d ext/cryptopp562 ext/cryptopp562.zip
'') + ''
postPatch = ''
${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
''
# We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
# it's not able to find it (it's trying to search the store path of libX11
# instead) and we don't get XRandR support, even though the CMake output
# _seems_ to say so:
#
# Looking for XRRQueryExtension in Xrandr - found
#
# The relevant part however is:
#
# Looking for XRRNotifyEvent - not found
#
# So let's force it:
+ optionalString stdenv.isLinux ''
sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
set(HAVE_X11_EXTENSIONS_XRANDR_H true)
' CMakeLists.txt
'';
buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput curl ]
++ optional stdenv.isLinux cryptopp;
# At this moment make install doesn't work for synergy
# http://synergy-foss.org/spit/issues/details/3317/
buildInputs = [
cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl
];
installPhase = ''
mkdir -p $out/bin
@ -45,8 +51,8 @@ stdenv.mkDerivation rec {
checkPhase = "../bin/unittests";
meta = {
description = "Tool to share the mouse keyboard and the clipboard between computers";
homepage = http://synergy-foss.org;
description = "Share one mouse and keyboard between multiple computers";
homepage = "http://synergy-project.org/";
license = licenses.gpl2;
maintainers = [ maintainers.aszlig ];
platforms = platforms.all;

View file

@ -0,0 +1,14 @@
diff --git a/chrome/test/data/webui_test_resources.grd b/chrome/test/data/webui_test_resources.grd
index 6f8530d..f92a76a 100644
--- a/chrome/test/data/webui_test_resources.grd
+++ b/chrome/test/data/webui_test_resources.grd
@@ -6,9 +6,4 @@
</output>
<output filename="webui_test_resources.pak" type="data_package" />
</outputs>
- <release seq="1">
- <includes>
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
- </includes>
- </release>
</grit>

View file

@ -44,7 +44,11 @@ in stdenv.mkDerivation {
done
'';
patches = singleton ./nix_plugin_paths_44.patch;
patches =
if versionOlder version "45.0.0.0"
then singleton ./nix_plugin_paths_44.patch
else singleton ./nix_plugin_paths_46.patch ++
optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch;
patchPhase = let
diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";

View file

@ -0,0 +1,75 @@
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 74bf041..5f34198 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -66,21 +66,14 @@ static base::LazyInstance<base::FilePath>
g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
// Gets the path for internal plugins.
-bool GetInternalPluginsDirectory(base::FilePath* result) {
-#if defined(OS_MACOSX) && !defined(OS_IOS)
- // If called from Chrome, get internal plugins from a subdirectory of the
- // framework.
- if (base::mac::AmIBundled()) {
- *result = chrome::GetFrameworkBundlePath();
- DCHECK(!result->empty());
- *result = result->Append("Internet Plug-Ins");
- return true;
- }
- // In tests, just look in the module directory (below).
-#endif
-
- // The rest of the world expects plugins in the module directory.
- return PathService::Get(base::DIR_MODULE, result);
+bool GetInternalPluginsDirectory(base::FilePath* result,
+ const std::string& ident) {
+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
+ const char* value = getenv(full_env.c_str());
+ if (value == NULL)
+ return PathService::Get(base::DIR_MODULE, result);
+ else
+ *result = base::FilePath(value);
}
#if defined(OS_WIN)
@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) {
create_dir = true;
break;
case chrome::DIR_INTERNAL_PLUGINS:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "ALL"))
return false;
break;
case chrome::DIR_PEPPER_FLASH_PLUGIN:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
return false;
cur = cur.Append(kPepperFlashBaseDirectory);
break;
@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) {
// We currently need a path here to look up whether the plugin is disabled
// and what its permissions are.
case chrome::FILE_NACL_PLUGIN:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "NACL"))
return false;
cur = cur.Append(kInternalNaClPluginFileName);
break;
@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.DirName();
}
#else
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "PNACL"))
return false;
#endif
cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) {
// In the component case, this is the source adapter. Otherwise, it is the
// actual Pepper module that gets loaded.
case chrome::FILE_WIDEVINE_CDM_ADAPTER:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
return false;
cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
break;

View file

@ -1,21 +1,21 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
version = "45.0.2454.15";
sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
sha256bin32 = "1fcwzwb6zq7ld7fs0iws0d9jmxhjhdax4y744dx4d7bc77357x3m";
sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s";
version = "46.0.2478.0";
sha256 = "15h6gq9vzycamdx01cyz3dv8raprdrd4k97c8pigxbli3n18b41k";
sha256bin32 = "0q10zacsl82nadfvp59ppidai74pc53000qsh4ixdji3xqcbisk4";
sha256bin64 = "1v57w8n7dxw1yb20710f0mzkvil7apyikvfp0174xb2rbr1ipwng";
};
beta = {
version = "45.0.2454.15";
sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
sha256bin32 = "1scjirp54z08h36zs9z9yq4pxcximf00krlip9dkvxsxh65qiw5w";
sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s";
version = "45.0.2454.26";
sha256 = "0ghgvll1q6nw1ds139nmabbilagffyln7k313w1yvn707wp7yg33";
sha256bin32 = "0611ad202vck0zi0jcldcr4j81kd9cnabsc9kssc6m46fy5rhhbk";
sha256bin64 = "0bwmpl7rq2nj0jf1xqx7n1mvx9kigbvpz2f8v0azwv4nb56p9c2q";
};
stable = {
version = "44.0.2403.130";
sha256 = "055lccfiqdqwcjnx9l9xgzcilm2m341rg66nfnnadqa490prnxrp";
sha256bin32 = "0yzjhqyw2aaiwfv395c75avizcg28f3bn9zkqk2p3ifcv231w15v";
sha256bin64 = "1dzwlrdvnqyz6rpcl3pavpvqsx6la1d04cvgca3iaanq5xcana8b";
version = "44.0.2403.155";
sha256 = "0g4z46vbqwnsbmhlbyqm3lm5dz6sxjz0m51cnxhxs850231738pb";
sha256bin32 = "11f8224b8p14py5abi78m74l5hsrhdhipcf2dw7bgqddhykzr4h6";
sha256bin64 = "1mhbga7s43qg13rv6ss0xsn8hkf9fdmgd293ymj564ih39l9bnbm";
};
}

View file

@ -16,14 +16,14 @@
assert stdenv.cc ? libc && stdenv.cc.libc != null;
let version = "39.0.3"; in
let version = "40.0"; in
stdenv.mkDerivation rec {
name = "firefox-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
sha1 = "e024e528317d6c531fb36a26d2ce3317d3510b42";
sha1 = "48483e5738182f8567e2b6d2e29bd6bc1812d3eb";
};
buildInputs =

View file

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, cppcheck, libmrss }:
let version = "1.9.1"; in
let version = "2.0"; in
stdenv.mkDerivation rec {
name = "rsstail-${version}";
src = fetchFromGitHub {
sha256 = "0jhf7vr7y56r751wy4ix80iwhgxhk6mbbin8gnx59i457gf6sjl1";
rev = "1220d63aaa233961636f859d9a406536fffb64f4";
sha256 = "0fbsyl5bdxr2g25ps7kd34sa0mzggklbg4v7qss68gh82zdp16ch";
rev = "69dc5e30439b89c037aa49c5af861f28df607c72";
repo = "rsstail";
owner = "flok99";
};
@ -28,14 +28,11 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional doCheck cppcheck;
postPatch = ''
substituteInPlace Makefile --replace /usr $out
substituteInPlace Makefile --replace -liconv ""
'';
makeFlags = "prefix=$(out)";
enableParallelBuilding = true;
doCheck = true;
preInstall = ''
mkdir -p $out/{bin,share/man/man1}
'';
}

View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } :
stdenv.mkDerivation rec {
name = "pidgin-opensteamworks-1.5.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";
repo = "pidgin-opensteamworks";
rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd";
sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025";
};
preConfigure = "cd steam-mobile";
postInstall = ''
mkdir -p $out/lib/pidgin/
mkdir -p $out/share/pixmaps/pidgin/protocols/
cp libsteam.so $out/lib/pidgin/
unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/
'';
buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ];
meta = with stdenv.lib; {
homepage = https://code.google.com/p/pidgin-opensteamworks;
description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility";
license = licenses.gpl3;
platforms = platforms.linux;
maintainters = with maintainers; [ arobyn ];
};
}

View file

@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "3.1.11";
version = "3.2.3";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i";
sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6";
};
nativeBuildInputs = [ pkgconfig which ];
@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
++ optional guiSupport dbus_libs;
configureFlags = [
"--with-libboost-lib=${boost.lib}/lib"
"--with-libboost-inc=${boost.dev}/include"
"--with-boost-libdir=${boost.lib}/lib"
"--with-boost=${boost.dev}"
(if guiSupport then "" else "--disable-gui")
(if webuiSupport then "" else "--disable-webui")
] ++ optional debugSupport "--enable-debug";
# https://github.com/qbittorrent/qBittorrent/issues/1992
enableParallelBuilding = false;
enableParallelBuilding = true;
meta = {
description = "Free Software alternative to µtorrent";

View file

@ -1,13 +1,13 @@
{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
stdenv.mkDerivation rec {
version = "1.1.4";
version = "1.1.6";
name = "backintime-common-${version}";
src = fetchurl {
url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz";
sha256 = "0w57b7xygwx83azz463fd4y7fxz0z6dy74f70ixhvhlsdpxw2ks3";
sha256 = "04yw1v6h959mmvc67mhh0km7vkxjzb7j1mniv5xfjdy27ryii1ig";
};
buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ];

View file

@ -1,21 +1,23 @@
{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
, goffice, gnome3, makeWrapper, gtk3
, python, pygobject3
}:
stdenv.mkDerivation rec {
name = "gnumeric-1.12.20";
name = "gnumeric-1.12.23";
src = fetchurl {
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
sha256 = "1k915ks55a32fpqrr0rx6j8ml9bw0a07f11350qc1bvkx53i2jad";
sha256 = "0lcmw4jrfg9y2fhx13xw8w85vi7bcmgyn2sdjxi21xkh3szlqiq0";
};
configureFlags = "--disable-component";
# ToDo: optional libgda, python, introspection?
# ToDo: optional libgda, introspection?
buildInputs = [
pkgconfig intltool perl perlXMLParser
goffice gtk3 makeWrapper gnome3.defaultIconTheme
python pygobject3
];
enableParallelBuilding = true;

View file

@ -9,12 +9,12 @@
buildPythonPackage rec {
name = "zim-${version}";
version = "0.62";
version = "0.63";
namePrefix = "";
src = fetchurl {
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
sha256 = "1hmx24jjazqvs3z6h10jl8wrqxyvvk0wc807v222vaf1sbmjmmhr";
sha256 = "077vf4h0hjmbk8bxj9l0z9rxcb3dw642n32lvfn6vjdna1qm910m";
};
propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];

View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl, zlib, bzip2 }:
stdenv.mkDerivation {
name = "cbc-2.9.5";
src = fetchurl {
url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz";
sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w";
};
configureFlags = "-C";
enableParallelBuilding = true;
buildInputs = [ zlib bzip2 ];
# FIXME: move share/coin/Data to a separate output?
meta = {
homepage = https://projects.coin-or.org/Cbc;
license = lib.licenses.epl10;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux;
description = "A mixed integer programming solver";
};
}

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
, wrapGAppsHook, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3
}:
with stdenv.lib;
@ -35,6 +35,8 @@ buildPythonPackage rec {
glib
gobjectIntrospection
gsettings_desktop_schemas
gnome3.defaultIconTheme
wrapGAppsHook
];
configurePhase = ''
@ -46,15 +48,6 @@ buildPythonPackage rec {
buildPhase = "true";
postInstall = ''
# GI_TYPELIB_PATH is needed at runtime for GObject stuff to work
for file in "$out"/bin/*; do
wrapProgram "$file" \
--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
--prefix GSETTINGS_SCHEMA_DIR : $out/share/glib-2.0/schemas \
--prefix XDG_DATA_DIRS : "$out/share:${gtk3}/share:$GSETTINGS_SCHEMAS_PATH:\$XDG_DATA_DIRS"
done
${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
'';

View file

@ -0,0 +1,26 @@
{ stdenv, fetchgit, perl, libxcb, libXft }:
let
version = "2015-07-23";
in
stdenv.mkDerivation rec {
name = "bar-xft-git-${version}";
src = fetchgit {
url = "https://github.com/krypt-n/bar";
rev = "020a3e1848ce03287886e9ff80b0b443e9aed543";
sha256 = "1xzs37syhlwyjfxnk36qnij5bqa0mi53lf1k851viw4qai2bfkgr";
};
buildInputs = [ libxcb libXft perl ];
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
meta = {
description = "A lightweight xcb based bar with XFT-support";
homepage = https://github.com/krypt-n/bar;
maintainers = [ stdenv.lib.maintainers.hiberno ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
stdenv.mkDerivation rec {
name = "bspwm-0.8.9";
name = "bspwm-0.9";
src = fetchurl {
url = "https://github.com/baskerville/bspwm/archive/0.8.9.tar.gz";
sha256 = "750c76132914661d8d5edf7809e9b601977215d31e747dd780c60fd562913d55";
url = "https://github.com/baskerville/bspwm/archive/0.9.tar.gz";
sha256 = "1efb2db7b8a251bcc006d66a050cf66e9d311761c94890bebf91a32905042fde";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A tiling window manager based on binary space partitioning";
homepage = http://github.com/baskerville/bspwm;
maintainers = [ stdenv.lib.maintainers.meisternu ];
maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
};

View file

@ -22,7 +22,7 @@ wrapGAppsHook() {
fi
if [ -d "$prefix/share" ]; then
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
fi
for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
let version = "4.01"; in
let version = "4.02"; in
stdenv.mkDerivation rec {
name = "man-pages-${version}";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "116jp2rnsdlnb3cwnbfp0g053frcmchndwyrj714swl1lgabb56i";
sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
};
makeFlags = "MANDIR=$(out)/share/man";

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "fira-mono-3.204";
name = "fira-mono-3.205";
src = fetchurl {
url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3204.zip;
sha256 = "0pnsw7b1i5vkwq0kny4lxzly4h8rlwkj610rykhax6zayfbnz62a";
url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3205.zip;
sha256 = "0zd4wy8ksbz0qiiqgl9w7zyh34q8n983dyb44g5dfdcjakj09qlz";
};
buildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
sourceRoot = "FiraMonoFonts3204";
sourceRoot = "FiraMonoFonts3205";
installPhase = ''
mkdir -p $out/share/fonts/opentype

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "fira-4.104";
name = "fira-4.105";
src = fetchurl {
url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4104.zip;
sha256 = "1i8l0x2wdx4pw7j52lgy8qcx0wqj0azwjiq0wa9kg26x78bdfk2d";
url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4105.zip;
sha256 = "1857kpn7p7fc1xsmqx9589hk396ggwzd167yc3dmn1mh5dixibfz";
};
buildInputs = [unzip];
phases = [ "unpackPhase" "installPhase" ];
sourceRoot = "FiraFonts4104";
sourceRoot = "FiraFonts4105";
installPhase = ''
mkdir -p $out/share/fonts/opentype

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://pecita.eu/b/Pecita.otf";
sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s";
sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz";
};
phases = ["installPhase"];

View file

@ -8,7 +8,7 @@ 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-05";
version = "2015-08-11";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
@ -27,10 +27,10 @@ stdenv.mkDerivation {
"1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";
"1h4wpqs16a1w16znbr2h15b16p5y43vp6qhj0bc7krq5qa484y2k";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"06p9wnypnffsmqg5bszwygb73in4gc0h5l26wk0s43pdaldrdrx0";
"09qiy2grxnakapvz5xjw3ivbxc0id6srqyd46p68mcy7gwrggcv7";
meta = with stdenv.lib; {
inherit version;

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, intltool, gjs, gdk_pixbuf, librsvg }:
stdenv.mkDerivation rec {
name = "gnome-characters-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${gnome3.version}/${name}.tar.xz";
sha256 = "1gs5k32lmjpi4scb2i7pfnbsy8pl0gb9w1aypyy83hy6ydinaqc4";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
librsvg gnome3.defaultIconTheme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
description = "Simple utility application to find and insert unusual characters";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, intltool, itstool, libxml2, systemd, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-logs-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${gnome3.version}/${name}.tar.xz";
sha256 = "0732jbvih5d678idvhlgqik9j9y594agwdx6gwap80459k1a6fg1";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
systemd hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Logs;
description = "A log viewer for the systemd journal";
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
, gobjectIntrospection, gdk_pixbuf, librsvg
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
stdenv.mkDerivation rec {
name = "gnome-maps-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${gnome3.version}/${name}.tar.xz";
sha256 = "15kwy2fy9v4zzjaqcifv4jaqcx1227bcdxgd6916ghrdzgj93mx7";
};
doCheck = true;
buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
gnome3.geocode_glib libchamplain file libsoup
gdk_pixbuf librsvg
gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Maps;
description = "A map application for GNOME 3";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
, libgweather, intltool, itstool, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-weather-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${gnome3.version}/${name}.tar.xz";
sha256 = "14dx5zj9200qpsb7byfrjkw3144s0q0nmaw5c6ni7vpa8kmvbrac";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
libgweather hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Weather;
description = "Access current weather conditions and forecasts";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,27 @@
{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy_glib, gjs, itstool, telepathy_idle
, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "polari-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/polari/${gnome3.version}/${name}.tar.xz";
sha256 = "0w7hc5i78kq4dkyzpdb9byk4rhqa569cmbg09nh3qxn8ninscdqx";
};
propagatedUserEnvPkgs = [ telepathy_idle ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
telepathy_glib gjs gdk_pixbuf librsvg ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Polari;
description = "IRC chat client designed to integrate with the GNOME desktop";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -1,22 +1,23 @@
{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
, spidermonkey_24, pango, readline, glib }:
let
majorVersion = "1.42";
majorVersion = "1.43";
in
stdenv.mkDerivation rec {
name = "gjs-${majorVersion}.0";
name = "gjs-${majorVersion}.3";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
sha256 = "0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13";
sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
};
buildInputs = with gnome3;
[ gobjectIntrospection pkgconfig glib pango ];
buildInputs = [ gobjectIntrospection pkgconfig gtk3 glib pango readline ];
propagatedBuildInputs = [ spidermonkey_24 ];
meta = with stdenv.lib; {
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};

View file

@ -30,16 +30,21 @@ let
gnome-system-log gnome-system-monitor
gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
gnome-clocks gnome-music gnome-tweak-tool gnome-photos
nautilus-sendto dconf-editor vinagre
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters
];
gamesPackages = with gnome3; [ swell-foop lightsoff iagno
tali quadrapassel
tali quadrapassel gnome-sudoku aisleriot five-or-more
four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
gnome-mines gnome-nibbles gnome-robots gnome-tetravex
hitori gnome-taquin
];
inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
orbit = ORBit2;
gnome3 = self // { recurseForDerivations = false; };
clutter = pkgs.clutter_1_22;
@ -264,18 +269,28 @@ let
spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
};
gnome-characters = callPackage ./apps/gnome-characters { };
gnome-clocks = callPackage ./apps/gnome-clocks { };
gnome-documents = callPackage ./apps/gnome-documents { };
gnome-logs = callPackage ./apps/gnome-logs { };
gnome-maps = callPackage ./apps/gnome-maps { };
gnome-music = callPackage ./apps/gnome-music { };
gnome-photos = callPackage ./apps/gnome-photos {
gegl = gegl_0_3;
};
gnome-weather = callPackage ./apps/gnome-weather { };
nautilus-sendto = callPackage ./apps/nautilus-sendto { };
polari = callPackage ./apps/polari { };
# scrollkeeper replacement
rarian = callPackage ./desktop/rarian { };
@ -289,8 +304,36 @@ let
gdl = callPackage ./devtools/gdl { };
gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
#### Games
aisleriot = callPackage ./games/aisleriot { };
five-or-more = callPackage ./games/five-or-more { };
four-in-a-row = callPackage ./games/four-in-a-row { };
gnome-chess = callPackage ./games/gnome-chess { };
gnome-klotski = callPackage ./games/gnome-klotski { };
gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
gnome-mines = callPackage ./games/gnome-mines { };
gnome-nibbles = callPackage ./games/gnome-nibbles { };
gnome-robots = callPackage ./games/gnome-robots { };
gnome-sudoku = callPackage ./games/gnome-sudoku { };
gnome-taquin = callPackage ./games/gnome-taquin { };
gnome-tetravex = callPackage ./games/gnome-tetravex { };
hitori = callPackage ./games/hitori { };
iagno = callPackage ./games/iagno { };
lightsoff = callPackage ./games/lightsoff { };

View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
stdenv.mkDerivation rec {
name = "gnome-devel-docs-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.version}/${name}.tar.xz";
sha256 = "1jkh40ya5mqss57p27b1hv77x5qis4zc377pyvzqa5wkzrvd0nls";
};
buildInputs = [ intltool itstool libxml2 ];
meta = with stdenv.lib; {
homepage = https://github.com/GNOME/gnome-devel-docs;
description = "Developer documentation for GNOME";
maintainers = gnome3.maintainers;
license = licenses.fdl12;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
, guile, libcanberra_gtk3 }:
stdenv.mkDerivation rec {
name = "aisleriot-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/aisleriot/${gnome3.version}/${name}.tar.xz";
sha256 = "0rncdg21ys7ik971yw75qbawq89mikbh4dq5mg2msmrl6xsgv0zl";
};
configureFlags = [ "--with-card-theme-formats=svg" ];
buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Aisleriot;
description = "A collection of patience games written in guile scheme";
maintainers = gnome3.maintainers;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "five-or-more-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz";
sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Five_or_more;
description = "Remove colored balls from the board by forming lines";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, intltool, itstool, libcanberra_gtk3, librsvg, libxml2
, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "four-in-a-row-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${gnome3.version}/${name}.tar.xz";
sha256 = "1bm5chsvpw0jg1xh9g2n1w5i0fvxs50aqkgmrla9cpawsvzfshmz";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
libxml2 hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
description = "Make lines of the same color to win";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-chess-${gnome3.version}.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${gnome3.version}/${name}.tar.xz";
sha256 = "0j1vvf1myki3bafsqv52q59qk1nhf1636nrb15fpfvm88p3b8wwg";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Chess;
description = "Play the classic two-player boardgame of chess";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-klotski-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-klotski/${gnome3.version}/${name}.tar.xz";
sha256 = "0a64935c7pp51jhaf29q9zlx3lamj7zrhyff7clvv0w8v1w6gpax";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Klotski;
description = "Slide blocks to solve the puzzle";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-mahjongg-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.version}/${name}.tar.xz";
sha256 = "1jbd3gbmxqf36as9xsiarad575l4rpcfv6w1pn192r02aj3hgipj";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Mahjongg;
description = "Disassemble a pile of tiles by removing matching pairs";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-mines-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mines/${gnome3.version}/${name}.tar.xz";
sha256 = "0f0496nhirvpw4zk8bcl24rb2v20cm3gw8d5ybmch42mscmjrb0p";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Mines;
description = "Clear hidden mines from a minefield";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
, libxml2, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-nibbles-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${gnome3.version}/${name}.tar.xz";
sha256 = "1384hc7vx3i1jkmc1pw1cjh61jymq9441ci1k06vjz62r9as1nmx";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Nibbles;
description = "Guide a worm around a maze";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-robots-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${gnome3.version}/${name}.tar.xz";
sha256 = "0dhzl1rhn4ysp3s3j0lxsiw64acz0w1n1bljrfln9s07x8nj17nx";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
libxml2 hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Robots;
description = "Avoid the robots and make them crash into each other";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
, json_glib, qqwing, itstool, libxml2 }:
stdenv.mkDerivation rec {
name = "gnome-sudoku-${gnome3.version}.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${gnome3.version}/${name}.tar.xz";
sha256 = "1b9xwldzjjpkwb2na9cbs8z4gv8dlj9dm574gybdz466190lrsxv";
};
buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
json_glib qqwing itstool libxml2 ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Sudoku;
description = "Test your logic skills in this number grid puzzle";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-taquin-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${gnome3.version}/${name}.tar.xz";
sha256 = "024a1ing1iclmyhi5vlps6xna84vgy7s098h9yvzq43fsahmx8pi";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
intltool itstool libxml2 hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Taquin;
description = "Move tiles so that they reach their places";
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, libxml2, intltool, itstool, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-tetravex-${gnome3.version}.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-tetravex/${gnome3.version}/${name}.tar.xz";
sha256 = "07cmcmrd5fj8vm682894gra2vj8jwx01n3ggjinl93yv4gwpplz9";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Tetravex;
description = "Complete the puzzle by matching numbered tiles";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, libxml2, intltool, itstool, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "hitori-${gnome3.version}.1";
src = fetchurl {
url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
};
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
hicolor_icon_theme
];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Hitori;
description = "GTK+ application to generate and let you play games of Hitori";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -28,7 +28,7 @@ in
stdenv.mkDerivation rec {
version = "7.11.20150718";
name = "ghc-nokinds-${version}";
name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
rev = "4cb79c85a4976c509a65a8638899391a60cd0962";
src = fetchgit {
@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
postUnpack = ''
pushd ghc-${builtins.substring 0 7 rev}
echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID
patchShebangs .
./boot
popd

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "nim-0.11.0";
name = "nim-0.11.2";
buildInputs = [ unzip ];
src = fetchurl {
url = "http://nim-lang.org/download/${name}.zip";
sha256 = "0l19rrp6nhwhr2z33np4x32c35iba0hhv6w3qwj1sk8bjfpvz4cw";
sha256 = "0ay8gkd8fki3d8kbnw2px7rjdlr54kyqh5n1rjhq4vjmqs2wg5s4";
};
buildPhase = "sh build.sh";

View file

@ -1,16 +1,16 @@
{ stdenv, callPackage }:
callPackage ./generic.nix {
shortVersion = "2015-07-28";
shortVersion = "2015-08-09";
isRelease = false;
# src rev for 2015-07-28's nightly channel
srcRev = "8b835572b";
srcSha = "1qrw0vszr1zipsbp7gcm8kik73d2bfxwv6mniv81ygn9i7v76wfz";
snapshotHashLinux686 = "93f6216a35d3bed3cedf244c9aff4cd716336bd9";
snapshotHashLinux64 = "d8f4967fc71a153c925faecf95a7feadf7e463a4";
snapshotHashDarwin686 = "29852c4d4b5a851f16d627856a279cae5bf9bd01";
snapshotHashDarwin64 = "1a20259899321062a0325edb1d22990f05d18708";
snapshotDate = "2015-07-17";
snapshotRev = "d4432b3";
# src rev for 2015-08-09's nightly channel
srcRev = "a5d33d891";
srcSha = "1iivzk9ggjh7y89rbw275apw4rfmzh4jk50kf0milljhvf72660n";
snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8";
snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c";
snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd";
snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6";
snapshotDate = "2015-07-26";
snapshotRev = "a5c12f4";
patches = [
./patches/head.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

View file

@ -259,14 +259,8 @@ self: super: {
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
# webkit does not recognize its system library build input any more.
webkit = markBroken super.webkit; # http://hydra.cryp.to/build/1041942/nixlog/1/raw
ghcjs-dom-hello = dontDistribute super.ghcjs-dom-hello; # depends on broken webkit
ghcjs-dom = dontDistribute super.ghcjs-dom; # depends on broken webkit
jsaddle-hello = dontDistribute super.jsaddle-hello; # depends on broken webkit
reflex-dom = dontDistribute super.reflex-dom; # depends on broken webkit
# Need WebkitGTK, not just webkit.
webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
@ -793,6 +787,7 @@ self: super: {
singleton-nats = dontDistribute super.singleton-nats;
singletons = markBroken super.singletons;
units-attoparsec = dontDistribute super.units-attoparsec;
ihaskell-widgets = dontDistribute super.ihaskell-widgets;
# https://github.com/anton-k/temporal-music-notation/issues/1
temporal-music-notation = markBroken super.temporal-music-notation;
@ -881,23 +876,6 @@ self: super: {
# https://github.com/hspec/mockery/issues/6
mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
# https://github.com/diagrams/diagrams-lib/issues/258
# https://github.com/diagrams/diagrams-lib/issues/259
diagrams-lib = markBroken super.diagrams-lib;
diagrams-cairo = dontDistribute super.diagrams-cairo;
diagrams-gtk = dontDistribute super.diagrams-gtk;
diagrams-html5 = dontDistribute super.diagrams-html5;
diagrams-pandoc = dontDistribute super.diagrams-pandoc;
diagrams-postscript = dontDistribute super.diagrams-postscript;
diagrams-rasterific = dontDistribute super.diagrams-rasterific;
diagrams-rubiks-cube = dontDistribute super.diagrams-rubiks-cube;
diagrams-svg = dontDistribute super.diagrams-svg;
halma = dontDistribute super.halma;
midi-music-box = dontDistribute super.midi-music-box;
potrace-diagrams = dontDistribute super.potrace-diagrams;
SVGFonts = dontDistribute super.SVGFonts;
yesod-media-simple = dontDistribute super.yesod-media-simple;
# https://github.com/alphaHeavy/lzma-conduit/issues/5
lzma-conduit = dontCheck super.lzma-conduit;
@ -926,4 +904,7 @@ self: super: {
# https://github.com/liyang/thyme/issues/36
thyme = dontCheck super.thyme;
# https://github.com/aka-bash0r/multi-cabal/issues/4
multi-cabal = markBroken super.multi-cabal;
}

File diff suppressed because it is too large Load diff

View file

@ -1,6 +0,0 @@
{ callPackage, apacheHttpd }:
callPackage ./generic.nix {
phpVersion = "5.4.43";
sha = "0sydirpwg150wxsjrpp3m38564832wviglmsylhbbl8an17p5mr5";
apacheHttpd = apacheHttpd;
}

View file

@ -1,6 +0,0 @@
{ callPackage, apacheHttpd }:
callPackage ./generic.nix {
phpVersion = "5.5.27";
sha = "0w0zgqria3i3mrp03p9m0613xlaj3vsw9girmslngjn06jjwdd64";
apacheHttpd = apacheHttpd;
}

View file

@ -1,6 +0,0 @@
{ callPackage, apacheHttpd }:
callPackage ./generic.nix {
phpVersion = "5.6.11";
sha = "0riq0c8s8anb1nxvn3ljs7wdn811903sv7kl8ir2ck3n2q42csxx";
apacheHttpd = apacheHttpd;
}

View file

@ -1,8 +0,0 @@
{ callPackage, apacheHttpd }:
callPackage ./generic.nix {
phpVersion = "7.0.0beta1";
url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
sha = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
apacheHttpd = apacheHttpd;
php7 = true;
}

View file

@ -0,0 +1,308 @@
{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
, uwimap, pam, gmp, apacheHttpd }:
let
generic =
{ version, sha256, url ? "http://www.php.net/distributions/php-${version}.tar.bz2" }:
let php7 = lib.versionAtLeast version "7.0"; in
composableDerivation.composableDerivation {} (fixed: {
inherit version;
name = "php-${version}";
enableParallelBuilding = true;
buildInputs = [ flex bison pkgconfig ];
flags = {
# much left to do here...
# SAPI modules:
apxs2 = {
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
buildInputs = [apacheHttpd];
};
# Extensions
imap = {
configureFlags = [
"--with-imap=${uwimap}"
"--with-imap-ssl"
];
buildInputs = [ uwimap openssl pam ];
};
ldap = {
configureFlags = ["--with-ldap=${openldap}"];
buildInputs = [openldap cyrus_sasl openssl];
};
mhash = {
configureFlags = ["--with-mhash"];
buildInputs = [libmhash];
};
curl = {
configureFlags = ["--with-curl=${curl}"];
buildInputs = [curl openssl];
};
curlWrappers = {
configureFlags = ["--with-curlwrappers"];
};
zlib = {
configureFlags = ["--with-zlib=${zlib}"];
buildInputs = [zlib];
};
libxml2 = {
configureFlags = [
"--with-libxml-dir=${libxml2}"
];
buildInputs = [ libxml2 ];
};
pcntl = {
configureFlags = [ "--enable-pcntl" ];
};
readline = {
configureFlags = ["--with-readline=${readline}"];
buildInputs = [ readline ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
};
postgresql = {
configureFlags = ["--with-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
};
pdo_pgsql = {
configureFlags = ["--with-pdo-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
};
mysql = {
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
configureFlags = ["--enable-embedded-mysqli"];
depends = "mysqli";
assertion = fixed.mysqliSupport;
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {
configureFlags = ["--enable-bcmath"];
};
gd = {
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
configureFlags = [
"--with-gd"
"--with-freetype-dir=${freetype}"
"--with-png-dir=${libpng}"
"--with-jpeg-dir=${libjpeg}"
];
buildInputs = [ libpng libjpeg freetype ];
};
gmp = {
configureFlags = ["--with-gmp=${gmp}"];
buildInputs = [ gmp ];
};
soap = {
configureFlags = ["--enable-soap"];
};
sockets = {
configureFlags = ["--enable-sockets"];
};
openssl = {
configureFlags = ["--with-openssl=${openssl}"];
buildInputs = [openssl];
};
mbstring = {
configureFlags = ["--enable-mbstring"];
};
gettext = {
configureFlags = ["--with-gettext=${gettext}"];
buildInputs = [gettext];
};
intl = {
configureFlags = ["--enable-intl"];
buildInputs = [icu];
};
exif = {
configureFlags = ["--enable-exif"];
};
xsl = {
configureFlags = ["--with-xsl=${libxslt}"];
buildInputs = [libxslt];
};
mcrypt = let libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; in {
configureFlags = ["--with-mcrypt=${libmcrypt'}"];
buildInputs = [libmcrypt'];
};
bz2 = {
configureFlags = ["--with-bz2=${bzip2}"];
buildInputs = [bzip2];
};
zip = {
configureFlags = ["--enable-zip"];
};
ftp = {
configureFlags = ["--enable-ftp"];
};
fpm = {
configureFlags = ["--enable-fpm"];
};
mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
configureFlags = ["--with-mssql=${freetds}"];
buildInputs = [freetds];
};
zts = {
configureFlags = ["--enable-maintainer-zts"];
};
calendar = {
configureFlags = ["--enable-calendar"];
};
};
cfg = {
imapSupport = config.php.imap or true;
ldapSupport = config.php.ldap or true;
mhashSupport = config.php.mhash or true;
mysqlSupport = (!php7) && (config.php.mysql or true);
mysqliSupport = config.php.mysqli or true;
pdo_mysqlSupport = config.php.pdo_mysql or true;
libxml2Support = config.php.libxml2 or true;
apxs2Support = config.php.apxs2 or true;
bcmathSupport = config.php.bcmath or true;
socketsSupport = config.php.sockets or true;
curlSupport = config.php.curl or true;
curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
gettextSupport = config.php.gettext or true;
pcntlSupport = config.php.pcntl or true;
postgresqlSupport = config.php.postgresql or true;
pdo_pgsqlSupport = config.php.pdo_pgsql or true;
readlineSupport = config.php.readline or true;
sqliteSupport = config.php.sqlite or true;
soapSupport = config.php.soap or true;
zlibSupport = config.php.zlib or true;
opensslSupport = config.php.openssl or true;
mbstringSupport = config.php.mbstring or true;
gdSupport = config.php.gd or true;
intlSupport = config.php.intl or true;
exifSupport = config.php.exif or true;
xslSupport = config.php.xsl or false;
mcryptSupport = config.php.mcrypt or true;
bz2Support = config.php.bz2 or false;
zipSupport = config.php.zip or true;
ftpSupport = config.php.ftp or true;
fpmSupport = config.php.fpm or true;
gmpSupport = config.php.gmp or true;
mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
ztsSupport = config.php.zts or false;
calendarSupport = config.php.calendar or true;
};
configurePhase = ''
# Don't record the configure flags since this causes unnecessary
# runtime dependencies.
for i in main/build-defs.h.in scripts/php-config.in; do
substituteInPlace $i \
--replace '@CONFIGURE_COMMAND@' '(omitted)' \
--replace '@CONFIGURE_OPTIONS@' "" \
--replace '@PHP_LDFLAGS@' ""
done
iniFile=$out/etc/php-recommended.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
'';
installPhase = ''
unset installPhase; installPhase;
cp php.ini-production $iniFile
'';
src = fetchurl {
inherit url sha256;
};
meta = with stdenv.lib; {
description = "An HTML-embedded scripting language";
homepage = http://www.php.net/;
license = stdenv.lib.licenses.php301;
maintainers = with maintainers; [ globin ];
};
patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ];
});
in {
php54 = generic {
version = "5.4.44";
sha256 = "0vc5lf0yjk1fs7inri76mh0lrcmq32ji4m6yqdmg7314x5f9xmcd";
};
php55 = generic {
version = "5.5.28";
sha256 = "1wy2v5rmbiia3v6fc8nwg1y3sdkdmicksxnkadz1f3035rbjqz8r";
};
php56 = generic {
version = "5.6.12";
sha256 = "0fl5r0lzav7icg97p7gkvbxk0xk2mh7i1r45dycjlyxgf91109vg";
};
php70 = lib.lowPrio (generic {
version = "7.0.0beta1";
url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
sha256 = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
});
}

View file

@ -1,291 +0,0 @@
{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
, uwimap, pam, gmp
, phpVersion, apacheHttpd, sha
, php7 ? false, url ? null }:
let
libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "${phpVersion}";
name = "php-${version}";
enableParallelBuilding = true;
buildInputs = [ flex bison pkgconfig ];
flags = {
# much left to do here...
# SAPI modules:
apxs2 = {
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
buildInputs = [apacheHttpd];
};
# Extensions
imap = {
configureFlags = [
"--with-imap=${uwimap}"
"--with-imap-ssl"
];
buildInputs = [ uwimap openssl pam ];
};
ldap = {
configureFlags = ["--with-ldap=${openldap}"];
buildInputs = [openldap cyrus_sasl openssl];
};
mhash = {
configureFlags = ["--with-mhash"];
buildInputs = [libmhash];
};
curl = {
configureFlags = ["--with-curl=${curl}"];
buildInputs = [curl openssl];
};
curlWrappers = {
configureFlags = ["--with-curlwrappers"];
};
zlib = {
configureFlags = ["--with-zlib=${zlib}"];
buildInputs = [zlib];
};
libxml2 = {
configureFlags = [
"--with-libxml-dir=${libxml2}"
];
buildInputs = [ libxml2 ];
};
pcntl = {
configureFlags = [ "--enable-pcntl" ];
};
readline = {
configureFlags = ["--with-readline=${readline}"];
buildInputs = [ readline ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
};
postgresql = {
configureFlags = ["--with-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
};
pdo_pgsql = {
configureFlags = ["--with-pdo-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
};
mysql = {
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
configureFlags = ["--enable-embedded-mysqli"];
depends = "mysqli";
assertion = fixed.mysqliSupport;
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {
configureFlags = ["--enable-bcmath"];
};
gd = {
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
configureFlags = [
"--with-gd"
"--with-freetype-dir=${freetype}"
"--with-png-dir=${libpng}"
"--with-jpeg-dir=${libjpeg}"
];
buildInputs = [ libpng libjpeg freetype ];
};
gmp = {
configureFlags = ["--with-gmp=${gmp}"];
buildInputs = [ gmp ];
};
soap = {
configureFlags = ["--enable-soap"];
};
sockets = {
configureFlags = ["--enable-sockets"];
};
openssl = {
configureFlags = ["--with-openssl=${openssl}"];
buildInputs = [openssl];
};
mbstring = {
configureFlags = ["--enable-mbstring"];
};
gettext = {
configureFlags = ["--with-gettext=${gettext}"];
buildInputs = [gettext];
};
intl = {
configureFlags = ["--enable-intl"];
buildInputs = [icu];
};
exif = {
configureFlags = ["--enable-exif"];
};
xsl = {
configureFlags = ["--with-xsl=${libxslt}"];
buildInputs = [libxslt];
};
mcrypt = {
configureFlags = ["--with-mcrypt=${libmcryptOverride}"];
buildInputs = [libmcryptOverride];
};
bz2 = {
configureFlags = ["--with-bz2=${bzip2}"];
buildInputs = [bzip2];
};
zip = {
configureFlags = ["--enable-zip"];
};
ftp = {
configureFlags = ["--enable-ftp"];
};
fpm = {
configureFlags = ["--enable-fpm"];
};
mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
configureFlags = ["--with-mssql=${freetds}"];
buildInputs = [freetds];
};
zts = {
configureFlags = ["--enable-maintainer-zts"];
};
calendar = {
configureFlags = ["--enable-calendar"];
};
};
cfg = {
imapSupport = config.php.imap or true;
ldapSupport = config.php.ldap or true;
mhashSupport = config.php.mhash or true;
mysqlSupport = (!php7) && (config.php.mysql or true);
mysqliSupport = config.php.mysqli or true;
pdo_mysqlSupport = config.php.pdo_mysql or true;
libxml2Support = config.php.libxml2 or true;
apxs2Support = config.php.apxs2 or true;
bcmathSupport = config.php.bcmath or true;
socketsSupport = config.php.sockets or true;
curlSupport = config.php.curl or true;
curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
gettextSupport = config.php.gettext or true;
pcntlSupport = config.php.pcntl or true;
postgresqlSupport = config.php.postgresql or true;
pdo_pgsqlSupport = config.php.pdo_pgsql or true;
readlineSupport = config.php.readline or true;
sqliteSupport = config.php.sqlite or true;
soapSupport = config.php.soap or true;
zlibSupport = config.php.zlib or true;
opensslSupport = config.php.openssl or true;
mbstringSupport = config.php.mbstring or true;
gdSupport = config.php.gd or true;
intlSupport = config.php.intl or true;
exifSupport = config.php.exif or true;
xslSupport = config.php.xsl or false;
mcryptSupport = config.php.mcrypt or true;
bz2Support = config.php.bz2 or false;
zipSupport = config.php.zip or true;
ftpSupport = config.php.ftp or true;
fpmSupport = config.php.fpm or true;
gmpSupport = config.php.gmp or true;
mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
ztsSupport = config.php.zts or false;
calendarSupport = config.php.calendar or true;
};
configurePhase = ''
# Don't record the configure flags since this causes unnecessary
# runtime dependencies.
for i in main/build-defs.h.in scripts/php-config.in; do
substituteInPlace $i \
--replace '@CONFIGURE_COMMAND@' '(omitted)' \
--replace '@CONFIGURE_OPTIONS@' "" \
--replace '@PHP_LDFLAGS@' ""
done
iniFile=$out/etc/php-recommended.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
'';
installPhase = ''
unset installPhase; installPhase;
cp php.ini-production $iniFile
'';
src = fetchurl {
url = if url == null then
"http://www.php.net/distributions/php-${version}.tar.bz2"
else
url;
sha256 = sha;
};
meta = with stdenv.lib; {
description = "An HTML-embedded scripting language";
homepage = http://www.php.net/;
license = stdenv.lib.licenses.php301;
maintainers = with maintainers; [ globin ];
};
patches = if !php7 then
[ ./fix-paths.patch ]
else
[ ./fix-paths-php7.patch ]
;
})

View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3.16";
version = "3.3.17";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
sha256 = "1jl5n02mh83ygrrk7rq8vwylv5gdr3wccqs1ynvzr749fd2wq637";
sha256 = "00zrwqvy054fymb6j04xfr583javfjxsid2rbmyk63qrbqzm61v7";
};
})

View file

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.4.3";
version = "3.4.4";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
sha256 = "1q4adb1xi9pl00iy3cqs4r1qmwllv1g1r44p6xsg6n65dpyf53q2";
sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75";
};
})

View file

@ -1,5 +1,5 @@
{ lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound
{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound
, tpmSupport ? false, trousers
# Version dependent args
@ -29,12 +29,12 @@ stdenv.mkDerivation rec {
# for the actual fix.
enableParallelBuilding = !guileBindings;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ]
++ lib.optional guileBindings guile;
nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
nativeBuildInputs = [ perl pkgconfig ];
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .

View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, pth, libgpgerror }:
stdenv.mkDerivation rec {
name = "libassuan-2.2.0";
name = "libassuan-2.2.1";
src = fetchurl {
url = "mirror://gnupg/libassuan/${name}.tar.bz2";
sha256 = "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx";
sha256 = "1pp2kl5gc2vja41g3wk03h1hgh7gxy6pj354fb5n4lrlg6xqb4ll";
};
buildInputs = [ libgpgerror pth ];

View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }:
stdenv.mkDerivation rec {
name = "libaudclient-3.5-rc2";
version = "3.5-rc2";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2";
sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
};
buildInputs = [ pkgconfig glib dbus_glib ];
meta = with stdenv.lib; {
description = "Legacy D-Bus client library for Audacious";
homepage = http://audacious-media-player.org/;
license = licenses.bsd2;
maintainers = with maintainers; [ pSub ];
};
}

View file

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
meta = {
homepage = http://projects.gnome.org/libchamplain/;
license = stdenv.lib.licenses.lgpl2Plus;

View file

@ -4,11 +4,11 @@
with { inherit (stdenv.lib) optionals; };
stdenv.mkDerivation rec {
name = "libgsf-1.14.32";
name = "libgsf-1.14.34";
src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
sha256 = "13bf38b848c01e20eb89a48150b6f864434ee4dfbb6301ddf6f4080a36cd99e9";
sha256 = "f0fea447e0374a73df45b498fd1701393f8e6acb39746119f8a292fb4a0cb528";
};
nativeBuildInputs = [ pkgconfig intltool ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, libevdev, mtdev, udev
, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation
, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
, testsSupport ? false, check ? null, valgrind ? null
}:
@ -15,11 +15,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-0.20.0";
name = "libinput-0.21.0";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "0p8jswag33qjjxd8766hzk460bzhzhw32b6hl2i17aygjz7dynqp";
sha256 = "0l7mhdr50g11hxg2pz8ihsgzbm0810syj05d3555rzhda6g7mkkw";
};
configureFlags = [

View file

@ -5,11 +5,11 @@ let
version = "${libVersion}-list-${listVersion}";
listVersion = "2015-08-03";
listVersion = "2015-08-07";
listArchive = let
rev = "447962d71bf512fe41e828afc7fa66a1701c7c3c";
rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab";
in fetchurl {
sha256 = "0gp0cb6p8yvyy5kvgdwg45ian9rb07bb0a9ibdj58g21l54mx3r2";
sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi";
url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
};

View file

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "0.16.17";
sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7";
version = "0.16.19";
sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw";
})

View file

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.0.2";
sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w";
version = "1.0.6";
sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r";
})

View file

@ -1,18 +1,26 @@
{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip
{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip
# Version specific options
, version, sha256
, ... }:
let formattedVersion = lib.replaceChars ["."] ["_"] version;
in
stdenv.mkDerivation rec {
name = "libtorrent-rasterbar-${version}";
src = fetchurl {
url = "mirror://sourceforge/libtorrent/${name}.tar.gz";
url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
inherit sha256;
};
nativeBuildInputs = [automake autoconf libtool ];
buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ];
preConfigure = "./autotool.sh";
configureFlags = [
"--enable-python-binding"
"--with-libgeoip=system"
@ -21,6 +29,8 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.lib}/lib"
"--with-libiconv=yes"
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.rasterbar.com/products/libtorrent/;

View file

@ -16,9 +16,6 @@ stdenv.mkDerivation (rec {
enableParallelBuilding = true;
# It doesn't build otherwise
dontDisableStatic = true;
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
./cygwin.patch;

View file

@ -11,11 +11,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.19.2";
version = "3.19.3";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/${name}.tar.gz";
sha256 = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae";
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_3_RTM/src/${name}.tar.gz";
sha256 = "c56bdad20736a8227afb3c97b25d6d2eb3982e979ddc9be1d66cb7199ae8ca8f";
};
buildInputs = [ nspr perl zlib sqlite ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "0.13.8";
version = "0.13.9";
src = fetchurl {
url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
sha256 = "0n4ivla8s8ygfnf95dj624nhcyganigf7fy0gamgyf31vw1vnw35";
sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
};
phases = [ "installPhase" ];

View file

@ -1,55 +1,30 @@
{ fetchurl, stdenv, guile, which, libffi }:
{ stdenv, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
let version = "5.18"; in
stdenv.mkDerivation rec {
name = "autogen-${version}";
version = "5.18.5";
stdenv.mkDerivation {
name = "autogen-${version}";
src = fetchurl {
url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
sha256 = "1flnbnmkbqmbfgammkl8m36wrlk6rhpgnf9pdm6gdfhqalxvggbv";
};
src = fetchurl {
url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
sha256 = "1h2d3wpzkla42igxyisaqh2nwpq01vwad1wp9671xmm5ahvkw5f7";
};
nativeBuildInputs = [ which pkgconfig perl ];
buildInputs = [ guile libxml2 ];
buildInputs = [ guile which libffi ];
postPatch = ''
# Fix a broken sed expression used for detecting the minor
# version of guile we are using
sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure
'';
patchPhase =
'' for i in $(find -name \*.in)
do
sed -i "$i" -e's|/usr/bin/||g'
done
'';
#doCheck = true; # 2 tests fail because of missing /dev/tty
# The tests rely on being able to find `libopts.a'.
configureFlags = "--enable-static";
#doCheck = true; # 2 tests fail because of missing /dev/tty
meta = with stdenv.lib; {
description = "Automated text and program generation tool";
longDescription = ''
AutoGen is a tool designed to simplify the creation and maintenance
of programs that contain large amounts of repetitious text. It is
especially valuable in programs that have several blocks of text that
must be kept synchronized.
AutoGen can now accept XML files as definition input, in addition to
CGI data (for producing dynamic HTML) and traditional AutoGen
definitions.
A common example where this would be useful is in creating and
maintaining the code required for processing program options.
Processing options requires multiple constructs to be maintained in
parallel in different places in your program. Options maintenance
needs to be done countless times. So, AutoGen comes with an add-on
package named AutoOpts that simplifies the maintenance and
documentation of program options.
'';
license = with licenses; [ gpl3Plus lgpl3Plus ];
homepage = http://www.gnu.org/software/autogen/;
maintainers = [ ];
};
}
meta = with stdenv.lib; {
description = "Automated text and program generation tool";
license = with licenses; [ gpl3Plus lgpl3Plus ];
homepage = http://www.gnu.org/software/autogen/;
platforms = platforms.all;
maintainers = [ ];
};
}

View file

@ -1,32 +1,39 @@
{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype
, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
, gtkClient ? false, gtk
, server ? true, readline }:
let
inherit (stdenv.lib) optional optionals;
client = sdlClient || gtkClient;
sdlName = if sdlClient then "-sdl" else "";
gtkName = if gtkClient then "-gtk" else "";
baseName = "freeciv-2.4.0";
name = "freeciv";
version = "2.5.0";
in
stdenv.mkDerivation {
name = baseName + sdlName + gtkName;
name = "${name}${sdlName}${gtkName}-${version}";
src = fetchurl {
url = "mirror://sourceforge/freeciv/${baseName}.tar.bz2";
sha256 = "1bc01pyihsrby6w95n49gi90ggp40dyxsy4kmlmwcakxfxprwakv";
url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
sha256 = "bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b";
# sha1 = "477b60e02606e47b31a019b065353c1a6da6c305";
# md5 = "8a61ecd986853200326711446c573f1b";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib bzip2 curl lzma gettext ]
++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ]
++ optional gtkClient gtk
++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
++ optionals gtkClient [ gtk ]
++ optional server readline;
configureFlags = []
++ optional sdlClient "--enable-client=sdl"
++ optional (!gtkClient) "--enable-fcmp=cli"
++ optional (!server) "--disable-server";
meta = with stdenv.lib; {
description = "Multiplayer (or single player), turn-based strategy game";

View file

@ -28,10 +28,16 @@ stdenv.mkDerivation {
cp vegastrike $out/bin
cp vegaserver $out/bin
'';
meta = {
meta = with stdenv.lib; {
homepage = http://privateer.sourceforge.net/;
longDescription = "";
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
description = "Adventure space flight simulation computer game";
license = licenses.gpl2Plus; # and a special license for art data
# https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt
maintainers = with maintainers; [ chaoflow ];
platforms = with platforms; linux ++ darwin;
hydraPlatforms = [];
broken = true; # it won't build
};
}

View file

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
name = "qqwing-${version}";
version = "1.3.4";
src = fetchFromGitHub {
owner = "stephenostermiller";
repo = "qqwing";
rev = "v${version}";
sha256 = "1qq0vi4ch4y3a5fb1ncr0yzkj3mbvdiwa3d51qpabq94sh0cz09i";
};
postPatch = ''
for file in "src-first-comment.pl" "src_neaten.pl"; do
substituteInPlace "build/$file" \
--replace "#!/usr/bin/perl" "#!${perl}/bin/perl"
done
substituteInPlace "build/cpp_install.sh" \
--replace "sudo " ""
'';
buildInputs = [ perl autoconf automake libtool ];
makeFlags = [ "prefix=$(out)" "tgz" ];
meta = with stdenv.lib; {
homepage = https://qqwing.com;
description = "Sudoku generating and solving software";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds ];
};
}

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