Merge branch 'master' into staging
This commit is contained in:
Domen Kožar
commit
dc3316268e
@ -5,7 +5,7 @@
|
||||
<title>Coding conventions</title>
|
||||
|
||||
|
||||
<section><title>Syntax</title>
|
||||
<section xml:id="sec-syntax"><title>Syntax</title>
|
||||
|
||||
<itemizedlist>
|
||||
|
||||
@ -207,7 +207,7 @@ args.stdenv.mkDerivation (args // {
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>Package naming</title>
|
||||
<section xml:id="sec-package-naming"><title>Package naming</title>
|
||||
|
||||
<para>In Nixpkgs, there are generally three different names associated with a package:
|
||||
|
||||
@ -292,7 +292,7 @@ dashes between words — not in camel case. For instance, it should be
|
||||
<filename>allPackages.nix</filename> or
|
||||
<filename>AllPackages.nix</filename>.</para>
|
||||
|
||||
<section><title>Hierarchy</title>
|
||||
<section xml:id="sec-hierarchy"><title>Hierarchy</title>
|
||||
|
||||
<para>Each package should be stored in its own directory somewhere in
|
||||
the <filename>pkgs/</filename> tree, i.e. in
|
||||
|
||||
@ -13,7 +13,7 @@ in Nixpkgs to easily build packages for other programming languages,
|
||||
such as Perl or Haskell. These are described in this chapter.</para>
|
||||
|
||||
|
||||
<section xml:id="ssec-language-perl"><title>Perl</title>
|
||||
<section xml:id="sec-language-perl"><title>Perl</title>
|
||||
|
||||
<para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
|
||||
a generic package builder function for any Perl package that has a
|
||||
@ -151,7 +151,7 @@ ClassC3Componentised = buildPerlPackage rec {
|
||||
|
||||
</para>
|
||||
|
||||
<section><title>Generation from CPAN</title>
|
||||
<section xml:id="ssec-generation-from-CPAN"><title>Generation from CPAN</title>
|
||||
|
||||
<para>Nix expressions for Perl packages can be generated (almost)
|
||||
automatically from CPAN. This is done by the program
|
||||
@ -191,7 +191,7 @@ you need it.</para>
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="python"><title>Python</title>
|
||||
<section xml:id="sec-python"><title>Python</title>
|
||||
|
||||
<para>
|
||||
Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
|
||||
@ -276,7 +276,7 @@ are provided with all modules included.</para>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
<section xml:id="build-python-package"><title><varname>buildPythonPackage</varname> function</title>
|
||||
<section xml:id="ssec-build-python-package"><title><varname>buildPythonPackage</varname> function</title>
|
||||
|
||||
<para>
|
||||
The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
|
||||
@ -438,7 +438,7 @@ twisted = buildPythonPackage {
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="python-build-env"><title><function>python.buildEnv</function> function</title>
|
||||
<section xml:id="ssec-python-build-env"><title><function>python.buildEnv</function> function</title>
|
||||
<para>
|
||||
Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
|
||||
|
||||
@ -484,7 +484,7 @@ python.buildEnv.override {
|
||||
</variablelist>
|
||||
</section>
|
||||
|
||||
<section xml:id="python-tools"><title>Tools</title>
|
||||
<section xml:id="ssec-python-tools"><title>Tools</title>
|
||||
|
||||
<para>Packages inside nixpkgs are written by hand. However many tools
|
||||
exist in community to help save time. No tool is preferred at the moment.
|
||||
@ -511,7 +511,7 @@ exist in community to help save time. No tool is preferred at the moment.
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="python-development"><title>Development</title>
|
||||
<section xml:id="ssec-python-development"><title>Development</title>
|
||||
|
||||
<para>
|
||||
To develop Python packages <function>buildPythonPackage</function> has
|
||||
@ -555,7 +555,7 @@ buildPythonPackage {
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="python-faq"><title>FAQ</title>
|
||||
<section xml:id="ssec-python-faq"><title>FAQ</title>
|
||||
|
||||
<variablelist>
|
||||
|
||||
@ -597,7 +597,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="python-contrib"><title>Contributing guidelines</title>
|
||||
<section xml:id="ssec-python-contrib"><title>Contributing guidelines</title>
|
||||
<para>
|
||||
Following rules are desired to be respected:
|
||||
</para>
|
||||
@ -625,7 +625,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="ssec-language-ruby"><title>Ruby</title>
|
||||
<section xml:id="sec-language-ruby"><title>Ruby</title>
|
||||
<para>There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a <filename>Gemfile</filename>, let bundler create a <filename>Gemfile.lock</filename>, and then convert
|
||||
this into a nix expression that contains all Gem dependencies automatically.</para>
|
||||
|
||||
@ -666,7 +666,7 @@ and scalable.";
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="ssec-language-go"><title>Go</title>
|
||||
<section xml:id="sec-language-go"><title>Go</title>
|
||||
|
||||
<para>The function <varname>buildGoPackage</varname> builds
|
||||
standard Go packages.
|
||||
@ -787,7 +787,7 @@ done
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="ssec-language-java"><title>Java</title>
|
||||
<section xml:id="sec-language-java"><title>Java</title>
|
||||
|
||||
<para>Ant-based Java packages are typically built from source as follows:
|
||||
|
||||
@ -868,7 +868,7 @@ Runtime) instead of the OpenJRE.</para>
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="ssec-language-lua"><title>Lua</title>
|
||||
<section xml:id="sec-language-lua"><title>Lua</title>
|
||||
|
||||
<para>
|
||||
Lua packages are built by the <varname>buildLuaPackage</varname> function. This function is
|
||||
@ -915,7 +915,7 @@ fileSystem = buildLuaPackage {
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="ssec-language-coq"><title>Coq</title>
|
||||
<section xml:id="sec-language-coq"><title>Coq</title>
|
||||
<para>
|
||||
Coq libraries should be installed in
|
||||
<literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>.
|
||||
|
||||
@ -82,7 +82,8 @@ hello-2.3 A program that produces a familiar, friendly greeting
|
||||
</para>
|
||||
|
||||
|
||||
<section><title>Standard meta-attributes</title>
|
||||
<section xml:id="sec-standard-meta-attributes"><title>Standard
|
||||
meta-attributes</title>
|
||||
|
||||
<para>It is expected that each meta-attribute is one of the following:</para>
|
||||
|
||||
|
||||
@ -141,7 +141,7 @@ $ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
|
||||
|
||||
<!--============================================================-->
|
||||
|
||||
<section>
|
||||
<section xml:id="sec-xorg">
|
||||
|
||||
<title>X.org</title>
|
||||
|
||||
|
||||
@ -67,7 +67,8 @@
|
||||
<filename>lib/licenses.nix</filename> of the nix package tree.
|
||||
</para>
|
||||
|
||||
<section><title>Modify packages via <literal>packageOverrides</literal></title>
|
||||
<section xml:id="sec-modify-via-packageOverrides"><title>Modify
|
||||
packages via <literal>packageOverrides</literal></title>
|
||||
|
||||
<para>
|
||||
|
||||
|
||||
@ -15,7 +15,8 @@ environment does everything automatically. If
|
||||
can easily customise or override the various build phases.</para>
|
||||
|
||||
|
||||
<section><title>Using <literal>stdenv</literal></title>
|
||||
<section xml:id="sec-using-stdenv"><title>Using
|
||||
<literal>stdenv</literal></title>
|
||||
|
||||
<para>To build a package with the standard environment, you use the
|
||||
function <varname>stdenv.mkDerivation</varname>, instead of the
|
||||
@ -124,7 +125,8 @@ genericBuild
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>Tools provided by <literal>stdenv</literal></title>
|
||||
<section xml:id="sec-tools-of-stdenv"><title>Tools provided by
|
||||
<literal>stdenv</literal></title>
|
||||
|
||||
<para>The standard environment provides the following packages:
|
||||
|
||||
@ -225,7 +227,7 @@ genericBuild
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="ssec-stdenv-phases"><title>Phases</title>
|
||||
<section xml:id="sec-stdenv-phases"><title>Phases</title>
|
||||
|
||||
<para>The generic builder has a number of <emphasis>phases</emphasis>.
|
||||
Package builds are split into phases to make it easier to override
|
||||
@ -243,7 +245,8 @@ is convenient to override a phase from the derivation, while the
|
||||
latter is convenient from a build script.</para>
|
||||
|
||||
|
||||
<section><title>Controlling phases</title>
|
||||
<section xml:id="ssec-controlling-phases"><title>Controlling
|
||||
phases</title>
|
||||
|
||||
<para>There are a number of variables that control what phases are
|
||||
executed and in what order:
|
||||
@ -327,7 +330,7 @@ executed and in what order:
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The unpack phase</title>
|
||||
<section xml:id="ssec-unpack-phase"><title>The unpack phase</title>
|
||||
|
||||
<para>The unpack phase is responsible for unpacking the source code of
|
||||
the package. The default implementation of
|
||||
@ -434,7 +437,7 @@ Additional file types can be supported by setting the
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The patch phase</title>
|
||||
<section xml:id="ssec-patch-phase"><title>The patch phase</title>
|
||||
|
||||
<para>The patch phase applies the list of patches defined in the
|
||||
<varname>patches</varname> variable.</para>
|
||||
@ -477,7 +480,7 @@ Additional file types can be supported by setting the
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The configure phase</title>
|
||||
<section xml:id="ssec-configure-phase"><title>The configure phase</title>
|
||||
|
||||
<para>The configure phase prepares the source tree for building. The
|
||||
default <function>configurePhase</function> runs
|
||||
@ -573,7 +576,7 @@ script) if it exists.</para>
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The build phase</title>
|
||||
<section xml:id="build-phase"><title>The build phase</title>
|
||||
|
||||
<para>The build phase is responsible for actually building the package
|
||||
(e.g. compiling it). The default <function>buildPhase</function>
|
||||
@ -657,7 +660,7 @@ called, respectively.</para>
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The check phase</title>
|
||||
<section xml:id="ssec-check-phase"><title>The check phase</title>
|
||||
|
||||
<para>The check phase checks whether the package was built correctly
|
||||
by running its test suite. The default
|
||||
@ -717,7 +720,7 @@ doCheck = true;</programlisting>
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The install phase</title>
|
||||
<section xml:id="ssec-install-phase"><title>The install phase</title>
|
||||
|
||||
<para>The install phase is responsible for installing the package in
|
||||
the Nix store under <envar>out</envar>. The default
|
||||
@ -772,7 +775,7 @@ installTargets = "install-bin install-doc";</programlisting>
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The fixup phase</title>
|
||||
<section xml:id="ssec-fixup-phase"><title>The fixup phase</title>
|
||||
|
||||
<para>The fixup phase performs some (Nix-specific) post-processing
|
||||
actions on the files installed under <filename>$out</filename> by the
|
||||
@ -895,7 +898,8 @@ following:
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>The distribution phase</title>
|
||||
<section xml:id="ssec-distribution-phase"><title>The distribution
|
||||
phase</title>
|
||||
|
||||
<para>The distribution phase is intended to produce a source
|
||||
distribution of the package. The default
|
||||
@ -1199,7 +1203,7 @@ echo @foo@
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>Purity in Nixpkgs</title>
|
||||
<section xml:id="sec-purity-in-nixpkgs"><title>Purity in Nixpkgs</title>
|
||||
|
||||
<para>[measures taken to prevent dependencies on packages outside the
|
||||
store, and what you can do to prevent them]</para>
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
# This module is deprecated, since you can just say ‘fonts.fonts = [
|
||||
# pkgs.corefonts ];’ instead.
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
@ -9,6 +12,7 @@ with lib;
|
||||
fonts = {
|
||||
|
||||
enableCoreFonts = mkOption {
|
||||
visible = false;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to include Microsoft's proprietary Core Fonts. These fonts
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
|
||||
# Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
|
||||
# using 32bit alsa on 64bit linux.
|
||||
enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null);
|
||||
enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
|
||||
|
||||
ids = config.ids;
|
||||
|
||||
|
||||
33
pkgs/applications/audio/LazyLimiter/default.nix
Normal file
33
pkgs/applications/audio/LazyLimiter/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "LazyLimiter-${version}";
|
||||
version = "0.3.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magnetophon";
|
||||
repo = "LazyLimiter";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l";
|
||||
};
|
||||
|
||||
buildInputs = [ faust2jack faust2lv2 ];
|
||||
|
||||
buildPhase = ''
|
||||
faust2jack -t 99999 LazyLimiter.dsp
|
||||
faust2lv2 -t 99999 LazyLimiter.dsp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp LazyLimiter $out/bin/
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -r LazyLimiter.lv2/ $out/lib/lv2
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A fast yet clean lookahead limiter for jack and lv2";
|
||||
homepage = https://magnetophon.github.io/LazyLimiter/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
};
|
||||
}
|
||||
33
pkgs/applications/audio/MBdistortion/default.nix
Normal file
33
pkgs/applications/audio/MBdistortion/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "MBdistortion-${version}";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magnetophon";
|
||||
repo = "MBdistortion";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp";
|
||||
};
|
||||
|
||||
buildInputs = [ faust2jack faust2lv2 ];
|
||||
|
||||
buildPhase = ''
|
||||
faust2jack -t 99999 MBdistortion.dsp
|
||||
faust2lv2 -t 99999 MBdistortion.dsp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp MBdistortion $out/bin/
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -r MBdistortion.lv2/ $out/lib/lv2
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mid-side multiband distortion for jack and lv2";
|
||||
homepage = https://github.com/magnetophon/MBdistortion;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
};
|
||||
}
|
||||
21
pkgs/applications/audio/QmidiNet/default.nix
Normal file
21
pkgs/applications/audio/QmidiNet/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ stdenv, fetchurl, qt4, alsaLib, jack2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2.1";
|
||||
name = "qmidinet-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz";
|
||||
sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 alsaLib jack2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
|
||||
homepage = http://qmidinet.sourceforge.net/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
65
pkgs/applications/audio/VoiceOfFaust/default.nix
Normal file
65
pkgs/applications/audio/VoiceOfFaust/default.nix
Normal file
@ -0,0 +1,65 @@
|
||||
|
||||
{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "VoiceOfFaust-${version}";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magnetophon";
|
||||
repo = "VoiceOfFaust";
|
||||
rev = "v${version}";
|
||||
sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn";
|
||||
};
|
||||
|
||||
plugins = [ helmholtz mrpeach ];
|
||||
|
||||
pitchTracker = puredata-with-plugins plugins;
|
||||
|
||||
buildInputs = [ faust2jack ];
|
||||
|
||||
runtimeInputs = [ pitchTracker ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper
|
||||
sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
faust2jack -osc classicVocoder.dsp
|
||||
faust2jack -osc CZringmod.dsp
|
||||
faust2jack -osc FMsinger.dsp
|
||||
faust2jack -osc FOFvocoder.dsp
|
||||
faust2jack -osc Karplus-StrongSinger.dsp
|
||||
faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp
|
||||
faust2jack -osc PAFvocoder.dsp
|
||||
faust2jack -osc -sch -t 99999 stringSinger.dsp
|
||||
faust2jack -osc subSinger.dsp
|
||||
# doesn't compile on most systems, too big:
|
||||
#faust2jack -osc -sch -t 99999 VocSynthFull.dsp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp launchers/* $out/bin/
|
||||
cp classicVocoder $out/bin/
|
||||
cp CZringmod $out/bin/
|
||||
cp FMsinger $out/bin/
|
||||
cp FOFvocoder $out/bin/
|
||||
cp Karplus-StrongSinger $out/bin/
|
||||
cp Karplus-StrongSingerMaxi $out/bin/
|
||||
cp PAFvocoder $out/bin/
|
||||
cp stringSinger $out/bin/
|
||||
cp subSinger $out/bin/
|
||||
#cp VocSynthFull $out/bin/
|
||||
mkdir $out/PureData/
|
||||
cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Turn your voice into a synthesizer";
|
||||
homepage = https://github.com/magnetophon/VoiceOfFaust;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "drumkv1-${version}";
|
||||
version = "0.6.1";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
|
||||
sha256 = "082ml6g63n6s3w704fjkma8085g2l10az3f6r78y9hpgpw3042jw";
|
||||
sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq";
|
||||
};
|
||||
|
||||
buildInputs = [ jack2 libsndfile lv2 qt4 ];
|
||||
|
||||
25
pkgs/applications/audio/mod-distortion/default.nix
Normal file
25
pkgs/applications/audio/mod-distortion/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, lv2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mod-distortion-${version}";
|
||||
version = "git-2015-05-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "portalmod";
|
||||
repo = "mod-distortion";
|
||||
rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a";
|
||||
sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19";
|
||||
};
|
||||
|
||||
buildInputs = [ lv2 ];
|
||||
|
||||
installFlags = [ "LV2_PATH=$out/lib/lv2" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/portalmod/mod-distortion;
|
||||
description = "Analog distortion emulation lv2 plugins";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ncmpcpp-${version}";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
|
||||
sha256 = "00r2f7psd2jym2lxf3q3lz2lskz7091pz9glnxqam2bznwnlyxyp";
|
||||
sha256 = "1w85r23s0b30vh03xybnjikslqcf02gsciib9v10jw71nw32wzkm";
|
||||
};
|
||||
|
||||
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
|
||||
@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
|
||||
++ optional curlSupport "--with-curl"
|
||||
++ optional taglibSupport "--with-taglib";
|
||||
|
||||
buildInputs = [ boost mpd_clientlib ncurses pkgconfig readline libiconv ]
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ boost mpd_clientlib ncurses readline libiconv ]
|
||||
++ optional curlSupport curl
|
||||
++ optional visualizerSupport fftw
|
||||
++ optional taglibSupport taglib;
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
, sord, sratom, stdenv, suil }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
name = "qtractor-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
|
||||
sha256 = "1n70hs4bx4hq3cp2p35jq5vlcans4fk2c35w72244vlqlajx05c0";
|
||||
sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.6.1";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "18jh953a0480fnsflbm4j04xz02h7fqwk77v8hnv54vwwp5a1h08";
|
||||
sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w";
|
||||
};
|
||||
|
||||
buildInputs = [ jack2 libsndfile lv2 qt4 ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synthv1-${version}";
|
||||
version = "0.6.1";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||
sha256 = "0v9zpa49cdj8ixpppgxz95dbn62v8mamxz6fpl7sdnzfn2l8jr4g";
|
||||
sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 jack2 lv2 ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "idris-mode";
|
||||
version = "0.9.15";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "0ag7qqsv64rifk9ncdxv4gyylfbw6c8y2wq610l4pabqv2qrlh9r";
|
||||
sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
{stdenv, fetchurl} :
|
||||
{ stdenv, fetchurl } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "joe-3.7";
|
||||
name = "joe-4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
|
||||
sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a";
|
||||
sha256 = "0599xp90idl3dkplz72p33d2rfg0hb5yd38rhqdvz5zxfzzssmn5";
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A full featured terminal-based screen editor";
|
||||
homepage = http://joe-editor.sourceforge.net;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.4";
|
||||
version = "1.6.6";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "0ald6qqg7abgr8hj2qk45260cqh3fddzqbxc1p7ll0ac2vl0bxy5";
|
||||
sha256 = "1991zm0ly2j69vq9jsijfrjw0vnchh3il7m4ylsblzk73614nppq";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fbida-2.09";
|
||||
name = "fbida-2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
|
||||
sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
|
||||
sha256 = "1dkc1d6qlfa1gn94wcbyr7ayiy728q52fvbipwmnl2mlc6n3lnks";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Image viewing and manipulation programs";
|
||||
homepage = https://www.kraxel.org/blog/linux/fbida/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
{ stdenv, fetchurl, xulrunner }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
name = "pencil-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
|
||||
sha256 = "b5dcb12986108bf3eb13cdd1ee1fc1f8d1a88c7fadf2a5c44e7a59a254f2b0dd";
|
||||
sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3";
|
||||
|
||||
};
|
||||
|
||||
buildPhase = "";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
|
||||
, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
|
||||
|
||||
let version = "3.16.0.1"; in
|
||||
let version = "3.17.2"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "simple-scan-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma";
|
||||
url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz";
|
||||
sha256 = "07r32hsafb8is2fs0flk7dvi5agyzf9jqs96sbgia2pizmyl1s1m";
|
||||
url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -41,7 +41,7 @@ pythonPackages.buildPythonPackage {
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
patchShebangs ./run-test
|
||||
patchShebangs .
|
||||
substituteInPlace ./run-test \
|
||||
--replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES'
|
||||
PATH=".:$PATH" ./run-test
|
||||
|
||||
30
pkgs/applications/misc/rofi/pass.nix
Normal file
30
pkgs/applications/misc/rofi/pass.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rofi-${version}";
|
||||
version = "2015-05-29";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/carnager/rofi-pass";
|
||||
rev = "92c26557ec4b0508c563d596291571bbef402899";
|
||||
sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng";
|
||||
};
|
||||
|
||||
buildInputs = [ rofi wmctrl xprop xdotool ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -a $src/rofi-pass $out/bin/rofi-pass
|
||||
|
||||
mkdir -p $out/share/doc/rofi-pass/
|
||||
cp -a $src/config.example $out/share/doc/rofi-pass/config.example
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A script to make rofi work with password-store";
|
||||
homepage = https://github.com/carnager/rofi-pass;
|
||||
maintainers = [stdenv.lib.maintainers._1126];
|
||||
};
|
||||
}
|
||||
@ -6,12 +6,12 @@
|
||||
, libXcursor, libXi, libXinerama }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.4";
|
||||
version = "3.0.4.1";
|
||||
name = "dillo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dillo.org/download/${name}.tar.bz2";
|
||||
sha256 = "0ffz481vgl7f12f575pmbagm8swgxgv9s9c0p8c7plhd04jsnazf";
|
||||
sha256 = "0iw617nnrz3541jkw5blfdlk4x8jxb382pshi8nfc7xd560c95zd";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/snort/${name}.tar.gz";
|
||||
sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p";
|
||||
};
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/snort/${name}.tar.gz";
|
||||
sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
|
||||
};
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bitlbee-3.2.2";
|
||||
name = "bitlbee-3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://bitlbee/src/${name}.tar.gz";
|
||||
sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s";
|
||||
sha256 = "0plx4dryf8i6hz7vghg84z5f6w6rkw1l8ckl4c4wh5zxpd3ddfnf";
|
||||
};
|
||||
|
||||
buildInputs = [ gnutls glib pkgconfig libotr ]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
|
||||
, libuuid, gnutls, sqlite, pkgconfigUpstream }:
|
||||
, libuuid, openssl, sqlite, pkgconfigUpstream }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-salut";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
|
||||
};
|
||||
|
||||
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
|
||||
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl
|
||||
sqlite ];
|
||||
|
||||
nativeBuildInputs = [ libxslt pkgconfigUpstream ];
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5.base pkgconfig boost ];
|
||||
buildInputs = [ qt5 pkgconfig boost ];
|
||||
|
||||
postPatch = ''
|
||||
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
stdenv.mkDerivation {
|
||||
name = "firestr-0.8";
|
||||
|
||||
buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mempko";
|
||||
repo = "firestr";
|
||||
@ -13,23 +11,25 @@ stdenv.mkDerivation {
|
||||
sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base qt5.multimedia
|
||||
libXScrnSaver openssl ];
|
||||
|
||||
patches = ./return.patch;
|
||||
|
||||
postPatch =
|
||||
''
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "set(Boost_USE_STATIC_LIBS on)" "" \
|
||||
--replace "/usr/include/botan" "${botan}/include/botan" \
|
||||
--replace "libopus.a" "libopus.so" \
|
||||
--replace "libsnappy.a" "libsnappy.so" \
|
||||
--replace "libbotan-1.10.a" "libbotan-1.10.so.0"
|
||||
'';
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib;
|
||||
{ description = "Grass computing platform";
|
||||
homepage = http://firestr.com/;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.emery ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
description = "Grass computing platform";
|
||||
homepage = http://firestr.com/;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.emery ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,12 +4,12 @@ with goPackages;
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "syncthing-${version}";
|
||||
version = "0.11.6";
|
||||
version = "0.11.7";
|
||||
goPackagePath = "github.com/syncthing/syncthing";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/syncthing/syncthing.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "7fe7d7034c0e502036e2a0bb1b94b1701bd194cc82f07495da8a41c4b097c6a3";
|
||||
sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/syncthing" ];
|
||||
|
||||
22
pkgs/applications/science/electronics/verilator/default.nix
Normal file
22
pkgs/applications/science/electronics/verilator/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, fetchurl, perl, flex, bison }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "verilator-${version}";
|
||||
version = "3.872";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.veripool.org/ftp/${name}.tgz";
|
||||
sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ perl flex bison ];
|
||||
|
||||
meta = {
|
||||
description = "Fast and robust (System)Verilog simulator/compiler";
|
||||
homepage = "http://www.veripool.org/wiki/verilator";
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
||||
@ -46,7 +46,8 @@ rec {
|
||||
sendEmailSupport = !stdenv.isDarwin;
|
||||
};
|
||||
|
||||
gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex;
|
||||
inherit (pkgs.haskellPackages) git-annex;
|
||||
gitAnnex = git-annex;
|
||||
|
||||
qgit = import ./qgit {
|
||||
inherit fetchurl stdenv;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "qarte-2.2.0";
|
||||
name = "qarte-2.2.0-147";
|
||||
src = fetchbzr {
|
||||
url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;
|
||||
rev = "146";
|
||||
sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9";
|
||||
rev = "147";
|
||||
sha256 = "0cl3k3vr3kmp5dls0lbv5pka4zrlyh5816pwl5rkgqmycl11pk51";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
{ stdenv, fetchurl, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smtube-15.5.10";
|
||||
versionMajor = "15.5";
|
||||
versionMinor = "17";
|
||||
version = "${versionMajor}.${versionMinor}";
|
||||
name = "smtube-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
|
||||
sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz";
|
||||
url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2";
|
||||
sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -41,7 +41,7 @@ let
|
||||
optLibuuid = if isNix then null else shouldUsePkg libuuid;
|
||||
optVde2 = if isNix then null else shouldUsePkg vde2;
|
||||
optLibaio = shouldUsePkg libaio;
|
||||
optLibcap_ng = shouldUsePkg libcap_ng;
|
||||
optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng;
|
||||
optSpice = if isNix then null else shouldUsePkg spice;
|
||||
optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol;
|
||||
optLibceph = if isNix then null else shouldUsePkg libceph;
|
||||
@ -95,6 +95,8 @@ let
|
||||
targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu"
|
||||
else if stdenv.system == "i686-linux" then "i386-softmmu"
|
||||
else null;
|
||||
|
||||
hasModules = if isNix then null else true;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -138,7 +140,7 @@ stdenv.mkDerivation rec {
|
||||
(mkOther "smbd" "smbd")
|
||||
(mkOther "sysconfdir" "/etc")
|
||||
(mkOther "localstatedir" "/var")
|
||||
(mkEnable true "modules" null)
|
||||
(mkEnable hasModules "modules" null)
|
||||
(mkEnable false "debug-tcg" null)
|
||||
(mkEnable false "debug-info" null)
|
||||
(mkEnable false "sparse" null)
|
||||
@ -167,7 +169,7 @@ stdenv.mkDerivation rec {
|
||||
(mkEnable (!isNix) "system" null)
|
||||
(mkEnable (!isKvmOnly) "user" null)
|
||||
(mkEnable (!isKvmOnly) "guest-base" null)
|
||||
(mkEnable true "pie" null)
|
||||
(mkEnable (!isNix) "pie" null)
|
||||
(mkEnable (optLibuuid != null) "uuid" null)
|
||||
(mkEnable (optVde2 != null) "vde" null)
|
||||
(mkEnable false "netmap" null) # TODO(wkennington): Add Support
|
||||
@ -199,6 +201,8 @@ stdenv.mkDerivation rec {
|
||||
(mkEnable (optNumactl != null) "numa" null)
|
||||
] ++ optionals isKvmOnly [
|
||||
(mkOther "target-list" targetList)
|
||||
] ++ optionals isNix [
|
||||
"--static"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode";
|
||||
# In lieu of a licence:
|
||||
# In lieu of a license:
|
||||
# Fonts in this site are offered free for any use;
|
||||
# they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
|
||||
license = stdenv.lib.licenses.free;
|
||||
|
||||
@ -16,11 +16,14 @@ stdenv.mkDerivation rec {
|
||||
preFixup = ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper];
|
||||
buildInputs = with gnome3; [
|
||||
perl cmake vala pkgconfig glib gtk3 granite libnotify gettext makeWrapper
|
||||
vte_290 libgee gsettings_desktop_schemas defaultIconTheme
|
||||
];
|
||||
meta = {
|
||||
description = "elementary OS's terminal";
|
||||
longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS.";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
p_name = "xfce4-power-manager";
|
||||
ver_maj = "1.4";
|
||||
ver_min = "3";
|
||||
ver_min = "4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
||||
sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1";
|
||||
sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
|
||||
};
|
||||
|
||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = ["x86_64-linux" "i686-linux"];
|
||||
broken = true; # https://github.com/NixOS/nixpkgs/issues/7810
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
|
||||
inherit (ghc.meta) license;
|
||||
broken = true; # https://github.com/NixOS/nixpkgs/issues/7810
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,6 +39,5 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
|
||||
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
|
||||
inherit (ghc.meta) license;
|
||||
broken = true; # https://github.com/NixOS/nixpkgs/issues/7810
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
|
||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "clang-${version}";
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
|
||||
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
|
||||
|
||||
buildInputs = [ cmake libedit libxml2 ];
|
||||
buildInputs = [ cmake libedit libxml2 zlib ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
|
||||
11
pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
Normal file
11
pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -r 61edd5c7412e make/linux/Makefile
|
||||
--- a/hotspot/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000
|
||||
+++ b/hotspot/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100
|
||||
@@ -233,7 +233,7 @@
|
||||
# Solaris 2.5.1, 2.6).
|
||||
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
|
||||
|
||||
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
|
||||
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
|
||||
OS_VERSION := $(shell uname -r)
|
||||
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
|
||||
@ -65,6 +65,8 @@ let
|
||||
./fix-java-home-jdk8.patch
|
||||
./read-truststore-from-env-jdk8.patch
|
||||
./currency-date-range-jdk8.patch
|
||||
./JDK-8074312-hotspot.patch
|
||||
|
||||
];
|
||||
preConfigure = ''
|
||||
chmod +x configure
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbcl-${version}";
|
||||
version = "1.2.11";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
|
||||
sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8";
|
||||
sha256 = "1bf98wi3gz8n09prwmxa38b2mhq69rqq11s9h9swi3avy5wchnxn";
|
||||
};
|
||||
|
||||
buildInputs = [ which ]
|
||||
|
||||
@ -27,6 +27,7 @@ self: super: {
|
||||
|
||||
# Doesn't compile with lua 5.2.
|
||||
hslua = super.hslua.override { lua = pkgs.lua5_1; };
|
||||
hslua_0_4_0 = super.hslua_0_4_0.override { lua = pkgs.lua5_1; };
|
||||
|
||||
# Use the default version of mysql to build this package (which is actually mariadb).
|
||||
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
|
||||
@ -457,9 +458,6 @@ self: super: {
|
||||
# https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
|
||||
hspec-webdriver = markBroken super.hspec-webdriver;
|
||||
|
||||
# The build fails with the most recent version of c2hs.
|
||||
ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; };
|
||||
|
||||
# Needs access to locale data, but looks for it in the wrong place.
|
||||
scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
|
||||
|
||||
@ -678,8 +676,14 @@ self: super: {
|
||||
# https://github.com/junjihashimoto/test-sandbox-compose/issues/2
|
||||
test-sandbox-compose = dontCheck super.test-sandbox-compose;
|
||||
|
||||
# https://github.com/jgm/pandoc/issues/2036
|
||||
pandoc = dontCheck super.pandoc;
|
||||
# https://github.com/jgm/pandoc/issues/2190
|
||||
pandoc = overrideCabal super.pandoc (drv: {
|
||||
enableSharedExecutables = false;
|
||||
postInstall = '' # install man pages
|
||||
mv man $out/
|
||||
find $out/man -type f ! -name "*.[0-9]" -exec rm {} +
|
||||
'';
|
||||
});
|
||||
|
||||
# Broken by GLUT update.
|
||||
Monadius = markBroken super.Monadius;
|
||||
@ -742,7 +746,9 @@ self: super: {
|
||||
# Uses OpenGL in testing
|
||||
caramia = dontCheck super.caramia;
|
||||
|
||||
llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; };
|
||||
# Needs help finding LLVM.
|
||||
llvm-general = super.llvm-general.override { llvm-config = self.llvmPackages.llvm; };
|
||||
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
|
||||
|
||||
# Tries to run GUI in tests
|
||||
leksah = dontCheck super.leksah;
|
||||
@ -750,13 +756,8 @@ self: super: {
|
||||
# Patch to consider NIX_GHC just like xmonad does
|
||||
dyre = appendPatch super.dyre ./dyre-nix.patch;
|
||||
|
||||
# Fix problems with GHC >=7.8 (in compatible way)
|
||||
mueval = let pkg = appendPatch super.mueval (pkgs.fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/4.patch";
|
||||
sha256 = "1l0jn2lbzbhx9ifbpb5g617qa0fc8fwa6kyr87pjqfxpqminsgp5";
|
||||
});
|
||||
# Nix-specific workaround
|
||||
in appendPatch pkg ./mueval-nix.patch;
|
||||
# https://github.com/gwern/mueval/issues/9
|
||||
mueval = markBrokenVersion "0.9.1.1" super.mueval;
|
||||
|
||||
# Test suite won't compile against tasty-hunit 0.9.x.
|
||||
zlib = dontCheck super.zlib;
|
||||
@ -814,25 +815,21 @@ self: super: {
|
||||
# https://github.com/kkardzis/curlhs/issues/6
|
||||
curlhs = dontCheck super.curlhs;
|
||||
|
||||
# https://github.com/haskell-servant/servant-server/issues/45
|
||||
servant-server = markBroken super.servant-server;
|
||||
servant-client = dontDistribute super.servant-client;
|
||||
servant-jquery = dontDistribute super.servant-jquery;
|
||||
language-puppet = dontDistribute super.language-puppet;
|
||||
|
||||
# This needs the latest version of errors to compile.
|
||||
pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; };
|
||||
pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; };
|
||||
|
||||
# https://github.com/hvr/token-bucket/issues/3
|
||||
token-bucket = dontCheck super.token-bucket;
|
||||
|
||||
# https://github.com/kawu/text-binary/issues/2
|
||||
text-binary = appendPatch super.text-binary (pkgs.fetchpatch {
|
||||
url = "https://github.com/RyanGlScott/text-binary/commit/608e0ce86a9a7591dbfe83f7cbb36b8d8ebd07b8.patch";
|
||||
sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1";
|
||||
});
|
||||
|
||||
# https://github.com/alphaHeavy/lzma-enumerator/issues/3
|
||||
lzma-enumerator = dontCheck super.lzma-enumerator;
|
||||
|
||||
# https://github.com/BNFC/bnfc/issues/140
|
||||
BNFC = dontCheck super.BNFC;
|
||||
|
||||
# FPCO's fork of Cabal won't succeed its test suite.
|
||||
Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
|
||||
|
||||
# https://github.com/vincenthz/hs-cipher-aes/issues/35
|
||||
cipher-aes = dontCheck super.cipher-aes;
|
||||
}
|
||||
|
||||
@ -116,11 +116,6 @@ self: super: {
|
||||
# support a moving target". Go figure.
|
||||
barecheck = doJailbreak super.barecheck;
|
||||
|
||||
syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch {
|
||||
url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch";
|
||||
sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br";
|
||||
});
|
||||
|
||||
# https://github.com/kazu-yamamoto/unix-time/issues/30
|
||||
unix-time = dontCheck super.unix-time;
|
||||
|
||||
@ -183,10 +178,6 @@ self: super: {
|
||||
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
|
||||
self.webkitgtk3-javascriptcore ];
|
||||
|
||||
# https://github.com/BNFC/bnfc/issues/137
|
||||
BNFC = markBrokenVersion "2.7.1" super.BNFC;
|
||||
cubical = dontDistribute super.cubical;
|
||||
|
||||
# contacted maintainer by e-mail
|
||||
cmdlib = markBrokenVersion "0.3.5" super.cmdlib;
|
||||
darcs-fastconvert = dontDistribute super.darcs-fastconvert;
|
||||
@ -238,7 +229,6 @@ self: super: {
|
||||
|
||||
# Broken with GHC 7.10.x.
|
||||
aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
|
||||
c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
|
||||
Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
|
||||
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
|
||||
containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
|
||||
@ -288,4 +278,13 @@ self: super: {
|
||||
HLearn-distributions = dontDistribute super.HLearn-distributions;
|
||||
HLearn-classification = dontDistribute super.HLearn-classification;
|
||||
|
||||
# Won't work with LLVM 3.5.
|
||||
llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
|
||||
|
||||
# Ugly hack to trigger a rebuild to fix the broken package on Hydra.
|
||||
crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1";
|
||||
|
||||
# Fix compilation under GHC 7.10, patch has been sent upstream.
|
||||
iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch;
|
||||
|
||||
}
|
||||
|
||||
@ -81,4 +81,7 @@ self: super: {
|
||||
# The compat library is empty in the presence of mtl 2.2.x.
|
||||
mtl-compat = dontHaddock super.mtl-compat;
|
||||
|
||||
# Won't work with LLVM 3.5.
|
||||
llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
|
||||
|
||||
}
|
||||
|
||||
@ -244,7 +244,7 @@ stdenv.mkDerivation ({
|
||||
mv $packageConfFile $packageConfDir/$pkgId.conf
|
||||
''}
|
||||
|
||||
${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
|
||||
${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
|
||||
for exe in "$out/bin/"* ; do
|
||||
install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
|
||||
done
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
41
pkgs/development/haskell-modules/iconv-fix-ghc710.patch
Normal file
41
pkgs/development/haskell-modules/iconv-fix-ghc710.patch
Normal file
@ -0,0 +1,41 @@
|
||||
Running command 'diff -urN old-iconv new-iconv'
|
||||
Fri May 29 00:42:30 CEST 2015 Robert Helgesson <robert@rycee.net>
|
||||
* Add Functor and Applicative instances for IConv
|
||||
|
||||
This makes iconv successfully build under GHC 7.10.
|
||||
diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs
|
||||
--- old-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200
|
||||
+++ new-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200
|
||||
@@ -49,6 +49,7 @@
|
||||
import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
|
||||
import System.IO (hPutStrLn, stderr)
|
||||
import Control.Exception (assert)
|
||||
+import Control.Monad (ap, liftM)
|
||||
|
||||
import Prelude hiding (length)
|
||||
|
||||
@@ -192,8 +193,8 @@
|
||||
-}
|
||||
|
||||
|
||||
-----------------------------
|
||||
--- IConv monad
|
||||
+----------------------------------------
|
||||
+-- IConv functor, applicative, and monad
|
||||
--
|
||||
|
||||
newtype IConv a = I {
|
||||
@@ -202,6 +203,13 @@
|
||||
-> IO (Buffers, a)
|
||||
}
|
||||
|
||||
+instance Functor IConv where
|
||||
+ fmap = liftM
|
||||
+
|
||||
+instance Applicative IConv where
|
||||
+ pure = return
|
||||
+ (<*>) = ap
|
||||
+
|
||||
instance Monad IConv where
|
||||
(>>=) = bindI
|
||||
-- m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f
|
||||
@ -6,11 +6,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.8.2";
|
||||
version = "4.0.0";
|
||||
name = "octave-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${name}.tar.bz2";
|
||||
sha256 = "83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae";
|
||||
url = "mirror://gnu/octave/${name}.tar.xz";
|
||||
sha256 = "0x64b2lna4vrlm4wwx6h1qdlmki6s2b9q90yjxldlvvrqvxf4syg";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
|
||||
|
||||
@ -1,23 +1,27 @@
|
||||
{ stdenv, fetchurl, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
|
||||
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
|
||||
|
||||
let version = "1.13"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accounts-qt-1.11";
|
||||
src = fetchurl {
|
||||
url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
|
||||
sha256 = "07drh4s7zaz4bzg2xhwm50ig1g8vlphfv02nrzz1yi085az1fmch";
|
||||
name = "accounts-qt-${version}";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
|
||||
rev = version;
|
||||
repo = "libaccounts-qt";
|
||||
owner = "accounts-sso";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt library for accessing the online accounts database";
|
||||
homepage = "http://code.google.com/p/accounts-sso/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
};
|
||||
|
||||
buildInputs = [ glib libaccounts-glib qt5.base ];
|
||||
nativeBuildInputs = [ doxygen pkgconfig ];
|
||||
|
||||
configurePhase = ''
|
||||
qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/AccountsQt5
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/lib/cmake/AccountsQt5/AccountsQtConfig.cmake \
|
||||
$out/lib/cmake/AccountsQt5/AccountsQt5Config.cmake
|
||||
mv $out/lib/cmake/AccountsQt5/AccountsQtConfigVersion.cmake \
|
||||
$out/lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake
|
||||
qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
|
||||
'';
|
||||
}
|
||||
|
||||
@ -6,8 +6,8 @@ agda.mkDerivation (self: rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/agda/agda-stdlib";
|
||||
rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
|
||||
sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
|
||||
rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf";
|
||||
sha256 = "521899b820e70abbae7cb30008b87a2f8676bc6265b78865e42982fc2e5c972f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "capnproto-${version}";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
|
||||
sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7";
|
||||
sha256 = "0a89v6sigsyj9vii0d5kqs2fdv73r71f8czzhdvqdvk3p0mlcgx2";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "getdata-0.8.6";
|
||||
name = "getdata-0.8.8";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/getdata/${name}.tar.bz2";
|
||||
sha256 = "1cxmyqg6m7346q37wrr05zmyip1qcgi4vpy3xki20nxwkaw37lz8";
|
||||
sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -63,8 +63,9 @@ stdenv.mkDerivation rec {
|
||||
propagatedBuildInputs = [ pcre zlib libffi libiconv ]
|
||||
++ libintlOrEmpty;
|
||||
|
||||
configureFlags =
|
||||
optional stdenv.isDarwin "--disable-compile-warnings"
|
||||
# Static is necessary for qemu-nix to support static userspace translators
|
||||
configureFlags = [ "--enable-static" ]
|
||||
++ optional stdenv.isDarwin "--disable-compile-warnings"
|
||||
++ optional stdenv.isSunOS "--disable-modular-tests";
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
|
||||
@ -75,6 +76,8 @@ stdenv.mkDerivation rec {
|
||||
export MACOSX_DEPLOYMENT_TARGET=
|
||||
'';
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
DETERMINISTIC_BUILD = 1;
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gss-1.0.2";
|
||||
name = "gss-1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gss/${name}.tar.gz";
|
||||
sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9";
|
||||
sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
|
||||
};
|
||||
|
||||
buildInputs = [ shishi ];
|
||||
|
||||
@ -1,15 +1,25 @@
|
||||
{ stdenv, fetchurl, glib, libxml2, libxslt, pkgconfig, sqlite }:
|
||||
{ stdenv, fetchFromGitLab, autoconf, automake, glib
|
||||
, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }:
|
||||
|
||||
let version = "1.18"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libaccounts-glib-1.16";
|
||||
src = fetchurl {
|
||||
url = "https://accounts-sso.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "0hgvk9rdfvk47c54rvcp3hq74yy7v6w1ql71q2mik8lmsx22354a";
|
||||
name = "libaccounts-glib-${version}";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km";
|
||||
rev = version;
|
||||
repo = "libaccounts-glib";
|
||||
owner = "accounts-sso";
|
||||
};
|
||||
|
||||
buildInputs = [ glib libxml2 libxslt sqlite ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ];
|
||||
|
||||
configurePhase = ''HAVE_GCOV_FALSE='#' ./configure $configureFlags --prefix=$out'';
|
||||
postPatch = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, yasm
|
||||
, freetype ? null
|
||||
, fribidi ? null
|
||||
, freetype, fribidi
|
||||
, encaSupport ? true, enca ? null # enca support
|
||||
, fontconfigSupport ? true, fontconfig ? null # fontconfig support
|
||||
, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
|
||||
@ -8,19 +7,18 @@
|
||||
, largeTilesSupport ? false # Use larger tiles in the rasterizer
|
||||
}:
|
||||
|
||||
assert ((freetype != null) && (fribidi != null));
|
||||
assert encaSupport -> (enca != null);
|
||||
assert fontconfigSupport -> (fontconfig != null);
|
||||
assert harfbuzzSupport -> (harfbuzz != null);
|
||||
assert encaSupport -> enca != null;
|
||||
assert fontconfigSupport -> fontconfig != null;
|
||||
assert harfbuzzSupport -> harfbuzz != null;
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libass-${version}";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7";
|
||||
sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, qjson, kdelibs }:
|
||||
{ stdenv, fetchgit, pkgconfig, qjson, kdelibs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libkvkonatkte-1.0-pre20120103";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61";
|
||||
};
|
||||
|
||||
buildInputs = [ qjson kdelibs ];
|
||||
buildInputs = [ pkgconfig qjson kdelibs ];
|
||||
|
||||
meta = {
|
||||
homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte;
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Helper library to program the performance monitoring events";
|
||||
longDescription = ''
|
||||
This package provides a library, called libpfm4 which is used to
|
||||
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
|
||||
events such as those provided by the Performance Monitoring Unit
|
||||
(PMU) of modern processors.
|
||||
'';
|
||||
licence = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.pierron ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.pierron ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "movit-${version}";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://movit.sesse.net/${name}.tar.gz";
|
||||
sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1";
|
||||
sha256 = "0q33h3gfw16gd9k6s3isd7ili2mifw7j1723xpdlc516gggsazw9";
|
||||
};
|
||||
|
||||
GTEST_DIR = "${gtest}";
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchurl,
|
||||
zlib, hdf5,
|
||||
zlib, hdf5, m4,
|
||||
curl # for DAP
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netcdf-4.3.2";
|
||||
name = "netcdf-4.3.3.1";
|
||||
src = fetchurl {
|
||||
url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
|
||||
sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e";
|
||||
sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
zlib hdf5 curl
|
||||
zlib hdf5 m4 curl
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -11,11 +11,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "nss-${version}";
|
||||
version = "3.19";
|
||||
version = "3.19.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz";
|
||||
sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b";
|
||||
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/${name}.tar.gz";
|
||||
sha256 = "b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff";
|
||||
};
|
||||
|
||||
buildInputs = [ nspr perl zlib sqlite ];
|
||||
|
||||
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
||||
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
|
||||
# and reports an error otherwise. Further versions may fix that.
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive"
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=902561
|
||||
+ " -DUSE_INTERP_RESULT"
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
|
||||
+ " -DGLX_GLXEXT_LEGACY";
|
||||
|
||||
|
||||
@ -1,10 +1,22 @@
|
||||
{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gfortran,
|
||||
cmake,
|
||||
python,
|
||||
atlas ? null,
|
||||
shared ? false
|
||||
}:
|
||||
let
|
||||
atlasMaybeShared = atlas.override { inherit shared; };
|
||||
atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
|
||||
else null;
|
||||
usedLibExtension = if shared then ".so" else ".a";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (stdenv.lib) optional optionals concatStringsSep;
|
||||
inherit (builtins) hasAttr attrNames;
|
||||
version = "3.5.0";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "liblapack-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
|
||||
@ -17,11 +29,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_OPTIMIZED_BLAS=ON"
|
||||
"-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
|
||||
"-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
|
||||
"-DCMAKE_Fortran_FLAGS=-fPIC"
|
||||
]
|
||||
++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
|
||||
++ (optionals (atlas != null) [
|
||||
"-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
|
||||
"-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
|
||||
])
|
||||
++ (optional shared "-DBUILD_SHARED_LIBS=ON")
|
||||
# If we're on darwin, CMake will automatically detect impure paths. This switch
|
||||
# prevents that.
|
||||
++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
|
||||
;
|
||||
|
||||
doCheck = ! shared;
|
||||
|
||||
@ -1,10 +1,21 @@
|
||||
{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gfortran,
|
||||
cmake,
|
||||
python,
|
||||
atlas ? null,
|
||||
shared ? false
|
||||
}:
|
||||
let
|
||||
atlasMaybeShared = atlas.override { inherit shared; };
|
||||
atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
|
||||
else null;
|
||||
usedLibExtension = if shared then ".so" else ".a";
|
||||
inherit (stdenv.lib) optional optionals concatStringsSep;
|
||||
inherit (builtins) hasAttr attrNames;
|
||||
version = "3.4.1";
|
||||
inherit (stdenv.lib) optional;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "liblapack-${version}";
|
||||
src = fetchurl {
|
||||
@ -18,10 +29,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_OPTIMIZED_BLAS=ON"
|
||||
"-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
|
||||
"-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
|
||||
"-DCMAKE_Fortran_FLAGS=-fPIC"
|
||||
]
|
||||
++ (optionals (atlas != null) [
|
||||
"-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
|
||||
"-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
|
||||
])
|
||||
++ (optional shared "-DBUILD_SHARED_LIBS=ON")
|
||||
# If we're on darwin, CMake will automatically detect impure paths. This switch
|
||||
# prevents that.
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
{ fetchurl, stdenv }:
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "v1.1.6";
|
||||
|
||||
name = "utf8proc-${version}";
|
||||
version = "v1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz";
|
||||
sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y";
|
||||
src = fetchFromGitHub {
|
||||
owner = "JuliaLang";
|
||||
repo = "utf8proc";
|
||||
rev = "${version}";
|
||||
sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/lib $out/include
|
||||
cp libutf8proc.so libutf8proc.a $out/lib
|
||||
cp utf8proc.h $out/include
|
||||
make install prefix=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A library for processing UTF-8 encoded Unicode strings";
|
||||
homepage = http://www.public-software-group.org/utf8proc;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
meta = with stdenv.lib; {
|
||||
description = "A clean C library for processing UTF-8 Unicode data";
|
||||
homepage = http://julialang.org/utf8proc;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.ftrvxmtrx ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -563,5 +563,19 @@ let lispPackages = rec {
|
||||
rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6'';
|
||||
};
|
||||
};
|
||||
|
||||
clx-xkeyboard = buildLispPackage rec {
|
||||
baseName = "clx-xkeyboard";
|
||||
version = "git-20150523";
|
||||
description = "CLX support for X Keyboard extensions";
|
||||
deps = [clx];
|
||||
# Source type: git
|
||||
src = pkgs.fetchgit {
|
||||
url = ''https://github.com/filonenko-mikhail/clx-xkeyboard'';
|
||||
sha256 = "11b34da7d354a709a24774032e85a8947be023594f8a333eaff6d4aa79f2b3db";
|
||||
rev = ''11455d36283ef31c498bd58ffebf48c0f6b86ea6'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
in lispPackages
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.6";
|
||||
version = "6.7";
|
||||
name = "checkstyle-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
|
||||
sha256 = "1pniql23f8fsr7yhcxvrc65rdynrwpwl6vxl2jdsj4a37br8mr0d";
|
||||
sha256 = "0na3gfkxzgnnbjvr4sys4x3mb1s1hn9xy9krmvnxqq0wmm4lysjd";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtk-doc-${version}";
|
||||
version = "1.23";
|
||||
version = "1.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
|
||||
sha256 = "1i0q0zaj3f2xg478nxyfhaivkhi6mj0dn0s6qzshzhb625qj6p0b";
|
||||
sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l";
|
||||
};
|
||||
|
||||
# maybe there is a better way to pass the needed dtd and xsl files
|
||||
|
||||
@ -2,16 +2,17 @@
|
||||
, deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal
|
||||
, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty
|
||||
, process, QuickCheck, regex-posix, SHA, split, stdenv, transformers
|
||||
, utf8-string, cartel, nix-prefetch-scripts, makeWrapper
|
||||
, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "cabal2nix";
|
||||
version = "20150525";
|
||||
version = "20150531";
|
||||
src = fetchgit {
|
||||
url = "http://github.com/NixOS/cabal2nix.git";
|
||||
rev = "a7998916868af0d09882468b3e43f5854082860f";
|
||||
sha256 = "07bz2z4ramrs2dmvvf6a82fliq51m61c11vmhkkz31nr09l25k6y";
|
||||
rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187";
|
||||
sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida";
|
||||
deepClone = true;
|
||||
};
|
||||
isExecutable = true;
|
||||
@ -21,6 +22,7 @@ mkDerivation rec {
|
||||
aeson base bytestring Cabal containers deepseq-generics directory
|
||||
filepath hackage-db lens monad-par monad-par-extras mtl pretty
|
||||
process regex-posix SHA split transformers utf8-string cartel
|
||||
optparse-applicative
|
||||
];
|
||||
testDepends = [
|
||||
aeson base bytestring Cabal containers deepseq deepseq-generics
|
||||
@ -35,6 +37,8 @@ mkDerivation rec {
|
||||
install -D $out/bin/cabal2nix $exe
|
||||
rm -rf $out/{bin,lib,share}
|
||||
makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin"
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
$exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix
|
||||
'';
|
||||
homepage = "http://github.com/NixOS/cabal2nix/";
|
||||
description = "Convert Cabal files into Nix build instructions";
|
||||
|
||||
33
pkgs/development/tools/misc/bin_replace_string/default.nix
Normal file
33
pkgs/development/tools/misc/bin_replace_string/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchurl, libelf, txt2man }:
|
||||
|
||||
let version = "0.2"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bin_replace_string-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a";
|
||||
url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "Edit precompiled binaries";
|
||||
longDescription = ''
|
||||
bin_replace_string edits C-style strings in precompiled binaries. This is
|
||||
intended to be useful to replace arbitrary strings in binaries whose
|
||||
source code is not available. However, because of the nature of compiled
|
||||
binaries, bin_replace_string may only replace a given C-string with a
|
||||
shorter C-string.
|
||||
'';
|
||||
homepage = http://ohnopub.net/~ohnobinki/bin_replace_string/;
|
||||
downloadPage = ftp://ohnopub.net/mirror/;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
};
|
||||
|
||||
buildInputs = [ libelf ];
|
||||
nativeBuildInputs = [ txt2man ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''scons install'';
|
||||
|
||||
meta = {
|
||||
licence = stdenv.lib.licenses.mit;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
|
||||
, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }:
|
||||
, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype
|
||||
, gettext
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.4.12";
|
||||
@ -21,12 +23,15 @@ in stdenv.mkDerivation {
|
||||
src = sources.src;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_FREETYPE=1"
|
||||
"-DENABLE_GETTEXT=1"
|
||||
"-DCURL_INCLUDE_DIR=${curl}/include/curl"
|
||||
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp
|
||||
libXxf86vm mesa openal libvorbis x11 sqlite
|
||||
cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa
|
||||
openal libvorbis x11 sqlite luajit freetype gettext
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
licence = stdenv.lib.licenses.unfree;
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, traceDeps ? false}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${program}-${version}";
|
||||
name = "${program}-original-${version}";
|
||||
program = "steam";
|
||||
version = "1.0.0.49";
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/menu.h b/src/menu.h
|
||||
index 3c67c45..7c7ab8e 100644
|
||||
--- a/src/menu.h
|
||||
+++ b/src/menu.h
|
||||
@@ -207,7 +207,7 @@ public:
|
||||
|
||||
bool isToggled(int id);
|
||||
|
||||
- void Menu::get_controlfield_key_into_input(MenuItem *item);
|
||||
+ void get_controlfield_key_into_input(MenuItem *item);
|
||||
|
||||
void draw ();
|
||||
void draw_item(int index, int menu_width, int menu_height);
|
||||
@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
||||
This package currently contains all of the screensavers from the
|
||||
original collection, plus a few others.
|
||||
'';
|
||||
licence = stdenv.lib.licenses.gpl2;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
23
pkgs/misc/talkfilters/default.nix
Normal file
23
pkgs/misc/talkfilters/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
name = "talkfilters";
|
||||
version = "2.3.8";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.hyperrealm.com/${name}/${name}-${version}.tar.gz";
|
||||
sha256 = "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Converts English text into text that mimics a stereotyped or humorous dialect";
|
||||
homepage = "http://http://www.hyperrealm.com/${name}";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -527,12 +527,12 @@ rec {
|
||||
'';
|
||||
};
|
||||
|
||||
wakatime = buildVimPlugin {
|
||||
name = "wakatime-4.0.0";
|
||||
vim-wakatime = buildVimPlugin {
|
||||
name = "vim-wakatime-4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25";
|
||||
rev = "a7d48d3507499b8667bfca0b12f8865c01b26678";
|
||||
sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10";
|
||||
rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
|
||||
repo = "vim-wakatime";
|
||||
owner = "wakatime";
|
||||
};
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "musl-${version}";
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.musl-libc.org/releases/${name}.tar.gz";
|
||||
sha256 = "04vq4a1hm81kbxfcqa30s6xpzbqf3568gbysfxcmb72v8438b4ps";
|
||||
sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
|
||||
--replace "self.cert_dir" "root_prefix + self.cert_dir"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
description = "A multilayer virtual switch";
|
||||
longDescription =
|
||||
@ -60,6 +60,6 @@ in stdenv.mkDerivation rec {
|
||||
to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
|
||||
'';
|
||||
homepage = "http://openvswitch.org/";
|
||||
licence = "Apache 2.0";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
|
||||
|
||||
let version = "v0.8-8-g2499679"; in
|
||||
let version = "2015-05-28"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "radeontop-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "112zf6ms0qpmr9h3l4lg5wik5j206mgij0nypba5lnqzksxh2f88";
|
||||
rev = "2499679fda60c3f6239886296fd2a74155f45f77";
|
||||
sha256 = "0s281fblqbvl7vgaqiwh3s16y0bah3z0i1ssf4mbwl2iayj1cliq";
|
||||
rev = "b9428f18ea4631fdd5f9ccee81570aa7ac472c07";
|
||||
repo = "radeontop";
|
||||
owner = "clbr";
|
||||
};
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace getver.sh --replace ver=unknown ver=${version}
|
||||
substituteInPlace getver.sh --replace ver=unknown ver=${version}-git
|
||||
'';
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
@ -16,11 +16,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v4l-utils-1.6.2";
|
||||
name = "v4l-utils-1.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
|
||||
sha256 = "0zdyjrja2mkqlijpdb4gz1vw0g7pslswmgqqsgri3yq408gypmnk";
|
||||
sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,19 +1,27 @@
|
||||
{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }:
|
||||
{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
|
||||
, file, libtool, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "torque-4.2.8";
|
||||
name = "torque-4.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730";
|
||||
sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j";
|
||||
url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880";
|
||||
sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ];
|
||||
buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool
|
||||
which ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure \
|
||||
--replace '/usr/bin/file' '${file}/bin/file'
|
||||
|
||||
# fix broken libxml2 detection
|
||||
sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure
|
||||
|
||||
for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do
|
||||
substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \
|
||||
--replace "schedprivdir = " "schedprivdir = $out/"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import ./recent.nix
|
||||
{
|
||||
versionMajor = "6";
|
||||
versionMinor = "0.39";
|
||||
sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
|
||||
versionMinor = "0.44";
|
||||
sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa";
|
||||
}
|
||||
|
||||
@ -12,7 +12,11 @@ goPackages.buildGoPackage rec {
|
||||
sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
|
||||
};
|
||||
|
||||
buildInputs = [ goPackages.mesos-stats ];
|
||||
buildInputs = [
|
||||
goPackages.mesos-stats
|
||||
goPackages.prometheus.client_golang
|
||||
goPackages.glog
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Export Mesos metrics to Prometheus";
|
||||
|
||||
@ -30,7 +30,7 @@ let
|
||||
optCoreaudio = if libOnly then null else shouldUsePkg coreaudio;
|
||||
optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
|
||||
optEsound = if libOnly then null else shouldUsePkg esound;
|
||||
optGlib = if libOnly then null else shouldUsePkg glib;
|
||||
optGlib = shouldUsePkg glib;
|
||||
optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3;
|
||||
optGconf = if libOnly then null else shouldUsePkg gconf;
|
||||
optAvahi = if libOnly then null else shouldUsePkg avahi;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchFromGitHub, valgrind }:
|
||||
|
||||
let version = "129"; in
|
||||
let version = "130"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lz4-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0liq5gvnikchgvalpi52hq0npwlh84w94bj79dcbrcw19may5dwi";
|
||||
sha256 = "1050hwnbqyz2m26vayv942dh92689qp73chrbnqlg8awhlb5kyi5";
|
||||
rev = "r${version}";
|
||||
repo = "lz4";
|
||||
owner = "Cyan4973";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
checkFlags = "-j1"; # required since version 128
|
||||
checkFlags = "-j1 -C programs"; # -j1 required since version 128, -C should be temporary
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Extremely fast compression algorithm";
|
||||
|
||||
@ -1 +0,0 @@
|
||||
0.94.nix
|
||||
13
pkgs/tools/filesystems/ceph/dev.nix
Normal file
13
pkgs/tools/filesystems/ceph/dev.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ callPackage, fetchgit, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ceph/ceph.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg";
|
||||
};
|
||||
|
||||
patches = [ ./fix-pgrefdebugging.patch ];
|
||||
})
|
||||
@ -63,13 +63,13 @@ let
|
||||
hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
|
||||
|
||||
hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
|
||||
versionAtLeast version "0.95" &&
|
||||
versionAtLeast version "9.0.0" &&
|
||||
optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
|
||||
|
||||
hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null;
|
||||
hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
|
||||
|
||||
# TODO: Reenable when kinetic support is fixed
|
||||
#hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null;
|
||||
#hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
|
||||
hasKinetic = false;
|
||||
|
||||
# Malloc implementation (can be jemalloc, tcmalloc or null)
|
||||
@ -98,7 +98,8 @@ stdenv.mkDerivation {
|
||||
./0001-Makefile-env-Don-t-force-sbin.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
|
||||
nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
|
||||
++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ];
|
||||
buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
|
||||
boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
|
||||
] ++ optional (versionAtLeast version "9.0.0") [
|
||||
@ -124,6 +125,9 @@ stdenv.mkDerivation {
|
||||
|
||||
# Fix seagate kinetic linking
|
||||
sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
|
||||
'' + optionalString (versionAtLeast version "9.0.0") ''
|
||||
# Fix gmock
|
||||
patchShebangs src/gmock
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
@ -148,44 +152,49 @@ stdenv.mkDerivation {
|
||||
"--libdir=\${lib}/lib"
|
||||
"--includedir=\${lib}/include"
|
||||
|
||||
(mkWith true "rbd" null)
|
||||
(mkWith true "cephfs" null)
|
||||
(mkWith hasRadosgw "radosgw" null)
|
||||
(mkWith true "radosstriper" null)
|
||||
(mkWith hasServer "mon" null)
|
||||
(mkWith hasServer "osd" null)
|
||||
(mkWith hasServer "mds" null)
|
||||
(mkEnable true "client" null)
|
||||
(mkEnable hasServer "server" null)
|
||||
(mkWith (cryptoStr == "cryptopp") "cryptopp" null)
|
||||
(mkWith (cryptoStr == "nss") "nss" null)
|
||||
(mkEnable false "root-make-check" null)
|
||||
(mkWith false "profiler" null)
|
||||
(mkWith false "debug" null)
|
||||
(mkEnable false "coverage" null)
|
||||
(mkWith (optFuse != null) "fuse" null)
|
||||
(mkWith (malloc == optJemalloc) "jemalloc" null)
|
||||
(mkWith (malloc == optGperftools) "tcmalloc" null)
|
||||
(mkEnable false "pgrefdebugging" null)
|
||||
(mkEnable false "cephfs-java" null)
|
||||
(mkEnable hasXio "xio" null)
|
||||
(mkWith (optLibatomic_ops != null) "libatomic-ops" null)
|
||||
(mkWith true "ocf" null)
|
||||
(mkWith hasKinetic "kinetic" null)
|
||||
(mkWith hasRocksdb "librocksdb" null)
|
||||
(mkWith false "librocksdb-static" null)
|
||||
(mkWith (optLibs3 != null) "system-libs3" null)
|
||||
(mkWith true "rest-bench" null)
|
||||
(mkWith true "rbd" null)
|
||||
(mkWith true "cephfs" null)
|
||||
(mkWith hasRadosgw "radosgw" null)
|
||||
(mkWith true "radosstriper" null)
|
||||
(mkWith hasServer "mon" null)
|
||||
(mkWith hasServer "osd" null)
|
||||
(mkWith hasServer "mds" null)
|
||||
(mkEnable true "client" null)
|
||||
(mkEnable hasServer "server" null)
|
||||
(mkWith (cryptoStr == "cryptopp") "cryptopp" null)
|
||||
(mkWith (cryptoStr == "nss") "nss" null)
|
||||
(mkEnable false "root-make-check" null)
|
||||
(mkWith false "profiler" null)
|
||||
(mkWith false "debug" null)
|
||||
(mkEnable false "coverage" null)
|
||||
(mkWith (optFuse != null) "fuse" null)
|
||||
(mkWith (malloc == optJemalloc) "jemalloc" null)
|
||||
(mkWith (malloc == optGperftools) "tcmalloc" null)
|
||||
(mkEnable false "pgrefdebugging" null)
|
||||
(mkEnable false "cephfs-java" null)
|
||||
(mkEnable hasXio "xio" null)
|
||||
(mkWith (optLibatomic_ops != null) "libatomic-ops" null)
|
||||
(mkWith true "ocf" null)
|
||||
(mkWith hasKinetic "kinetic" null)
|
||||
(mkWith hasRocksdb "librocksdb" null)
|
||||
(mkWith false "librocksdb-static" null)
|
||||
(mkWith (optLibs3 != null) "system-libs3" null)
|
||||
(mkWith true "rest-bench" null)
|
||||
] ++ optional stdenv.isLinux [
|
||||
(mkWith (optLibaio != null) "libaio" null)
|
||||
(mkWith (optLibxfs != null) "libxfs" null)
|
||||
(mkWith (optZfs != null) "libzfs" null)
|
||||
(mkWith (optLibaio != null) "libaio" null)
|
||||
(mkWith (optLibxfs != null) "libxfs" null)
|
||||
(mkWith (optZfs != null) "libzfs" null)
|
||||
] ++ optional (versionAtLeast version "10.0.0") [
|
||||
(mkWith true "man-pages" null)
|
||||
(mkWith false "tcmalloc-minimal" null)
|
||||
(mkWith false "valgrind" null)
|
||||
(mkWith true "man-pages" null)
|
||||
(mkWith false "tcmalloc-minimal" null)
|
||||
(mkWith false "valgrind" null)
|
||||
(mkWith true "systemd-libexec-dir" "\${TMPDIR}")
|
||||
];
|
||||
|
||||
preBuild = optionalString (versionAtLeast version "9.0.0") ''
|
||||
(cd src/gmock; make -j $NIX_BUILD_CORES)
|
||||
'';
|
||||
|
||||
installFlags = [ "sysconfdir=\${out}/etc" ];
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ callPackage, fetchgit, git, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2015-04-22";
|
||||
version = "2015-05-29";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ceph/ceph.git";
|
||||
rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
|
||||
sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
|
||||
rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7";
|
||||
sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9";
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{ stdenv, fetchurl, makeWrapper, python, perl, zip
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, python, perl, zip
|
||||
, rtmpdump, nose, mock, pycrypto, substituteAll }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "svtplay-dl-${version}";
|
||||
version = "0.10.2015.03.25";
|
||||
version = "0.10.2015.05.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/spaam/svtplay-dl/archive/${version}.tar.gz";
|
||||
sha256 = "0j0fg3qrldpaf880v488rr2snw6ghpdln4l9mbvmi70rjzzxv4ap";
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5";
|
||||
};
|
||||
|
||||
pythonPaths = [ pycrypto ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user