Merge branch 'master.upstream' into staging.upstream
This commit is contained in:
William A. Kennington III
commit
7ebe164ae0
@ -85,6 +85,44 @@ in ...</programlisting>
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="sec-pkg-overrideDerivation">
|
||||
<title><pkg>.overrideDerivation</title>
|
||||
|
||||
<para>
|
||||
The function <varname>overrideDerivation</varname> is usually available for all the
|
||||
derivations in the nixpkgs expression (<varname>pkgs</varname>).
|
||||
</para>
|
||||
<para>
|
||||
It is used to create a new derivation by overriding the attributes of
|
||||
the original derivation according to the given function.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Example usage:
|
||||
|
||||
<programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
|
||||
name = "sed-4.2.2-pre";
|
||||
src = fetchurl {
|
||||
url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
|
||||
sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
|
||||
};
|
||||
patches = [];
|
||||
});</programlisting>
|
||||
</para>
|
||||
|
||||
<para>
|
||||
In the above example, the name, src and patches of the derivation
|
||||
will be overridden, while all other attributes will be retained from the
|
||||
original derivation.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
The argument <varname>oldAttrs</varname> is used to refer to the attribute set of
|
||||
the original derivation.
|
||||
</para>
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="sec-lib-makeOverridable">
|
||||
<title>lib.makeOverridable</title>
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
auntie = "Jonathan Glines <auntieNeo@gmail.com>";
|
||||
avnik = "Alexander V. Nikolaev <avn@avnik.info>";
|
||||
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
|
||||
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
|
||||
balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
|
||||
bbenoist = "Baptist BENOIST <return_0@live.com>";
|
||||
bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
|
||||
|
||||
@ -261,11 +261,16 @@ rec {
|
||||
evalOptionValue = loc: opt: defs:
|
||||
let
|
||||
# Add in the default value for this option, if any.
|
||||
defs' = (optional (opt ? default)
|
||||
{ file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs;
|
||||
defs' =
|
||||
(optional (opt ? default)
|
||||
{ file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs;
|
||||
|
||||
# Handle properties, check types, and merge everything together.
|
||||
res = mergeDefinitions loc opt.type defs';
|
||||
res =
|
||||
if opt.readOnly or false && length defs' > 1 then
|
||||
throw "The option `${showOption loc}' is read-only, but it's set multiple times."
|
||||
else
|
||||
mergeDefinitions loc opt.type defs';
|
||||
|
||||
# Check whether the option is defined, and apply the ‘apply’
|
||||
# function to the merged value. This allows options to yield a
|
||||
|
||||
@ -19,6 +19,7 @@ rec {
|
||||
, apply ? null # Function that converts the option value to something else.
|
||||
, internal ? null # Whether the option is for NixOS developers only.
|
||||
, visible ? null # Whether the option shows up in the manual.
|
||||
, readOnly ? null # Whether the option can be set only once
|
||||
, options ? null # Obsolete, used by types.optionSet.
|
||||
} @ attrs:
|
||||
attrs // { _type = "option"; };
|
||||
@ -90,6 +91,7 @@ rec {
|
||||
declarations = filter (x: x != unknownModule) opt.declarations;
|
||||
internal = opt.internal or false;
|
||||
visible = opt.visible or true;
|
||||
readOnly = opt.readOnly or false;
|
||||
type = opt.type.name or null;
|
||||
}
|
||||
// (if opt ? example then { example = scrubOptionValue opt.example; } else {})
|
||||
|
||||
@ -25,61 +25,65 @@
|
||||
<option>
|
||||
<xsl:value-of select="attr[@name = 'name']/string/@value" />
|
||||
</option>
|
||||
</term>
|
||||
</term>
|
||||
|
||||
<listitem>
|
||||
<listitem>
|
||||
|
||||
<para>
|
||||
<xsl:value-of disable-output-escaping="yes"
|
||||
select="attr[@name = 'description']/string/@value" />
|
||||
</para>
|
||||
<para>
|
||||
<xsl:value-of disable-output-escaping="yes"
|
||||
select="attr[@name = 'description']/string/@value" />
|
||||
</para>
|
||||
|
||||
<xsl:if test="attr[@name = 'type']">
|
||||
<para>
|
||||
<emphasis>Type:</emphasis>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:apply-templates select="attr[@name = 'type']" mode="top" />
|
||||
</para>
|
||||
</xsl:if>
|
||||
<xsl:if test="attr[@name = 'type']">
|
||||
<para>
|
||||
<emphasis>Type:</emphasis>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:value-of select="attr[@name = 'type']/string/@value"/>
|
||||
<xsl:if test="attr[@name = 'readOnly']/bool/@value = 'true'">
|
||||
<xsl:text> </xsl:text>
|
||||
<emphasis>(read only)</emphasis>
|
||||
</xsl:if>
|
||||
</para>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="attr[@name = 'default']">
|
||||
<para>
|
||||
<emphasis>Default:</emphasis>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:apply-templates select="attr[@name = 'default']" mode="top" />
|
||||
</para>
|
||||
</xsl:if>
|
||||
<xsl:if test="attr[@name = 'default']">
|
||||
<para>
|
||||
<emphasis>Default:</emphasis>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:apply-templates select="attr[@name = 'default']" mode="top" />
|
||||
</para>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="attr[@name = 'example']">
|
||||
<para>
|
||||
<emphasis>Example:</emphasis>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:choose>
|
||||
<xsl:when test="attr[@name = 'example']/attrs[attr[@name = '_type' and string[@value = 'literalExample']]]">
|
||||
<programlisting><xsl:value-of select="attr[@name = 'example']/attrs/attr[@name = 'text']/string/@value" /></programlisting>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:apply-templates select="attr[@name = 'example']" mode="top" />
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</para>
|
||||
</xsl:if>
|
||||
<xsl:if test="attr[@name = 'example']">
|
||||
<para>
|
||||
<emphasis>Example:</emphasis>
|
||||
<xsl:text> </xsl:text>
|
||||
<xsl:choose>
|
||||
<xsl:when test="attr[@name = 'example']/attrs[attr[@name = '_type' and string[@value = 'literalExample']]]">
|
||||
<programlisting><xsl:value-of select="attr[@name = 'example']/attrs/attr[@name = 'text']/string/@value" /></programlisting>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:apply-templates select="attr[@name = 'example']" mode="top" />
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</para>
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
|
||||
<para>
|
||||
<emphasis>Declared by:</emphasis>
|
||||
</para>
|
||||
<xsl:apply-templates select="attr[@name = 'declarations']" />
|
||||
</xsl:if>
|
||||
<xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
|
||||
<para>
|
||||
<emphasis>Declared by:</emphasis>
|
||||
</para>
|
||||
<xsl:apply-templates select="attr[@name = 'declarations']" />
|
||||
</xsl:if>
|
||||
|
||||
<xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
|
||||
<para>
|
||||
<emphasis>Defined by:</emphasis>
|
||||
</para>
|
||||
<xsl:apply-templates select="attr[@name = 'definitions']" />
|
||||
</xsl:if>
|
||||
<xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
|
||||
<para>
|
||||
<emphasis>Defined by:</emphasis>
|
||||
</para>
|
||||
<xsl:apply-templates select="attr[@name = 'definitions']" />
|
||||
</xsl:if>
|
||||
|
||||
</listitem>
|
||||
</listitem>
|
||||
|
||||
</varlistentry>
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ pkgs.releaseTools.makeSourceTarball {
|
||||
officialRelease = false; # FIXME: fix this in makeSourceTarball
|
||||
inherit version versionSuffix;
|
||||
|
||||
buildInputs = [ pkgs.nixUnstable ];
|
||||
buildInputs = [ pkgs.nix ];
|
||||
|
||||
expr = builtins.readFile ./channel-expr.nix;
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ with lib;
|
||||
};
|
||||
|
||||
system.nixosRelease = mkOption {
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
type = types.str;
|
||||
default = readFile "${toString pkgs.path}/.version";
|
||||
description = "NixOS release.";
|
||||
@ -48,7 +48,7 @@ with lib;
|
||||
};
|
||||
|
||||
system.nixosCodeName = mkOption {
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
type = types.str;
|
||||
description = "NixOS release code name.";
|
||||
};
|
||||
|
||||
@ -78,8 +78,8 @@ in
|
||||
description = ''
|
||||
This option defines the maximum number of jobs that Nix will try
|
||||
to build in parallel. The default is 1. You should generally
|
||||
set it to the number of CPUs in your system (e.g., 2 on an Athlon
|
||||
64 X2).
|
||||
set it to the total number of logical cores in your system (e.g., 16
|
||||
for two CPUs with 4 cores each and hyper-threading).
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -25,6 +25,24 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation {
|
||||
name = "nixos-gsettings-desktop-schemas";
|
||||
buildInputs = [ pkgs.nixos-artwork ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
|
||||
cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/
|
||||
chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
|
||||
cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
|
||||
[org.gnome.desktop.background]
|
||||
picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
|
||||
|
||||
[org.gnome.desktop.screensaver]
|
||||
picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
|
||||
EOF
|
||||
${pkgs.glib}/bin/glib-compile-schemas $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/
|
||||
'';
|
||||
};
|
||||
|
||||
in {
|
||||
|
||||
options = {
|
||||
@ -109,6 +127,9 @@ in {
|
||||
# Override default mimeapps
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
|
||||
|
||||
# Override gsettings-desktop-schema
|
||||
export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
|
||||
|
||||
# Let nautilus find extensions
|
||||
export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@ in
|
||||
./windowmaker.nix
|
||||
./wmii.nix
|
||||
./xmonad.nix
|
||||
./qtile.nix
|
||||
./none.nix ];
|
||||
|
||||
options = {
|
||||
|
||||
25
nixos/modules/services/x11/window-managers/qtile.nix
Normal file
25
nixos/modules/services/x11/window-managers/qtile.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.windowManager.qtile;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = [{
|
||||
name = "qtile";
|
||||
start = ''
|
||||
${pkgs.qtile}/bin/qtile
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
||||
environment.systemPackages = [ pkgs.qtile ];
|
||||
};
|
||||
}
|
||||
@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ncmpcpp-${version}";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
|
||||
sha256 = "1w85r23s0b30vh03xybnjikslqcf02gsciib9v10jw71nw32wzkm";
|
||||
sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji";
|
||||
};
|
||||
|
||||
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
|
||||
|
||||
@ -159,24 +159,25 @@ rec {
|
||||
};
|
||||
|
||||
gmic =
|
||||
let
|
||||
imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
|
||||
in pluginDerivation rec {
|
||||
name = "gmic-1.5.7.2";
|
||||
buildInputs = [imagemagick pkgconfig pkgs.fftw gimp] ++ gimp.nativeBuildInputs;
|
||||
pluginDerivation rec {
|
||||
name = "gmic-1.6.5.0";
|
||||
|
||||
buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz;
|
||||
sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1";
|
||||
url = http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz;
|
||||
sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb";
|
||||
};
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick"
|
||||
'';
|
||||
|
||||
sourceRoot = "${name}/src";
|
||||
buildPhase = "make gimp";
|
||||
|
||||
buildFlags = "gimp";
|
||||
|
||||
installPhase = "installPlugins gmic_gimp";
|
||||
|
||||
meta = {
|
||||
description = "script language for image processing which comes with its open-source interpreter";
|
||||
homepage = http://gmic.sourceforge.net/repository.shtml;
|
||||
homepage = http://gmic.eu/gimp.shtml;
|
||||
license = stdenv.lib.licenses.cecill20;
|
||||
/*
|
||||
The purpose of this Free Software license agreement is to grant users
|
||||
|
||||
@ -1,23 +1,11 @@
|
||||
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x
|
||||
, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
|
||||
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }:
|
||||
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
|
||||
, webkitgtk24x, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib
|
||||
, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, makeWrapper
|
||||
, gnome_doc_utils, hicolor_icon_theme, cacert }:
|
||||
|
||||
# for dependencies see http://www.yorba.org/projects/shotwell/install/
|
||||
|
||||
let
|
||||
rest = stdenv.mkDerivation rec {
|
||||
name = "rest-0.7.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
|
||||
sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
|
||||
};
|
||||
|
||||
configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
buildInputs = [ pkgconfig glib libsoup ];
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.20.2";
|
||||
name = "shotwell-${version}";
|
||||
|
||||
@ -47,10 +35,11 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
|
||||
buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
|
||||
libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
|
||||
makeWrapper gnome_doc_utils
|
||||
buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x
|
||||
pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
|
||||
which udev gnome3.gexiv2 hicolor_icon_theme
|
||||
libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
|
||||
makeWrapper gnome_doc_utils gnome3.rest
|
||||
gnome3.defaultIconTheme ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
33
pkgs/applications/misc/super_user_spark/default.nix
Normal file
33
pkgs/applications/misc/super_user_spark/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ mkDerivation, fetchurl, ghc, aeson, aeson-pretty, base, binary, bytestring
|
||||
, directory, filepath, HTF, HUnit, mtl, parsec, process, shelly
|
||||
, stdenv, text, transformers, unix, xdg-basedir
|
||||
, happy
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "super-user-spark";
|
||||
version = "0.1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/NorfairKing/super-user-spark/archive/v0.1.tar.gz";
|
||||
sha256 = "90258cb2d38f35b03867fdf82dbd49500cdec04f3cf05d0eaa18592cb44fe13f";
|
||||
};
|
||||
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
jailbreak = true;
|
||||
|
||||
buildDepends = [
|
||||
aeson aeson-pretty base binary bytestring directory filepath HTF
|
||||
mtl parsec process shelly text transformers unix xdg-basedir happy
|
||||
];
|
||||
testDepends = [
|
||||
aeson aeson-pretty base binary bytestring directory filepath HTF
|
||||
HUnit mtl parsec process shelly text transformers unix xdg-basedir
|
||||
];
|
||||
license = stdenv.lib.licenses.mit;
|
||||
homepage = "https://github.com/NorfairKing/super-user-spark";
|
||||
description = "A safe way to never worry about your beautifully configured system again";
|
||||
platforms = ghc.meta.platforms;
|
||||
maintainers = stdenv.lib.maintainers.badi;
|
||||
}
|
||||
@ -7,15 +7,15 @@
|
||||
sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s";
|
||||
};
|
||||
beta = {
|
||||
version = "44.0.2403.89";
|
||||
sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
|
||||
sha256bin32 = "1vk022m9kz9fw82sd94zqzi988ald3p2vlha7pz5wm2dgibwr25g";
|
||||
sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
|
||||
version = "45.0.2454.15";
|
||||
sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
|
||||
sha256bin32 = "1scjirp54z08h36zs9z9yq4pxcximf00krlip9dkvxsxh65qiw5w";
|
||||
sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s";
|
||||
};
|
||||
stable = {
|
||||
version = "44.0.2403.107";
|
||||
sha256 = "0w9xk2jrpp98fgszswr5jc0g5ggpm8rfxqzxa8402n7iwkxlyqyh";
|
||||
sha256bin32 = "0x4j5ggb2dh56lz5fg2h79lvp92rgsk59gi5h3ml678vcghzyfvn";
|
||||
sha256bin64 = "0nhm9783b314dmicqky3424ak4z6xhb6rjia12pq2ajddz9qj9rj";
|
||||
version = "44.0.2403.125";
|
||||
sha256 = "0li483phq72xlg0bpsgfk1rlxrmldk4g45ijx1xmnfs42g38wmkq";
|
||||
sha256bin32 = "0h5a2wm13bvrq013skp3lq40bzx9519mb9kh8x3n4800lnanbjcb";
|
||||
sha256bin64 = "1p9gfqpgyihvby4pb3fdn4ibg84fh4gksy18cvyi9zq7cibww2ff";
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,6 +18,7 @@ let
|
||||
debMirrors = [
|
||||
"http://95.31.35.30/chrome/pool/main/g"
|
||||
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
|
||||
"http://repo.fdzh.org/chrome/deb/pool/main/g"
|
||||
];
|
||||
|
||||
tryChannel = channel: let
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl,
|
||||
{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl,
|
||||
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
|
||||
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "boinc-7.4.14";
|
||||
version = "7.4.42";
|
||||
name = "boinc-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://boinc.berkeley.edu/boinc-v2.git";
|
||||
rev = "fb31ab18f94f3b5141bea03e8537d76c606cd276";
|
||||
sha256 = "1465zl8l87fm1ps5f2may6mcc3pp40mpd6wphpxnwwk1lmv48x96";
|
||||
src = fetchFromGitHub {
|
||||
owner = "BOINC";
|
||||
repo = "boinc";
|
||||
rev = "561fbdae0cac3be996136319828f43cbc62c9";
|
||||
sha256 = "1rlh463yyz88p2g5pc6avndn3x1162vcksgbqich0i3qb90jms29";
|
||||
};
|
||||
|
||||
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.4.6";
|
||||
version = "2.5.0";
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
in
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "1djkjjv491nk6g8rzrb4n75yqdfp3xpiv569nqblaiq33ibl9ndx";
|
||||
sha256 = "0p747j94kynrx71qaamc9i0dkq5vqpv66a47b68pmin1qsxb2nfc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "qarte-2.2.0-147";
|
||||
name = "qarte-2.3.0";
|
||||
src = fetchbzr {
|
||||
url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;
|
||||
rev = "147";
|
||||
sha256 = "0cl3k3vr3kmp5dls0lbv5pka4zrlyh5816pwl5rkgqmycl11pk51";
|
||||
rev = "148";
|
||||
sha256 = "0bp2qbl2g3dygmb31lwlarki9lybkb9zxixda4lwrlz628w93fxh";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -10,9 +10,16 @@ coverageReportPhase() {
|
||||
mkdir -p $out/coverage
|
||||
genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log
|
||||
|
||||
# Grab the overall coverage percentage for use in release overviews.
|
||||
# Grab the overall coverage percentage so that Hydra can plot it over time.
|
||||
mkdir -p $out/nix-support
|
||||
grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate
|
||||
lineCoverage="$(sed 's/.*lines\.*: \([0-9\.]\+\)%.*/\1/; t ; d' log)"
|
||||
functionCoverage="$(sed 's/.*functions\.*: \([0-9\.]\+\)%.*/\1/; t ; d' log)"
|
||||
if [ -z "$lineCoverage" -o -z "$functionCoverage" ]; then
|
||||
echo "failed to get coverage statistics"
|
||||
exit 1
|
||||
fi
|
||||
echo "lineCoverage $lineCoverage %" >> $out/nix-support/hydra-metrics
|
||||
echo "functionCoverage $functionCoverage %" >> $out/nix-support/hydra-metrics
|
||||
|
||||
echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
|
||||
}
|
||||
|
||||
@ -1,5 +1,13 @@
|
||||
gappsWrapperArgs=()
|
||||
|
||||
find_gio_modules() {
|
||||
if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
|
||||
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
|
||||
fi
|
||||
}
|
||||
|
||||
envHooks+=(find_gio_modules)
|
||||
|
||||
wrapGAppsHook() {
|
||||
if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
|
||||
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
|
||||
|
||||
@ -2,11 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "source-code-pro-${version}";
|
||||
version = "1.017";
|
||||
version = "2.010";
|
||||
version_italic = "1.030";
|
||||
|
||||
src = fetchurl {
|
||||
url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R.tar.gz";
|
||||
sha256="03q4a0f142c6zlngv6kjaik52y0yzwq5z5qj3j0fvvcbfy9sanjr";
|
||||
url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R-ro/${version_italic}R-it.tar.gz";
|
||||
sha256="12wijgxrdzqxpw2q420nsq9aj454vhg3rq6n81jbqvgzxhxjpf7w";
|
||||
};
|
||||
|
||||
phases = "unpackPhase installPhase";
|
||||
|
||||
@ -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-07-25";
|
||||
version = "2015-07-30";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "geolite-legacy-${version}";
|
||||
@ -27,10 +27,10 @@ stdenv.mkDerivation {
|
||||
"0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
|
||||
srcGeoIPASNum = fetchDB
|
||||
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
|
||||
"18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";
|
||||
"16lfazhyhwmh8fyd7pxzwxp5sxszbqw4xdx3avv78hglhyb2ijkw";
|
||||
srcGeoIPASNumv6 = fetchDB
|
||||
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
|
||||
"0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs";
|
||||
"16jd6f2pwy8616jb78x8j6zda7h0p1bp786y86rq3ipgcw6g0jgn";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/gnome-session" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : "${unzip}/bin" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
--suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
|
||||
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
|
||||
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
|
||||
@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for file in "background" "screensaver"; do
|
||||
substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
|
||||
--replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ glib gobjectIntrospection ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
|
||||
, intltool, itstool, libcanberra_gtk3, libxml2 }:
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
|
||||
, intltool, itstool, libcanberra_gtk3, libxml2, dconf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iagno-${gnome3.version}.1";
|
||||
@ -10,17 +10,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
|
||||
libxml2 libcanberra_gtk3 makeWrapper itstool intltool ];
|
||||
dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/iagno" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
|
||||
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Iagno;
|
||||
description = "Computer version of the game Reversi, more popularly called Othello";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
|
||||
, intltool, itstool, clutter, clutter_gtk, libxml2 }:
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
|
||||
, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lightsoff-${gnome3.version}.1.1";
|
||||
@ -9,18 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
|
||||
libxml2 clutter clutter_gtk makeWrapper itstool intltool ];
|
||||
buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
|
||||
libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/lightsoff" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
|
||||
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Lightsoff;
|
||||
description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
|
||||
, clutter, clutter_gtk, intltool, itstool, libxml2 }:
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
|
||||
, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swell-foop-${gnome3.version}.1";
|
||||
@ -10,17 +10,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
|
||||
makeWrapper itstool intltool clutter clutter_gtk libxml2 ];
|
||||
dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/swell-foop" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
|
||||
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
|
||||
description = "Puzzle game, previously known as Same GNOME";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
|
||||
|
||||
let
|
||||
major = "5.2";
|
||||
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
|
||||
buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Database access library";
|
||||
|
||||
@ -12,13 +12,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/JuliaLang/julia.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "ad0820affefd04eb6fba7deb2603756974711846a251900a9202b8d2665a37cf";
|
||||
sha256 = "0px1zd7qmz6rrjf58k4kq55s7h8mny1w6xvcsrny2wbgckxzhqsg";
|
||||
name = "julia-git-v${version}";
|
||||
};
|
||||
|
||||
@ -132,7 +132,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
# Test fail on i686 (julia version 0.3.10)
|
||||
doCheck = !stdenv.isi686;
|
||||
checkTarget = "testall";
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig
|
||||
, libjack2, libsndfile, fftw, curl
|
||||
, libjack2, libsndfile, fftw, curl, gcc
|
||||
, libXt, qt, readline
|
||||
, useSCEL ? false, emacs
|
||||
}:
|
||||
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [
|
||||
libjack2 libsndfile fftw curl libXt qt readline ]
|
||||
gcc libjack2 libsndfile fftw curl libXt qt readline ]
|
||||
++ optional useSCEL emacs;
|
||||
}
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
|
||||
version = "1.4";
|
||||
version = "2015-07-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accelio";
|
||||
repo = "accelio";
|
||||
rev = "v${version}";
|
||||
sha256 = "0cxiwn63481m88zisd0pqs6g0h5k1amz2kidwyxkdbl6xgf70cwd";
|
||||
rev = "0c4b6d535831650112ba9409a5c7d6e1bc436d61";
|
||||
sha256 = "044m92pnvdl64irvy7bdqr51gz0qr5f14xnsig4gkc3vb0afbb4j";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Don't build broken examples
|
||||
sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
|
||||
sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
|
||||
|
||||
# Allow the installation of xio kernel headers
|
||||
sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
|
||||
|
||||
@ -1,19 +1,17 @@
|
||||
{ stdenv, fetchurl, zlib, xz }:
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
|
||||
assert !(stdenv ? cross) -> zlib != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpng-1.2.51";
|
||||
name = "libpng-1.2.52";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng/${name}.tar.xz";
|
||||
sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
|
||||
sha256 = "1h0fa67x4bh7gcdh7qx87m4xpkdfqa7ihd4h678dcyh52jzhzyyl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
||||
nativeBuildInputs = [ xz ];
|
||||
|
||||
passthru = { inherit zlib; };
|
||||
|
||||
crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
|
||||
assert zlib != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpng-1.5.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng/${name}.tar.xz";
|
||||
sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = { inherit zlib; };
|
||||
|
||||
meta = {
|
||||
description = "The official reference implementation for the PNG file format";
|
||||
homepage = http://www.libpng.org/pub/png/libpng.html;
|
||||
license = stdenv.lib.licenses.libpng;
|
||||
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
|
||||
branch = "1.5";
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, goPackages, fetchFromGitHub }:
|
||||
|
||||
with goPackages;
|
||||
|
||||
buildGoPackage rec {
|
||||
version = "0.4.5";
|
||||
name = "etcdctl-${version}";
|
||||
goPackagePath = "github.com/coreos/etcdctl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "etcdctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0";
|
||||
};
|
||||
|
||||
dontInstallSrc = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple command line client for etcd";
|
||||
homepage = http://coreos.com/using-coreos/etcd/;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,14 @@
|
||||
{stdenv, fetchurl, SDL, mesa, libpng, libjpeg, SDL_ttf, libvorbis, gettext,
|
||||
physfs} :
|
||||
{ stdenv, fetchurl, SDL2, mesa_noglu, libpng, libjpeg, SDL2_ttf, libvorbis, gettext
|
||||
, physfs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neverball-1.5.4";
|
||||
name = "neverball-1.6.0";
|
||||
src = fetchurl {
|
||||
url = "http://neverball.org/${name}.tar.gz";
|
||||
sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga";
|
||||
sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk";
|
||||
};
|
||||
|
||||
buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs];
|
||||
buildInputs = [ libpng SDL2 mesa_noglu libjpeg SDL2_ttf libvorbis gettext physfs ];
|
||||
|
||||
dontPatchElf = true;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
unstable = {
|
||||
wineVersion = "1.7.46";
|
||||
wineSha256 = "02rmhz64ianls3z9r6nxf97k49bvfmyhwmpjz5a31pknqrn09d4s";
|
||||
wineVersion = "1.7.47";
|
||||
wineSha256 = "0bmvgcag0kv0671dj6fbfdz86ij91rb2kp2dssqw83a0xidgfx5s";
|
||||
geckoVersion = "2.36";
|
||||
geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
|
||||
gecko64Version = "2.36";
|
||||
@ -23,11 +23,11 @@
|
||||
#monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
|
||||
};
|
||||
staging = {
|
||||
version = "1.7.46";
|
||||
sha256 = "0nkqqrzx9hprwjzg7ffzirnldxpqa6wn9c1rcyd34k77ym1v44pa";
|
||||
version = "1.7.47";
|
||||
sha256 = "0m47v4jbc70b7qxj0lqnc7an1xlcb81b6k7dwzjyk3pv3ixp2snp";
|
||||
};
|
||||
winetricks = {
|
||||
version = "20150416";
|
||||
sha256 = "0467cn5hqry6fscjskpvxw0y00lr059jmldv1csicbav4l0dxx8k";
|
||||
version = "20150706";
|
||||
sha256 = "1n9xbav4q0dpfdmmjcahi4izyhvy2f7ddrq7gyhrm6pxs2zli888";
|
||||
};
|
||||
}
|
||||
|
||||
@ -84,6 +84,7 @@ rec {
|
||||
wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
|
||||
yankring = YankRing;
|
||||
|
||||
|
||||
CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "CSApprox-2013-07-26";
|
||||
src = fetchgit {
|
||||
@ -96,11 +97,11 @@ rec {
|
||||
};
|
||||
|
||||
Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Gist-2015-06-24";
|
||||
name = "Gist-2015-07-04";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/mattn/gist-vim";
|
||||
rev = "297c4b90511b6daf7b35c219652a56ac2f0209ee";
|
||||
sha256 = "f7da15fd5c4dbd0e7fb5a66b7212f11db1f05ccbe53ccc06c9d3b1d4bd205923";
|
||||
rev = "52e2d54a038baf548de01c9413a6ebc8860fa111";
|
||||
sha256 = "32b9c0ccc51b846651ac49d496060b842a57ca342bdc1038b16c59c1b34b0ca0";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -151,11 +152,11 @@ rec {
|
||||
};
|
||||
|
||||
Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "Syntastic-2015-06-26";
|
||||
name = "Syntastic-2015-07-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/syntastic";
|
||||
rev = "8e672780e76c0a774b7fe834eed9652ccd684c24";
|
||||
sha256 = "10b113c456387ebe2b08f81f6464408382a525d9b37e4e6b3fd54808dd25c1a4";
|
||||
rev = "a01107ffa66fdd38d3ea0fcc769f3582349c5a3f";
|
||||
sha256 = "66b2ef4ad41f30ed409c77e05e637b9c122e62a4acda98d2f89c9205227eba64";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -184,33 +185,33 @@ rec {
|
||||
};
|
||||
|
||||
The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "The_NERD_Commenter-2014-07-08";
|
||||
name = "The_NERD_Commenter-2015-07-26";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/nerdcommenter";
|
||||
rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
|
||||
sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
|
||||
rev = "5cc672a4f2adb734ac671499476034f0cd1d3d72";
|
||||
sha256 = "a8ab1f90044bf96e9c105c4a3ff6bbd9aaa20bddbaca1d82d7ca15d2cc3c2654";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "The_NERD_tree-2015-06-17";
|
||||
name = "The_NERD_tree-2015-07-13";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scrooloose/nerdtree";
|
||||
rev = "96c07746b46c12d0aca7a5276cc5bd0a260b82fe";
|
||||
sha256 = "0a3854121674fed598b21154f749a5eadd590a2e5632dd6fc8a9307bdb4cf4d8";
|
||||
rev = "86e2e40af161e65a3ad671214f16f23af360a5a7";
|
||||
sha256 = "de4f35757f6e14644e59a7ba3e5d0a10ffe04aea9d192f2f81bba24d14c7595c";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "UltiSnips-2015-06-11";
|
||||
name = "UltiSnips-2015-07-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/sirver/ultisnips";
|
||||
rev = "c3a0924b777dbba2f8612950bd8f8a00df18d1bf";
|
||||
sha256 = "7ad0e5dc8e8713db38ef2875e5d512e6cf8ef3dd7885ce12aff22052da780593";
|
||||
rev = "67fbdb2ad8c965378bdd60c892d3a43049caf3f1";
|
||||
sha256 = "487fd113adc9a2c66ae6c12cbbd21e283e1a9c024a65910398ecf26322772c07";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -241,9 +242,9 @@ rec {
|
||||
YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "YankRing";
|
||||
src = fetchurl {
|
||||
url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
|
||||
name = "yankring_180.zip";
|
||||
sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
|
||||
url = "http://www.vim.org/scripts/download_script.php?src_id=23487";
|
||||
name = "yankring_190.zip";
|
||||
sha256 = "0nnxpsfjp2p9jvs3y5ynnd5s56snz9927zdp9bgmay2jgxfmp0si";
|
||||
};
|
||||
buildInputs = [ unzip ];
|
||||
dependencies = [];
|
||||
@ -255,11 +256,11 @@ rec {
|
||||
};
|
||||
|
||||
commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "commentary-2014-11-10";
|
||||
name = "commentary-2015-07-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-commentary";
|
||||
rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
|
||||
sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
|
||||
rev = "7fb632aab475b1d2560fe18a329742ba3b4725c6";
|
||||
sha256 = "29f8f8a354a749b30b98940c32c09355cd29aa456a9bf83c2d5dc7cc8bc7c8fe";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -288,22 +289,22 @@ rec {
|
||||
};
|
||||
|
||||
fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "fugitive-2015-06-14";
|
||||
name = "fugitive-2015-07-20";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/tpope/vim-fugitive";
|
||||
rev = "1c844375fa2762e3b7c16294fa36afee6fef28b1";
|
||||
sha256 = "fa02d055243a386fe3fdb5069f36d3f035ace3594c1b1dd4a4bbc61df232fb97";
|
||||
rev = "03cc95cc198ea94a6a003a92cd0e58af4416ec25";
|
||||
sha256 = "cab17591d0eeb0fff4520855347467d85baf56b444dd60b797323d164e92a9de";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "ghcmod-2015-03-17";
|
||||
name = "ghcmod-2015-07-26";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/eagletmt/ghcmod-vim";
|
||||
rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
|
||||
sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
|
||||
rev = "caf086cd84fe0b26f24f0f93233d4c0c98bce524";
|
||||
sha256 = "04fa2558baab2b9d93c49f3d984f0ed8196513875095ab7117f39b02087bfeeb";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -354,11 +355,11 @@ rec {
|
||||
};
|
||||
|
||||
neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neco-ghc-2015-04-07";
|
||||
name = "neco-ghc-2015-07-05";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/eagletmt/neco-ghc";
|
||||
rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda";
|
||||
sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59";
|
||||
rev = "2ad708360c8f64732a0827618cddfd23e89a8664";
|
||||
sha256 = "ff18dcb7e5b076f88acc51dd508729635a76c619e592db010af6e877ff7afa92";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -376,22 +377,22 @@ rec {
|
||||
};
|
||||
|
||||
idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "idris-vim-2015-06-23";
|
||||
name = "idris-vim-2015-07-19";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/idris-hackers/idris-vim";
|
||||
rev = "4c1723c34a434aad2455c7c2f2a30d97ed691191";
|
||||
sha256 = "db09ad5a7c75d9ac2ccb1be2b85d6ed9cd507ec0fc736e994d8d315c5916170d";
|
||||
rev = "91b695a9120268a9b9828a0665e89b3c39a1f070";
|
||||
sha256 = "df16f45fd6c79f44c7da179c6cfc06e1d43aa801832249b12d8134c476db7ff9";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "calendar-vim-2015-05-21";
|
||||
name = "calendar-vim-2015-06-28";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/itchyny/calendar.vim";
|
||||
rev = "394c789d2235a7a056ba527daf722e9119cac1c8";
|
||||
sha256 = "dfefb8d479096baa755185546624fffdd9c843da9c4fdbf17f213cdba599c08e";
|
||||
rev = "9cf5b7a01d439c5093bac92364d06e29ed15f2f0";
|
||||
sha256 = "7e3f98b72270447b471aae0f178d2b06292d3449007b41350c6145436d1da114";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -431,11 +432,11 @@ rec {
|
||||
};
|
||||
|
||||
vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-buffergator-2015-03-31";
|
||||
name = "vim-buffergator-2015-07-12";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/jeetsukumaran/vim-buffergator";
|
||||
rev = "77cfdd127fcf026ea2d5e8f5aaf85502286b16b7";
|
||||
sha256 = "2d3ce83b5ea7d0502cea3e91bf1e2a0b27a046879c1b5ff1854df47028dd4d48";
|
||||
rev = "28f818ea0aea6771c153efb91a35fc0ab9a16700";
|
||||
sha256 = "d19710b41d24b2e5611e5c2977dc7fac47f3d9899b80c44da2f5d08b3538551a";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -452,17 +453,6 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-multiple-cursors-2015-05-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/terryma/vim-multiple-cursors";
|
||||
rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
|
||||
sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-nerdtree-tabs-2014-09-25";
|
||||
src = fetchgit {
|
||||
@ -530,22 +520,22 @@ rec {
|
||||
};
|
||||
|
||||
vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-easymotion-2015-06-22";
|
||||
name = "vim-easymotion-2015-07-25";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/lokaltog/vim-easymotion";
|
||||
rev = "ef0cb2b0a0feee865e70c42fdaf03a4f8e621f38";
|
||||
sha256 = "13f0d18f0c822dc7ba99f2365539de1e2c63817b89a6d0d2e9c2e8689ee85cb7";
|
||||
rev = "eab003a0991608464b58c90c56be5d9c6b64d840";
|
||||
sha256 = "6f5d4942481c41c1a88c45066ea51019ee4ecd4235e0f54c549cb7df2b8b59e6";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-xkbswitch-2015-05-19";
|
||||
name = "vim-xkbswitch-2015-07-26";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/lyokha/vim-xkbswitch";
|
||||
rev = "0854ac6a810daae4a5c99bcae61613266ce75c26";
|
||||
sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655";
|
||||
rev = "eba2979fa3d11dc09d4ef9ef3854926f28b783a4";
|
||||
sha256 = "f51ff00ad6e40ba9f31be18fee5e6f80cf48c51872392a0dafe08477749b74bd";
|
||||
};
|
||||
dependencies = [];
|
||||
patchPhase = ''
|
||||
@ -578,22 +568,22 @@ rec {
|
||||
};
|
||||
|
||||
vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-watchdogs-2015-06-15";
|
||||
name = "vim-watchdogs-2015-07-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/osyo-manga/vim-watchdogs";
|
||||
rev = "7dd19b1344e6bb89ecd469b085ad945435905eb9";
|
||||
sha256 = "8481b5e0efffec520f66920aaf3f2da843c01c70688a4c71f7b31ead8d4049d1";
|
||||
rev = "e1fce3b4bbe07d55bd7340d25ca0dc900747ad6f";
|
||||
sha256 = "72ec214364c674ee1ccd29a6dae925e6cbcaf90e57fef133385a96319108dd2c";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "racer-2015-06-24";
|
||||
name = "racer-2015-07-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/phildawes/racer";
|
||||
rev = "8f9d14b381a1624389df78ed8d3a38bc1c85d0f4";
|
||||
sha256 = "34db058ca1d5dd979db1208b5f90716145eb416c931445213a8dfac3d8b0bcdb";
|
||||
rev = "25150ce32e5936b38933d66324830fedb95a8c7c";
|
||||
sha256 = "40a3d9c22f50f69e45e8f551a655c2ca327fd07b8872059f2938983387e07707";
|
||||
};
|
||||
dependencies = [];
|
||||
buildPhase = ''
|
||||
@ -603,44 +593,44 @@ rec {
|
||||
};
|
||||
|
||||
neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neocomplete-vim-2015-06-23";
|
||||
name = "neocomplete-vim-2015-07-25";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/shougo/neocomplete.vim";
|
||||
rev = "72bf34c349078ae0e4691f7e00dd2a7ab5714a69";
|
||||
sha256 = "72dff487613de3e18c561b45658ec2eda66a686e1d73159c03bee1313d6d74ff";
|
||||
rev = "aaa1f08b06bfcc2a329dba12a37ce8e1578636bd";
|
||||
sha256 = "56c2dc4431858432763bcf134ebbc74272d6f3cdd2db5f9a8b21f2e4a8b028c8";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neosnippet-snippets-2015-06-26";
|
||||
name = "neosnippet-snippets-2015-07-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/shougo/neosnippet-snippets";
|
||||
rev = "81c7c9840352126d1fa3748c014d00188b5a1afa";
|
||||
sha256 = "977ef9fd855a03ba16c01b990bfd4121eb3a4516e7446bcb8806c41490515ec3";
|
||||
rev = "a34e67d4b3f91bf2320cd7ce1e85bbd300c6095e";
|
||||
sha256 = "773170fddb95bc5df1b26abc52e29338f3d5515a5afd99719aa23d9569c5389d";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "neosnippet-vim-2015-06-23";
|
||||
name = "neosnippet-vim-2015-07-23";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/shougo/neosnippet.vim";
|
||||
rev = "f1980468b0a397d36318a409d3677bc13d307392";
|
||||
sha256 = "b28bf490a809e4dee474480436e0aa1c64612e4788c4f9a0afe856cf2432cfaf";
|
||||
rev = "e619d43571a675057461f29f2c039dab64728f32";
|
||||
sha256 = "8682bba6039962c01ffa0f9946a1f2a8e8a37ffda2d32862d72c5ee3d87241c5";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vimproc-vim-2015-05-14";
|
||||
name = "vimproc-vim-2015-07-22";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/shougo/vimproc.vim";
|
||||
rev = "c286dcbdfca9e0ee1a4cb90f09c3f03638112f5a";
|
||||
sha256 = "884753f4f188cee5fb11e4dfb5aaf8b80d4809e637ab91068af1a5787acdcb19";
|
||||
rev = "0555aecded8737435747e903efc4b6f3241cc62c";
|
||||
sha256 = "0a9445214c6733d21d56ebe278f2e0bc1027b08eb7763df95b8d0ebd34850a60";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [ which ];
|
||||
@ -652,11 +642,11 @@ rec {
|
||||
};
|
||||
|
||||
vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vimshell-vim-2015-06-21";
|
||||
name = "vimshell-vim-2015-07-25";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/shougo/vimshell.vim";
|
||||
rev = "ce5ce77133dd16bd33a57b0776de0cbaead45722";
|
||||
sha256 = "7c44556f28a06083ba9485af74fcc2e510e3e1830cfce6670c899329c2c85012";
|
||||
rev = "adb2a0d95e9b0009d152c35c930eb04875562d87";
|
||||
sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723";
|
||||
};
|
||||
dependencies = [ "vimproc-vim" ];
|
||||
};
|
||||
@ -673,11 +663,11 @@ rec {
|
||||
};
|
||||
|
||||
vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-quickrun-2015-05-15";
|
||||
name = "vim-quickrun-2015-07-27";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/thinca/vim-quickrun";
|
||||
rev = "c7800ea3d01209da678708e4d3b5175009551807";
|
||||
sha256 = "375668b6fd7cf64a26f752afcdd976f79a9dc12b045eed8afafce6486740f143";
|
||||
rev = "c22f2f50614a68d8f60ae334cc4545dbc57051a9";
|
||||
sha256 = "fef4f13c3d1946040cb4e4ceba6a89759fc77c1f72f2f7f038df644620a41398";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -706,11 +696,11 @@ rec {
|
||||
};
|
||||
|
||||
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "youcompleteme-2015-06-23";
|
||||
name = "youcompleteme-2015-07-08";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/valloric/youcompleteme";
|
||||
rev = "66dcc9581c7d237f4d839389bee055df6788fbc9";
|
||||
sha256 = "91971f0640d462622a31ea64c5c41df7649a6c6e6e4d93220554a7d910a11fdf";
|
||||
rev = "b9dd9096a34c1d720878f0058dc3e68f9e9c87ea";
|
||||
sha256 = "88a3ff421300f53756359ec8e6c901fe96de492091587cf9a5e40b299698f077";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [
|
||||
@ -795,6 +785,17 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "random-vim-2010-10-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/vim-scripts/random.vim";
|
||||
rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
|
||||
sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "tabmerge-2010-10-17";
|
||||
src = fetchgit {
|
||||
@ -806,12 +807,23 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "wombat256-vim-2010-10-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/vim-scripts/wombat256.vim";
|
||||
rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
|
||||
sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-wakatime-2015-06-23";
|
||||
name = "vim-wakatime-2015-07-03";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/wakatime/vim-wakatime";
|
||||
rev = "2ee2b4ea56ae1b56ce77a1b9e5d2c51fc6768842";
|
||||
sha256 = "440b6027921fce801255eedd29d24b43975038e78dfe465a381ae76e443480c2";
|
||||
rev = "28044b7b5f5be812fd34c757632d1d814578ec9b";
|
||||
sha256 = "74fa0eac0a546c7012b4a6fe5f6cd66eaa2ed40887bc61d468be148dcd538692";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [ python ];
|
||||
@ -889,17 +901,6 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "random-vim-2010-10-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/vim-scripts/random.vim";
|
||||
rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
|
||||
sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "rust-2015-01-29";
|
||||
src = fetchgit {
|
||||
@ -934,11 +935,11 @@ rec {
|
||||
};
|
||||
|
||||
snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "snipmate-2015-04-04";
|
||||
name = "snipmate-2015-07-23";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/garbas/vim-snipmate";
|
||||
rev = "2d3e8ddc4424088d8e19c33764fff077f3116f55";
|
||||
sha256 = "fe23f38cf074b12082879256a5c4c16e6f55233e0af0735867b4d5c21b72ff09";
|
||||
rev = "c86c64508a5b0309040429460c3a13fb90ac708e";
|
||||
sha256 = "7cd7dfd4230fd9bb75744a376c0e789c6d734e08158ca055a2ada1298b71360e";
|
||||
};
|
||||
dependencies = ["vim-addon-mw-utils" "tlib"];
|
||||
|
||||
@ -1230,11 +1231,11 @@ rec {
|
||||
};
|
||||
|
||||
vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-airline-2015-06-26";
|
||||
name = "vim-airline-2015-07-08";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/bling/vim-airline";
|
||||
rev = "9afda181dddd0a0ae34aa10e7faad4a66e94676b";
|
||||
sha256 = "1e3b540353b4e047de7c26d8e02de5e68c02a5a1fccc946faa494bcad44bc6b1";
|
||||
rev = "cdc6d98a09db60d3dda58815616f78338cbdaa9d";
|
||||
sha256 = "bbbe04c92842d4110971396011f41ad1175b6c3b0f1d516c286cc7aca4c7052a";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -1252,11 +1253,11 @@ rec {
|
||||
};
|
||||
|
||||
vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-easy-align-2014-12-14";
|
||||
name = "vim-easy-align-2015-07-20";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/junegunn/vim-easy-align";
|
||||
rev = "c62d124be614de65922b15d468c4049d1eee9353";
|
||||
sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee";
|
||||
rev = "1206c65dcb87488900b5ac193965268f0ce2c574";
|
||||
sha256 = "60de7c9c5b916e6cd9bc9e5bef0a7d2a831a7ab6cf2231b7f7b29017559bc33a";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -1274,11 +1275,11 @@ rec {
|
||||
};
|
||||
|
||||
vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-gitgutter-2015-05-08";
|
||||
name = "vim-gitgutter-2015-07-28";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/airblade/vim-gitgutter";
|
||||
rev = "339f8ba079ed7d465ca442c9032b36bc56c21f61";
|
||||
sha256 = "f306cc7bac8560fe2864161be675545c1023486b950900da8d8c74f98d568e15";
|
||||
rev = "fe10e6474d70c382edcda84dc6bcd6fcd575a6c5";
|
||||
sha256 = "0266775153760c86e51a83106813936c661717a1c72d4103215739aff9ad1b76";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -1306,23 +1307,34 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-multiple-cursors-2015-05-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/terryma/vim-multiple-cursors";
|
||||
rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
|
||||
sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-signature-2015-05-19";
|
||||
name = "vim-signature-2015-07-08";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/kshenoy/vim-signature";
|
||||
rev = "7ab61e2a5101ec139a54735b432a6e95a22770d8";
|
||||
sha256 = "041b906cd27bcb922732e324b671adbf6ea0106105230ea43111ca9f844b64c3";
|
||||
rev = "0a31fb0c4c62705b4b894e150330857170080b96";
|
||||
sha256 = "945cc02d15bf7e71a87d6b1ec0ae24e6f145bff0f76586f6d8f6bba38a303a4a";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-snippets-2015-06-08";
|
||||
name = "vim-snippets-2015-07-29";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/honza/vim-snippets";
|
||||
rev = "69c918175c77c0a0516c3ab587509a3eca38b3ae";
|
||||
sha256 = "1fe9c6d5f80513bc35c309723b57d73d42296fbe73d44c0df1de4244b2596bf0";
|
||||
rev = "814896e4d29f2b796d076935d7d079c64c351f4f";
|
||||
sha256 = "173d2f52c0715dd78692b5f1d3368920ed976a05a87887b056526abfd530ffa3";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
@ -1349,16 +1361,4 @@ rec {
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "wombat256-vim-2010-10-17";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/vim-scripts/wombat256.vim";
|
||||
rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
|
||||
sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
|
||||
};
|
||||
dependencies = [];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
"github:vim-scripts/Colour-Sampler-Pack"
|
||||
"github:vim-scripts/a.vim"
|
||||
"github:vim-scripts/align"
|
||||
"github:vim-scripts/changeColorSchemes.vim"
|
||||
"github:vim-scripts/changeColorScheme.vim"
|
||||
"github:vim-scripts/random.vim"
|
||||
"github:vim-scripts/tabmerge"
|
||||
"github:vim-scripts/wombat256.vim"
|
||||
|
||||
@ -20,9 +20,15 @@ buildPhase() {
|
||||
sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
|
||||
unset src # used by the nv makefile
|
||||
make SYSSRC=$sysSrc SYSOUT=$sysOut module
|
||||
cd uvm
|
||||
make SYSSRC=$sysSrc SYSOUT=$sysOut module
|
||||
cd ..
|
||||
|
||||
# nvidia no longer provides uvm kernel module for 32-bit archs
|
||||
# http://www.nvidia.com/download/driverResults.aspx/79722/en-us
|
||||
if [[ "$system" = "x86_64-linux" ]]; then
|
||||
cd uvm
|
||||
make SYSSRC=$sysSrc SYSOUT=$sysOut module
|
||||
cd ..
|
||||
fi
|
||||
|
||||
cd ..
|
||||
fi
|
||||
}
|
||||
@ -47,7 +53,7 @@ installPhase() {
|
||||
|
||||
# Install the kernel module.
|
||||
mkdir -p $out/lib/modules/$kernelVersion/misc
|
||||
for i in kernel/nvidia.ko kernel/uvm/nvidia-uvm.ko; do
|
||||
for i in $(find ./kernel -name '*.ko'); do
|
||||
nuke-refs $i
|
||||
cp $i $out/lib/modules/$kernelVersion/misc/
|
||||
done
|
||||
|
||||
@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
|
||||
|
||||
let
|
||||
|
||||
versionNumber = "352.21";
|
||||
versionNumber = "352.30";
|
||||
|
||||
# Policy: use the highest stable version as the default (on our master).
|
||||
inherit (stdenv.lib) makeLibraryPath;
|
||||
@ -28,16 +28,17 @@ stdenv.mkDerivation {
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
|
||||
sha256 = "1l206091frcpql8ql82i5jkf955wdr56ikh9aprwhqkyyjjq4qv1";
|
||||
sha256 = "1qrjvf41zk50hw7gjiwg9jxwgpaarlwm019py4wfqgjgb1cbhgjn";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
|
||||
sha256 = "1sv495i5s1fd7j4k4yr53xbgc9jind0y74mqivv36p5z6m8z5k6g";
|
||||
sha256 = "1h7ghmykhdyy3n853s8yjzc0qbh50qb2kc0khz672b1rna4wqyhg";
|
||||
}
|
||||
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
||||
|
||||
inherit versionNumber libsOnly;
|
||||
inherit (stdenv) system;
|
||||
|
||||
kernel = if libsOnly then null else kernel.dev;
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
|
||||
|
||||
let version = "9.10.2-P2"; in
|
||||
let version = "9.10.2-P3"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bind-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
|
||||
sha256 = "0pvcnwd4rzfk3l35ys72p14ly9k857wbn1lxzd4ayjk3i2pz1rmi";
|
||||
sha256 = "0jhxbsdb8q5q0vn5aga53ixz2iy9zz8p5vwkzvngymd4vmk9l1vq";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, goPackages, fetchFromGitHub }:
|
||||
|
||||
with goPackages;
|
||||
|
||||
buildGoPackage rec {
|
||||
version = "2.0.0";
|
||||
name = "etcd-${version}";
|
||||
goPackagePath = "github.com/coreos/etcd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "etcd";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s3jilzlqyh2i81pv79cgap6dfj7qrfrwcv4w9lic5ivznz413vc";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A highly-available key value store for shared configuration and service discovery";
|
||||
homepage = http://coreos.com/using-coreos/etcd/;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -75,10 +75,9 @@ let
|
||||
hasOsd = hasServer;
|
||||
hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
|
||||
|
||||
/*hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
|
||||
versionAtLeast version "9.0.0" &&
|
||||
optAccelio != null && optLibibverbs != null && optLibrdmacm != null;*/
|
||||
hasXio = false; # Broken with xio 1.4
|
||||
hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
|
||||
versionAtLeast version "10.0.0" &&
|
||||
optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
|
||||
|
||||
hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ callPackage, fetchgit, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2015-07-23";
|
||||
version = "2015-07-29";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ceph/ceph.git";
|
||||
rev = "f7bda9567d2a1acf015ab891eb5bb9ca0cdc8396";
|
||||
rev = "338ead0f498238fd1b5b7f18d86ad407de6f347b";
|
||||
leaveDotGit = true;
|
||||
sha256 = "0z3i4aadyyklafm3lia8dg8l0wr3cvy53v3h7b533nm61lq07maf";
|
||||
sha256 = "0ip62l4qkcmszbczwdnqhn93glnpgy0fhymf627x0vf49dgv3a6i";
|
||||
};
|
||||
|
||||
patches = [ ./fix-pythonpath.patch ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bmon-${version}";
|
||||
version = "3.7";
|
||||
version = "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tgraf";
|
||||
repo = "bmon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6";
|
||||
sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "parallel-20150622";
|
||||
name = "parallel-20150722";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${name}.tar.bz2";
|
||||
sha256 = "0j7gg88zk2r4jv3mvmrl4bhwcv9k8rxanygp6lssbx685ab9qfln";
|
||||
sha256 = "0jpklc4awr5z6slgn7xjhrcpk6i8jp9mwhkkaczikvbaqzbyabkx";
|
||||
};
|
||||
|
||||
patchPhase =
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
{stdenv, fetchurl}:
|
||||
{stdenv, lynx, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jwhois-4.0";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnu/jwhois/jwhois-4.0.tar.gz;
|
||||
sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs";
|
||||
};
|
||||
|
||||
postInstall = "ln -s jwhois $out/bin/whois";
|
||||
postInstall = ''
|
||||
ln -s jwhois $out/bin/whois
|
||||
sed -i -e "s|/usr/bin/lynx|${lynx}/bin/lynx|g" $out/etc/jwhois.conf
|
||||
'';
|
||||
|
||||
patches = [ ./connect.patch ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
|
||||
|
||||
let rev = "45c6405a30bd1b2cb8ad6a94b23be8b10cf52069"; in
|
||||
let rev = "57aeef0b6a3d3c9506e35f57f5b6db33019967e5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
owner = "edolstra";
|
||||
repo = "nix-repl";
|
||||
inherit rev;
|
||||
sha256 = "0c6sifpz8j898xznvy9dvm44w4nysqprrhs553in19jwwkf7kryp";
|
||||
sha256 = "1p92zwkpy3iaglq23aydggbl6dbnw97f0v5gy2w74y8pi9d5mgh5";
|
||||
};
|
||||
|
||||
buildInputs = [ nix readline ];
|
||||
|
||||
@ -4,82 +4,101 @@
|
||||
, stateDir ? "/nix/var"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.9";
|
||||
let
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
|
||||
sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
|
||||
};
|
||||
common = { name, src }: stdenv.mkDerivation rec {
|
||||
inherit name src;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig ];
|
||||
nativeBuildInputs = [ perl pkgconfig ];
|
||||
|
||||
buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
|
||||
buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
|
||||
|
||||
propagatedBuildInputs = [ boehmgc ];
|
||||
propagatedBuildInputs = [ boehmgc ];
|
||||
|
||||
# Note: bzip2 is not passed as a build input, because the unpack phase
|
||||
# would end up using the wrong bzip2 when cross-compiling.
|
||||
# XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
|
||||
postUnpack =
|
||||
'' export CPATH="${bzip2}/include"
|
||||
export LIBRARY_PATH="${bzip2}/lib"
|
||||
export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
|
||||
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
|
||||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
'';
|
||||
|
||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
||||
|
||||
installFlags = "sysconfdir=$(out)/etc";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
crossAttrs = {
|
||||
# Note: bzip2 is not passed as a build input, because the unpack phase
|
||||
# would end up using the wrong bzip2 when cross-compiling.
|
||||
# XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
|
||||
postUnpack =
|
||||
'' export CPATH="${bzip2.crossDrv}/include"
|
||||
export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"
|
||||
'' export CPATH="${bzip2}/include"
|
||||
export LIBRARY_PATH="${bzip2}/lib"
|
||||
export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
|
||||
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
|
||||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
'' + stdenv.lib.optionalString (
|
||||
stdenv.cross ? nix && stdenv.cross.nix ? system
|
||||
) ''--with-system=${stdenv.cross.nix.system}'';
|
||||
'';
|
||||
|
||||
doInstallCheck = false;
|
||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
||||
|
||||
installFlags = "sysconfdir=$(out)/etc";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
crossAttrs = {
|
||||
postUnpack =
|
||||
'' export CPATH="${bzip2.crossDrv}/include"
|
||||
export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
|
||||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
'' + stdenv.lib.optionalString (
|
||||
stdenv.cross ? nix && stdenv.cross.nix ? system
|
||||
) ''--with-system=${stdenv.cross.nix.system}'';
|
||||
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Powerful package manager that makes package management reliable and reproducible";
|
||||
longDescription = ''
|
||||
Nix is a powerful package manager for Linux and other Unix systems that
|
||||
makes package management reliable and reproducible. It provides atomic
|
||||
upgrades and rollbacks, side-by-side installation of multiple versions of
|
||||
a package, multi-user package management and easy setup of build
|
||||
environments.
|
||||
'';
|
||||
homepage = http://nixos.org/;
|
||||
license = stdenv.lib.licenses.lgpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
in rec {
|
||||
|
||||
nix = nixStable;
|
||||
|
||||
nixStable = common rec {
|
||||
name = "nix-1.9";
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
|
||||
sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
|
||||
};
|
||||
};
|
||||
|
||||
nixUnstable = lib.lowPrio (common rec {
|
||||
name = "nix-1.10pre4200_76cc8e9";
|
||||
src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/24195844/download/4/${name}.tar.xz";
|
||||
sha256 = "87e21fe00d93cf64674ddfae25b7be402b10a9e8449eae1fbb1203123624fd0f";
|
||||
};
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "Powerful package manager that makes package management reliable and reproducible";
|
||||
longDescription = ''
|
||||
Nix is a powerful package manager for Linux and other Unix systems that
|
||||
makes package management reliable and reproducible. It provides atomic
|
||||
upgrades and rollbacks, side-by-side installation of multiple versions of
|
||||
a package, multi-user package management and easy setup of build
|
||||
environments.
|
||||
'';
|
||||
homepage = http://nixos.org/;
|
||||
license = stdenv.lib.licenses.lgpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
|
||||
, pkgconfig, boehmgc, perlPackages, libsodium
|
||||
, storeDir ? "/nix/store"
|
||||
, stateDir ? "/nix/var"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.9pre4153_b64988b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/22838666/download/4/${name}.tar.xz";
|
||||
sha256 = "51b4870305724aa7b26c92b43cb22a0e9b6798ac2534db493079bfc383244e31";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig ];
|
||||
|
||||
buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
|
||||
|
||||
propagatedBuildInputs = [ boehmgc ];
|
||||
|
||||
# Note: bzip2 is not passed as a build input, because the unpack phase
|
||||
# would end up using the wrong bzip2 when cross-compiling.
|
||||
# XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
|
||||
postUnpack =
|
||||
'' export CPATH="${bzip2}/include"
|
||||
export LIBRARY_PATH="${bzip2}/lib"
|
||||
export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
|
||||
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
|
||||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
'';
|
||||
|
||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
||||
|
||||
installFlags = "sysconfdir=$(out)/etc";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
crossAttrs = {
|
||||
postUnpack =
|
||||
'' export CPATH="${bzip2.crossDrv}/include"
|
||||
export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
|
||||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
'' + stdenv.lib.optionalString (
|
||||
stdenv.cross ? nix && stdenv.cross.nix ? system
|
||||
) ''--with-system=${stdenv.cross.nix.system}'';
|
||||
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "The Nix Deployment System";
|
||||
homepage = http://nixos.org/;
|
||||
license = stdenv.lib.licenses.lgpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
|
||||
, pkgconfig }:
|
||||
|
||||
let version = "4.1.2"; in
|
||||
let version = "4.1.4"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eid-mw-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "034ar1v2qamdyq71nklh1nvqbmw6ryz63jdwnnc873f639mf5w94";
|
||||
sha256 = "0v0p0kdjscvf4bn14dyny399k1bfsz8v7n8v16lv0q0xs5nwqnky";
|
||||
rev = "v${version}";
|
||||
repo = "eid-mw";
|
||||
owner = "Fedict";
|
||||
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ gtk2 pcsclite ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
postPatch = ''
|
||||
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $out/bin/eid-nssdb \
|
||||
--replace "modutil" "${nssTools}/bin/modutil"
|
||||
|
||||
# Only provides a useless "about-eid-mw.desktop" that doesn't even work:
|
||||
rm -rf $out/share/applications
|
||||
# Only provides a useless "about-eid-mw.desktop" that segfaults:
|
||||
rm -rf $out/share/applications $out/bin/about-eid-mw
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -20,13 +20,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "tor-browser-${version}";
|
||||
version = "4.5.2";
|
||||
version = "4.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
|
||||
sha256 = if bits == "64" then
|
||||
"139c85096ee85a65222753fbbee7c04e8cc494021f9afaf5c1a0f520dd7869b9" else
|
||||
"960277aea38a3958f3ac573535302e61b3b0137169e5d7b9687cee648a5d5bec";
|
||||
"24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else
|
||||
"154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -212,7 +212,7 @@ stdenv.mkDerivation rec {
|
||||
'' + optionalString enableStandardFeatures ''
|
||||
sed -e "s|dot|${graphviz}/bin/dot|g" \
|
||||
-e "s|neato|${graphviz}/bin/neato|g" \
|
||||
-e "s|twopi|${graphviz}/bin/circo|g" \
|
||||
-e "s|twopi|${graphviz}/bin/twopi|g" \
|
||||
-e "s|circo|${graphviz}/bin/circo|g" \
|
||||
-e "s|fdp|${graphviz}/bin/fdp|g" \
|
||||
-i "filters/graphviz/graphviz2png.py"
|
||||
|
||||
@ -3036,6 +3036,8 @@ let
|
||||
|
||||
super = callPackage ../tools/security/super { };
|
||||
|
||||
super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { };
|
||||
|
||||
ssdeep = callPackage ../tools/security/ssdeep { };
|
||||
|
||||
sshpass = callPackage ../tools/networking/sshpass { };
|
||||
@ -3883,9 +3885,8 @@ let
|
||||
profiledCompiler = false;
|
||||
});
|
||||
|
||||
gcj = gcj48;
|
||||
|
||||
gcj48 = wrapCC (gcc48.cc.override {
|
||||
gcj = gcj49;
|
||||
gcj49 = wrapCC (gcc49.cc.override {
|
||||
name = "gcj";
|
||||
langJava = true;
|
||||
langFortran = false;
|
||||
@ -3922,7 +3923,7 @@ let
|
||||
emacsSupport = config.emacsSupport or false;
|
||||
};
|
||||
|
||||
gccgo = gccgo48;
|
||||
gccgo = gccgo49;
|
||||
|
||||
gccgo48 = wrapCC (gcc48.cc.override {
|
||||
name = "gccgo";
|
||||
@ -5151,6 +5152,7 @@ let
|
||||
spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
|
||||
|
||||
supercollider = callPackage ../development/interpreters/supercollider {
|
||||
gcc = gcc48; # doesn't build with gcc49
|
||||
qt = qt4;
|
||||
fftw = fftwSinglePrec;
|
||||
};
|
||||
@ -7206,7 +7208,9 @@ let
|
||||
|
||||
libopus = callPackage ../development/libraries/libopus { };
|
||||
|
||||
libosinfo = callPackage ../development/libraries/libosinfo {};
|
||||
libosinfo = callPackage ../development/libraries/libosinfo {
|
||||
inherit (gnome3) libsoup;
|
||||
};
|
||||
|
||||
libosip = callPackage ../development/libraries/osip {};
|
||||
|
||||
@ -7231,7 +7235,6 @@ let
|
||||
libpng = callPackage ../development/libraries/libpng { };
|
||||
libpng_apng = libpng.override { apngSupport = true; };
|
||||
libpng12 = callPackage ../development/libraries/libpng/12.nix { };
|
||||
libpng15 = callPackage ../development/libraries/libpng/15.nix { };
|
||||
|
||||
libpaper = callPackage ../development/libraries/libpaper { };
|
||||
|
||||
@ -7478,14 +7481,13 @@ let
|
||||
|
||||
liquidwar = builderDefsPackage ../games/liquidwar {
|
||||
inherit (xlibs) xproto libX11 libXrender;
|
||||
inherit gmp mesa libjpeg
|
||||
inherit gmp mesa libjpeg libpng
|
||||
expat gettext perl
|
||||
SDL SDL_image SDL_mixer SDL_ttf
|
||||
curl sqlite
|
||||
libogg libvorbis libcaca csound cunit
|
||||
;
|
||||
guile = guile_1_8;
|
||||
libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5
|
||||
};
|
||||
|
||||
log4cpp = callPackage ../development/libraries/log4cpp { };
|
||||
@ -8879,7 +8881,7 @@ let
|
||||
|
||||
dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
|
||||
|
||||
etcd = callPackage ../servers/etcd { };
|
||||
etcd = goPackages.etcd;
|
||||
|
||||
ejabberd = callPackage ../servers/xmpp/ejabberd {
|
||||
erlang = erlangR16;
|
||||
@ -8896,7 +8898,7 @@ let
|
||||
v8 = v8_3_24_10;
|
||||
};
|
||||
|
||||
etcdctl = callPackage ../development/tools/etcdctl { };
|
||||
etcdctl = goPackages.etcd;
|
||||
|
||||
exim = callPackage ../servers/mail/exim { };
|
||||
|
||||
@ -9977,9 +9979,7 @@ let
|
||||
|
||||
nettools = callPackage ../os-specific/linux/net-tools { };
|
||||
|
||||
neverball = callPackage ../games/neverball {
|
||||
libpng = libpng15;
|
||||
};
|
||||
neverball = callPackage ../games/neverball { };
|
||||
|
||||
nftables = callPackage ../os-specific/linux/nftables { };
|
||||
|
||||
@ -14730,20 +14730,13 @@ let
|
||||
|
||||
mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
|
||||
|
||||
nix = nixStable;
|
||||
|
||||
nixStable = callPackage ../tools/package-management/nix {
|
||||
storeDir = config.nix.storeDir or "/nix/store";
|
||||
stateDir = config.nix.stateDir or "/nix/var";
|
||||
};
|
||||
|
||||
nixUnstable = nixStable;
|
||||
/*
|
||||
nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix {
|
||||
storeDir = config.nix.storeDir or "/nix/store";
|
||||
stateDir = config.nix.stateDir or "/nix/var";
|
||||
});
|
||||
*/
|
||||
inherit (callPackages ../tools/package-management/nix {
|
||||
storeDir = config.nix.storeDir or "/nix/store";
|
||||
stateDir = config.nix.stateDir or "/nix/var";
|
||||
})
|
||||
nix
|
||||
nixStable
|
||||
nixUnstable;
|
||||
|
||||
nixops = callPackage ../tools/package-management/nixops { };
|
||||
|
||||
|
||||
@ -327,12 +327,12 @@ let self = _self // overrides;
|
||||
|
||||
dash = melpaBuild rec {
|
||||
pname = "dash";
|
||||
version = "2.9.0";
|
||||
version = "2.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magnars";
|
||||
repo = "${pname}.el";
|
||||
rev = version;
|
||||
sha256 = "1lg31s8y6ljsz6ps765ia5px39wim626xy8fbc4jpk8fym1jh7ay";
|
||||
sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx";
|
||||
};
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
@ -503,6 +503,32 @@ let self = _self // overrides;
|
||||
};
|
||||
};
|
||||
|
||||
flycheck = melpaBuild rec {
|
||||
pname = "flycheck";
|
||||
version = "0.23";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ydk1wa7h7z9qw7prfvszxrmy2dyzsdij3xdy10rq197xnrw94wz";
|
||||
};
|
||||
packageRequires = [ dash let-alist pkg-info ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
flycheck-haskell = melpaBuild rec {
|
||||
pname = "flycheck-haskell";
|
||||
version = "0.7.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "flycheck";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
|
||||
};
|
||||
packageRequires = [ dash flycheck haskell-mode let-alist pkg-info ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
flycheck-pos-tip = melpaBuild rec {
|
||||
pname = "flycheck-pos-tip";
|
||||
version = "20140813";
|
||||
@ -516,19 +542,6 @@ let self = _self // overrides;
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
flycheck = melpaBuild rec {
|
||||
pname = "flycheck";
|
||||
version = "0.20";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0cq7y7ssm6phvx5pfv2yqq4j0yqmm0lhjav7v4a8ql7094cd790a";
|
||||
};
|
||||
packageRequires = [ dash pkg-info ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
ghc-mod = melpaBuild rec {
|
||||
pname = "ghc";
|
||||
version = external.ghc-mod.version;
|
||||
@ -788,6 +801,20 @@ let self = _self // overrides;
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
let-alist = melpaBuild rec {
|
||||
pname = "let-alist";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "http://elpa.gnu.org/packages/${pname}-${version}.el";
|
||||
sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
|
||||
};
|
||||
unpackPhase = "true";
|
||||
buildPhase = ''
|
||||
cp $src ${pname}-${version}.el
|
||||
'';
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
log4e = melpaBuild rec {
|
||||
pname = "log4e";
|
||||
version = "0.3.0";
|
||||
@ -816,14 +843,62 @@ let self = _self // overrides;
|
||||
|
||||
magit = melpaBuild rec {
|
||||
pname = "magit";
|
||||
version = "1.4.0";
|
||||
version = "2.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0x8bvfw47bfpzsv9yr98aays4idbbwvnkp0pag1q78gcn9h2k9vi";
|
||||
sha256 = "0pyqa79km1y58phsf4sq2a25rx9lw0di1hb6a5y17xisa8li7sfl";
|
||||
};
|
||||
packageRequires = [ git-commit-mode git-rebase-mode ];
|
||||
packageRequires = [ dash git-commit magit-popup with-editor ];
|
||||
fileSpecs = [ "lisp/magit-utils.el"
|
||||
"lisp/magit-section.el"
|
||||
"lisp/magit-git.el"
|
||||
"lisp/magit-mode.el"
|
||||
"lisp/magit-process.el"
|
||||
"lisp/magit-core.el"
|
||||
"lisp/magit-diff.el"
|
||||
"lisp/magit-wip.el"
|
||||
"lisp/magit-apply.el"
|
||||
"lisp/magit-log.el"
|
||||
"lisp/magit.el"
|
||||
"lisp/magit-sequence.el"
|
||||
"lisp/magit-commit.el"
|
||||
"lisp/magit-remote.el"
|
||||
"lisp/magit-bisect.el"
|
||||
"lisp/magit-stash.el"
|
||||
"lisp/magit-blame.el"
|
||||
"lisp/magit-ediff.el"
|
||||
"lisp/magit-extras.el"
|
||||
"lisp/git-rebase.el"
|
||||
"Documentation/magit.texi"
|
||||
"Documentation/AUTHORS.md"
|
||||
"COPYING"
|
||||
];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
git-commit = melpaBuild rec {
|
||||
pname = "git-commit";
|
||||
version = magit.version;
|
||||
src = magit.src;
|
||||
packageRequires = [ dash with-editor ];
|
||||
fileSpecs = [ "lisp/git-commit.el" ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
magit-popup = melpaBuild rec {
|
||||
pname = "magit-popup";
|
||||
version = magit.version;
|
||||
src = magit.src;
|
||||
packageRequires = [ dash with-editor ];
|
||||
fileSpecs = [ "Documentation/magit-popup.texi" "lisp/magit-popup.el" ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
with-editor = melpaBuild rec {
|
||||
pname = "with-editor";
|
||||
version = magit.version;
|
||||
src = magit.src;
|
||||
packageRequires = [ dash ];
|
||||
fileSpecs = [ "Documentation/with-editor.texi" "lisp/with-editor.el" ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
|
||||
@ -555,6 +555,14 @@ let
|
||||
sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
|
||||
};
|
||||
|
||||
etcd = buildFromGitHub {
|
||||
rev = "v2.1.1";
|
||||
owner = "coreos";
|
||||
repo = "etcd";
|
||||
sha256 = "0jd97091jwwdvx50vbdi1py9v5w9fk86cw85p0zinb0ww6bs4y0s";
|
||||
excludedPackages = "Godeps";
|
||||
};
|
||||
|
||||
fsnotify.v0 = buildGoPackage rec {
|
||||
rev = "v0.9.3";
|
||||
name = "fsnotify.v0-${rev}";
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
|
||||
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
|
||||
, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
@ -145,11 +146,12 @@ let
|
||||
};
|
||||
|
||||
luasec = buildLuaPackage rec {
|
||||
version = "0.5";
|
||||
name = "sec-${version}";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz";
|
||||
sha256 = "1zl6wwcyd4dfcw01qan7dkcw0rgzm69w819qbaddcr2ik147ccmq";
|
||||
name = "sec-0.6pre-2015-04-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "brunoos";
|
||||
repo = "luasec";
|
||||
rev = "12e1b1f1d9724974ecc6ca273a0661496d96b3e7";
|
||||
sha256 = "0m917qgi54p6n2ak33m67q8sxcw3cdni99bm216phjjka9rg7qwd";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@ -2658,16 +2658,16 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
|
||||
DBIxClassSchemaLoader = buildPerlPackage {
|
||||
name = "DBIx-Class-Schema-Loader-0.07033";
|
||||
name = "DBIx-Class-Schema-Loader-0.07043";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07033.tar.gz;
|
||||
sha256 = "1vrcxxlbvdch5r9v5i6vrb4fqqfbpxybpdqndmlnc2jzlqjwjahi";
|
||||
url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07043.tar.gz;
|
||||
sha256 = "01944d429a420fcb961aa4ab002f884f3d54529b3346816502c27d31c956194d";
|
||||
};
|
||||
buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBI DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose namespaceautoclean TestException TestPod TestWarn ];
|
||||
propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ];
|
||||
buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ];
|
||||
propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ];
|
||||
meta = {
|
||||
description = "Create a DBIx::Class::Schema based on a database";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
license = "perl";
|
||||
};
|
||||
};
|
||||
|
||||
@ -5111,6 +5111,20 @@ let self = _self // overrides; _self = with self; {
|
||||
propagatedBuildInputs = [XMLParser];
|
||||
};
|
||||
|
||||
LinguaENFindNumber = buildPerlPackage {
|
||||
name = "Lingua-EN-FindNumber-1.31";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.31.tar.gz;
|
||||
sha256 = "f67f4d4983bd29da5cbbff3cb18dd70788692b35e2dabcd4c65bef1cd2bf658f";
|
||||
};
|
||||
propagatedBuildInputs = [ LinguaENWords2Nums ];
|
||||
meta = {
|
||||
homepage = https://github.com/neilbowers/Lingua-EN-FindNumber;
|
||||
description = "Locate (written) numbers in English text";
|
||||
license = "perl";
|
||||
};
|
||||
};
|
||||
|
||||
LinguaENInflect = buildPerlPackage {
|
||||
name = "Lingua-EN-Inflect-1.895";
|
||||
src = fetchurl {
|
||||
@ -5131,15 +5145,34 @@ let self = _self // overrides; _self = with self; {
|
||||
propagatedBuildInputs = [ LinguaENInflect ];
|
||||
};
|
||||
|
||||
LinguaENInflectPhrase = buildPerlPackage rec {
|
||||
name = "Lingua-EN-Inflect-Phrase-0.10";
|
||||
LinguaENInflectPhrase = buildPerlPackage {
|
||||
name = "Lingua-EN-Inflect-Phrase-0.18";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
|
||||
sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm";
|
||||
url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.18.tar.gz;
|
||||
sha256 = "290a5b8fc2be28d6d479517655027a90e944476cb3552f10cbf6db37af79f9a6";
|
||||
};
|
||||
buildInputs = [ TestNoWarnings ];
|
||||
propagatedBuildInputs = [ LinguaENFindNumber LinguaENInflect LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ];
|
||||
meta = {
|
||||
homepage = http://metacpan.org/release/Lingua-EN-Inflect-Phrase;
|
||||
description = "Inflect short English Phrases";
|
||||
license = "perl";
|
||||
};
|
||||
};
|
||||
|
||||
LinguaENNumberIsOrdinal = buildPerlPackage {
|
||||
name = "Lingua-EN-Number-IsOrdinal-0.05";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz;
|
||||
sha256 = "28d5695400c0f4e2bd209793cb74f6da2b9257356aacb2947c603425e09618d6";
|
||||
};
|
||||
buildInputs = [ TestFatal TryTiny ];
|
||||
propagatedBuildInputs = [ LinguaENFindNumber ];
|
||||
meta = {
|
||||
homepage = http://metacpan.org/release/Lingua-EN-Number-IsOrdinal;
|
||||
description = "Detect if English number is ordinal or cardinal";
|
||||
license = "perl";
|
||||
};
|
||||
buildInputs = [ TestMore ];
|
||||
propagatedBuildInputs =
|
||||
[ LinguaENInflect LinguaENInflectNumber LinguaENTagger ];
|
||||
};
|
||||
|
||||
LinguaENTagger = buildPerlPackage {
|
||||
@ -5155,6 +5188,18 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
};
|
||||
|
||||
LinguaENWords2Nums = buildPerlPackage {
|
||||
name = "Lingua-EN-Words2Nums-0.18";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz;
|
||||
sha256 = "686556797cd2a4eaa066f19bbf03ab25c06278292c9ead2f187dfd9031ea1d85";
|
||||
};
|
||||
meta = {
|
||||
description = "Convert English text to numbers";
|
||||
license = "unknown";
|
||||
};
|
||||
};
|
||||
|
||||
LinguaStem = buildPerlPackage rec {
|
||||
name = "Lingua-Stem-0.84";
|
||||
src = fetchurl {
|
||||
@ -8093,6 +8138,18 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
};
|
||||
|
||||
ScalarListUtils = buildPerlPackage {
|
||||
name = "Scalar-List-Utils-1.42";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.42.tar.gz;
|
||||
sha256 = "3507f72541f66a2dce850b9b56771e5fccda3d215c52f74946c6e370c0f4a4da";
|
||||
};
|
||||
meta = {
|
||||
description = "Common Scalar and List utility subroutines";
|
||||
license = "perl";
|
||||
};
|
||||
};
|
||||
|
||||
ScalarString = buildPerlPackage rec {
|
||||
name = "Scalar-String-0.002";
|
||||
src = fetchurl {
|
||||
@ -9185,15 +9242,15 @@ let self = _self // overrides; _self = with self; {
|
||||
};
|
||||
|
||||
TestDifferences = buildPerlPackage {
|
||||
name = "Test-Differences-0.4801";
|
||||
name = "Test-Differences-0.63";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/O/OV/OVID/Test-Differences-0.4801.tar.gz;
|
||||
sha256 = "1p5bqyq3gxfb1q4wajd28498fsbqk7f2y7pk9c3rnh0x36cqbvyw";
|
||||
url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.63.tar.gz;
|
||||
sha256 = "7c657a178c32f48de3b469f6d4f67b75f018a3a19c1e6d0d8892188b0d261a66";
|
||||
};
|
||||
propagatedBuildInputs = [ TextDiff ];
|
||||
propagatedBuildInputs = [ CaptureTiny TextDiff ];
|
||||
meta = {
|
||||
description = "Test strings and data structures and show differences if not ok";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
license = "unknown";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1884,11 +1884,11 @@ let
|
||||
};
|
||||
|
||||
click = buildPythonPackage rec {
|
||||
name = "click-3.3";
|
||||
name = "click-4.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
|
||||
sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p";
|
||||
sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -3873,12 +3873,12 @@ let
|
||||
disabled = !isPy27;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://gitlab.com/lsix/motu-client/repository/archive.tar.gz?ref=${name}";
|
||||
sha256 = "1d2hbws085hxf5hb1wsdlacy8skwn2sswr1b2xv18fbw5ckbqi8i";
|
||||
url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
|
||||
sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://gitlab.com/lsix/motu-client;
|
||||
homepage = https://github.com/quiet-oceans/motuclient-setuptools;
|
||||
description = "CLI to query oceanographic data to Motu servers";
|
||||
longDescription = ''
|
||||
Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user