mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
This commit is contained in:
Tuomas Tynkkynen
commit
34f95d92a2
@ -53,7 +53,7 @@ $ nix-env -qa hello --json
|
||||
"x86_64-linux",
|
||||
"armv5tel-linux",
|
||||
"armv7l-linux",
|
||||
"mips64el-linux",
|
||||
"mips32-linux",
|
||||
"x86_64-darwin",
|
||||
"i686-cygwin",
|
||||
"i686-freebsd",
|
||||
|
||||
@ -23,13 +23,15 @@ rec {
|
||||
config = parse.tripleFromSystem final.parsed;
|
||||
# Just a guess, based on `system`
|
||||
platform = platforms.selectBySystem final.system;
|
||||
# Derived meta-data
|
||||
libc =
|
||||
/**/ if final.isDarwin then "libSystem"
|
||||
else if final.isMinGW then "msvcrt"
|
||||
else if final.isMusl then "musl"
|
||||
else if final.isLinux /* default */ then "glibc"
|
||||
/**/ if final.isDarwin then "libSystem"
|
||||
else if final.isMinGW then "msvcrt"
|
||||
else if final.isMusl then "musl"
|
||||
else if final.isAndroid then "bionic"
|
||||
else if final.isLinux /* default */ then "glibc"
|
||||
# TODO(@Ericson2314) think more about other operating systems
|
||||
else "native/impure";
|
||||
else "native/impure";
|
||||
extensions = {
|
||||
sharedLibrary =
|
||||
/**/ if final.isDarwin then ".dylib"
|
||||
@ -39,7 +41,10 @@ rec {
|
||||
/**/ if final.isWindows then ".exe"
|
||||
else "";
|
||||
};
|
||||
# Misc boolean options
|
||||
useAndroidPrebuilt = false;
|
||||
} // mapAttrs (n: v: v final.parsed) inspect.predicates
|
||||
// args;
|
||||
in final;
|
||||
in assert final.useAndroidPrebuilt -> final.isAndroid;
|
||||
final;
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ let
|
||||
"aarch64-linux"
|
||||
"armv5tel-linux" "armv6l-linux" "armv7l-linux"
|
||||
|
||||
"mips64el-linux"
|
||||
"mipsel-linux"
|
||||
|
||||
"i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
|
||||
|
||||
|
||||
@ -38,6 +38,13 @@ rec {
|
||||
platform = platforms.aarch64-multiplatform;
|
||||
};
|
||||
|
||||
aarch64-android-prebuilt = rec {
|
||||
config = "aarch64-unknown-linux-android";
|
||||
arch = "aarch64";
|
||||
platform = platforms.aarch64-multiplatform;
|
||||
useAndroidPrebuilt = true;
|
||||
};
|
||||
|
||||
scaleway-c1 = armv7l-hf-multiplatform // rec {
|
||||
platform = platforms.scaleway-c1;
|
||||
inherit (platform.gcc) fpu;
|
||||
@ -51,7 +58,7 @@ rec {
|
||||
};
|
||||
|
||||
fuloongminipc = rec {
|
||||
config = "mips64el-unknown-linux-gnu";
|
||||
config = "mipsel-unknown-linux-gnu";
|
||||
arch = "mips";
|
||||
float = "hard";
|
||||
platform = platforms.fuloong2f_n32;
|
||||
|
||||
@ -34,6 +34,7 @@ rec {
|
||||
Cygwin = { kernel = kernels.windows; abi = abis.cygnus; };
|
||||
MinGW = { kernel = kernels.windows; abi = abis.gnu; };
|
||||
|
||||
Android = [ { abi = abis.android; } { abi = abis.androideabi; } ];
|
||||
Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
|
||||
|
||||
Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
|
||||
|
||||
@ -75,7 +75,10 @@ rec {
|
||||
aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
|
||||
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
|
||||
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
|
||||
mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };
|
||||
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
|
||||
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
|
||||
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
|
||||
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
|
||||
powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
|
||||
riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
|
||||
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
|
||||
@ -173,6 +176,7 @@ rec {
|
||||
types.abi = enum (attrValues abis);
|
||||
|
||||
abis = setTypes types.openAbi {
|
||||
android = {};
|
||||
cygnus = {};
|
||||
gnu = {};
|
||||
msvc = {};
|
||||
|
||||
@ -561,6 +561,6 @@ rec {
|
||||
"armv6l-linux" = raspberrypi;
|
||||
"armv7l-linux" = armv7l-hf-multiplatform;
|
||||
"aarch64-linux" = aarch64-multiplatform;
|
||||
"mips64el-linux" = fuloong2f_n32;
|
||||
"mipsel-linux" = fuloong2f_n32;
|
||||
}.${system} or pcBase;
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ in with lib.systems.doubles; lib.runTests {
|
||||
|
||||
arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
|
||||
i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]);
|
||||
mips = assertTrue (mseteq mips [ "mips64el-linux" ]);
|
||||
mips = assertTrue (mseteq mips [ "mipsel-linux" ]);
|
||||
x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]);
|
||||
|
||||
cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
|
||||
@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests {
|
||||
freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]);
|
||||
gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */));
|
||||
illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]);
|
||||
linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]);
|
||||
linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]);
|
||||
netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]);
|
||||
openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]);
|
||||
unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
|
||||
|
||||
30
nixos/modules/hardware/digitalbitbox.nix
Normal file
30
nixos/modules/hardware/digitalbitbox.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.hardware.digitalbitbox;
|
||||
in
|
||||
|
||||
{
|
||||
options.hardware.digitalbitbox = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables udev rules for Digital Bitbox devices.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.digitalbitbox;
|
||||
defaultText = "pkgs.digitalbitbox";
|
||||
description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
@ -31,6 +31,7 @@
|
||||
./hardware/ckb.nix
|
||||
./hardware/cpu/amd-microcode.nix
|
||||
./hardware/cpu/intel-microcode.nix
|
||||
./hardware/digitalbitbox.nix
|
||||
./hardware/sensor/iio.nix
|
||||
./hardware/ksm.nix
|
||||
./hardware/mcelog.nix
|
||||
@ -78,6 +79,7 @@
|
||||
./programs/command-not-found/command-not-found.nix
|
||||
./programs/criu.nix
|
||||
./programs/dconf.nix
|
||||
./programs/digitalbitbox/default.nix
|
||||
./programs/environment.nix
|
||||
./programs/fish.nix
|
||||
./programs/freetds.nix
|
||||
|
||||
39
nixos/modules/programs/digitalbitbox/default.nix
Normal file
39
nixos/modules/programs/digitalbitbox/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.digitalbitbox;
|
||||
in
|
||||
|
||||
{
|
||||
options.programs.digitalbitbox = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Installs the Digital Bitbox application and enables the complementary hardware module.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.digitalbitbox;
|
||||
defaultText = "pkgs.digitalbitbox";
|
||||
description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
hardware.digitalbitbox = {
|
||||
enable = true;
|
||||
package = cfg.package;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
doc = ./doc.xml;
|
||||
maintainers = with stdenv.lib.maintainers; [ vidbina ];
|
||||
};
|
||||
}
|
||||
85
nixos/modules/programs/digitalbitbox/doc.xml
Normal file
85
nixos/modules/programs/digitalbitbox/doc.xml
Normal file
@ -0,0 +1,85 @@
|
||||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
version="5.0"
|
||||
xml:id="module-programs-digitalbitbox">
|
||||
|
||||
<title>Digital Bitbox</title>
|
||||
|
||||
<para>
|
||||
Digital Bitbox is a hardware wallet and second-factor authenticator.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
The <literal>digitalbitbox</literal> programs module may be
|
||||
installed by setting <literal>programs.digitalbitbox</literal>
|
||||
to <literal>true</literal> in a manner similar to
|
||||
|
||||
<programlisting>
|
||||
programs.digitalbitbox.enable = true;
|
||||
</programlisting>
|
||||
|
||||
and bundles the <literal>digitalbitbox</literal> package (see <xref
|
||||
linkend="sec-digitalbitbox-package" />), which contains the
|
||||
<literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries,
|
||||
along with the hardware module (see <xref
|
||||
linkend="sec-digitalbitbox-hardware-module" />) which sets up the
|
||||
necessary udev rules to access the device.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Enabling the digitalbitbox module is pretty much the easiest way to
|
||||
get a Digital Bitbox device working on your system.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
For more information, see
|
||||
<link xlink:href="https://digitalbitbox.com/start_linux" />.
|
||||
</para>
|
||||
|
||||
<section xml:id="sec-digitalbitbox-package">
|
||||
<title>Package</title>
|
||||
|
||||
<para>
|
||||
The binaries, <literal>dbb-app</literal> (a GUI tool) and
|
||||
<literal>dbb-cli</literal> (a CLI tool), are available through the
|
||||
<literal>digitalbitbox</literal> package which could be installed
|
||||
as follows:
|
||||
|
||||
<programlisting>
|
||||
environment.systemPackages = [
|
||||
pkgs.digitalbitbox
|
||||
];
|
||||
</programlisting>
|
||||
</para>
|
||||
</section>
|
||||
|
||||
|
||||
<section xml:id="sec-digitalbitbox-hardware-module">
|
||||
<title>Hardware</title>
|
||||
|
||||
<para>
|
||||
The digitalbitbox hardware package enables the udev rules for
|
||||
Digital Bitbox devices and may be installed as follows:
|
||||
|
||||
<programlisting>
|
||||
hardware.digitalbitbox.enable = true;
|
||||
</programlisting>
|
||||
</para>
|
||||
|
||||
<para>
|
||||
In order to alter the udev rules, one may provide different values for
|
||||
the <literal>udevRule51</literal> and <literal>udevRule52</literal>
|
||||
attributes by means of overriding as follows:
|
||||
|
||||
<programlisting>
|
||||
programs.digitalbitbox = {
|
||||
enable = true;
|
||||
package = pkgs.digitalbitbox.override {
|
||||
udevRule51 = "something else";
|
||||
};
|
||||
};
|
||||
</programlisting>
|
||||
</para>
|
||||
</section>
|
||||
</chapter>
|
||||
@ -28,6 +28,6 @@ in stdenv.mkDerivation rec {
|
||||
description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aacgain-1.9.0";
|
||||
@ -12,7 +12,19 @@ stdenv.mkDerivation {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch = ''
|
||||
(
|
||||
cd mp4v2
|
||||
patch -p0 < ${fetchpatch {
|
||||
name = "fix_missing_ptr_deref.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7";
|
||||
sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9";
|
||||
}}
|
||||
)
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cd mp4v2
|
||||
./configure
|
||||
|
||||
@ -21,9 +33,11 @@ stdenv.mkDerivation {
|
||||
|
||||
cd ..
|
||||
./configure
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd mp4v2
|
||||
make libmp4v2.la
|
||||
|
||||
@ -32,18 +46,18 @@ stdenv.mkDerivation {
|
||||
|
||||
cd ..
|
||||
make
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
strip -s aacgain/aacgain
|
||||
install -vD aacgain/aacgain "$out/bin/aacgain"
|
||||
install -D aacgain/aacgain "$out/bin/aacgain"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "ReplayGain for AAC files";
|
||||
homepage = https://github.com/mulx/aacgain;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.robbinch ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.robbinch ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
name = "meterbridge-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
|
||||
sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k";
|
||||
sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz";
|
||||
};
|
||||
|
||||
patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch];
|
||||
|
||||
@ -1,23 +1,26 @@
|
||||
{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "mopidy-iris-${version}";
|
||||
version = "3.12.4";
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.14.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-Iris";
|
||||
sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87";
|
||||
inherit pname version;
|
||||
sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mopidy
|
||||
mopidy-local-images
|
||||
pythonPackages.configobj
|
||||
pythonPackages.pylast
|
||||
pythonPackages.spotipy
|
||||
pythonPackages.raven
|
||||
];
|
||||
] ++ (with pythonPackages; [
|
||||
configobj
|
||||
pylast
|
||||
spotipy
|
||||
raven
|
||||
]);
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/jaedb/Iris;
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
{ stdenv, fetchurl, pythonPackages, mopidy, glibcLocales }:
|
||||
{ stdenv, pythonPackages, mopidy, glibcLocales }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "mopidy-moped-${version}";
|
||||
version = "0.6.0";
|
||||
pname = "Mopidy-Moped";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz";
|
||||
sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr";
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
buildInputs = [ glibcLocales ];
|
||||
propagatedBuildInputs = [ mopidy ];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchurl, pythonPackages, mopidy }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "mopidy-mopify-${version}";
|
||||
pname = "Mopidy-Mopify";
|
||||
version = "1.6.1";
|
||||
|
||||
version = "1.5.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz";
|
||||
sha256 = "1qi7f5i87ygn486gxc84njl22y84xrwabpz58y5a1hw7z1lp7l8s";
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ mopidy configobj ];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "padthv1-${version}";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
|
||||
sha256 = "0dyrllxgd74nknixjcz6n7m4gw70v246s8z1qss7zfl5yllhb712";
|
||||
sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "pamixer-${version}";
|
||||
version = "1.3";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz";
|
||||
sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx";
|
||||
sha256 = "1lsvb4xk1dq762w9c0jn7xvj3v1lzppql9mj1b55fhzdypbrkm6x";
|
||||
};
|
||||
|
||||
buildInputs = [ boost libpulseaudio ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
|
||||
|
||||
let
|
||||
version = "1.4";
|
||||
version = "1.4.2";
|
||||
pythonPackages = python2Packages;
|
||||
in pythonPackages.buildPythonApplication {
|
||||
name = "picard-${version}";
|
||||
@ -9,7 +9,7 @@ in pythonPackages.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
|
||||
sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6";
|
||||
sha256 = "0d12k40d9fbcn801gp5zdsgvjdrh4g97vda3ga16rmmvfwwfxbgh";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "1gscwybsbaqbnylmgf2baf71cm2g7a0pd11rqmk3cz9hi3lyjric";
|
||||
sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snd-17.8";
|
||||
name = "snd-18.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/${name}.tar.gz";
|
||||
sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf";
|
||||
sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synthv1-${version}";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||
sha256 = "0mvrqk6jy7h2wg442ixwm49w7x15rs4066c2ljrz4kvxlzp5z69i";
|
||||
sha256 = "141ah1gnv5r2k846v5ay15q9q90h01p74240a56vlxqh20z43g92";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
|
||||
|
||||
@ -409,11 +409,11 @@ rec {
|
||||
|
||||
jsonedit = buildEclipsePlugin rec {
|
||||
name = "jsonedit-${version}";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
|
||||
sha256 = "19221409wzcsrlm2fqf6mrxzb5ip1x6y5ba8anw788p7aaz1w30k";
|
||||
sha256 = "0zh9ihvaji2v4d4980va8p1c38x5dn2mcw74qmqkwxlz4nglpsr0";
|
||||
};
|
||||
|
||||
srcPlugins =
|
||||
@ -425,13 +425,13 @@ rec {
|
||||
};
|
||||
in
|
||||
map fetch [
|
||||
{ n = "core"; h = "05ipjbh9yz97zhqaqq6cja3zz44n0dn40ms13qnlgf4bxyaf0f6w"; }
|
||||
{ n = "editor"; h = "1i71rh2fd5hsx6gygnafz2gjz4hlb0ckazxn0maxmnlx4p5apjql"; }
|
||||
{ n = "folding"; h = "13p8vqdna23ln82w1jgchm59375f1ky0p2b1v7jih55yfhw1ymam"; }
|
||||
{ n = "model"; h = "0llswhsd58f0rjb9canjncavq4z7q8zidn26yl5gradbbz580p6w"; }
|
||||
{ n = "outline"; h = "1rs8g0iv2kklbl7j0p6nr26m6ii89yyr9bpi05mh21xva40pzkl5"; }
|
||||
{ n = "preferences"; h = "0vs074ahhiba7if43ryf9m8xd81sqj9grppy0pzcnkkdkbk870n0"; }
|
||||
{ n = "text"; h = "0nqpzjw8hhvh9jlpldpmcmg83a170wjdabgsvjq207j12jkvfiqq"; }
|
||||
{ n = "core"; h = "0zc1jpda6sviazsgvvig8zk2zmz0ac1mch5qs8lbcbdmrpq732ni"; }
|
||||
{ n = "editor"; h = "06k2mx7ka0bn0i8dfbv89jna9kmy8wnlwkg9yp1n1pgqmr01944s"; }
|
||||
{ n = "folding"; h = "1525blyhrl495vz5r98dyfws6kcgnhmyf9qgm5vkplhb27474yca"; }
|
||||
{ n = "model"; h = "0rnnkdl3hrp0sxchfzfad97ya5swsw56wfb5zvjwffbby4vln8fd"; }
|
||||
{ n = "outline"; h = "06bday90a7sdpv4idp69m2831z3r99q248n2avw2npc3gzkfy3kl"; }
|
||||
{ n = "preferences"; h = "1d9pcnq6j5p2smkfldb9dw8gdw5nqlmpcy9kh5n34jcyzf37cdac"; }
|
||||
{ n = "text"; h = "0r3g2qhnhl6misi0rrmw152gw0nb7zlcjy7019qvprn9mhwn1n84"; }
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ antlr-runtime_4_5 ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mg-${version}";
|
||||
version = "20170828";
|
||||
version = "20171014";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
|
||||
sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z";
|
||||
sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vis-${version}";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk";
|
||||
sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k";
|
||||
repo = "vis";
|
||||
owner = "martanne";
|
||||
};
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qgis-2.18.15";
|
||||
name = "qgis-2.18.16";
|
||||
|
||||
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
|
||||
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://qgis.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b";
|
||||
sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9";
|
||||
};
|
||||
|
||||
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
|
||||
|
||||
140
pkgs/applications/misc/digitalbitbox/default.nix
Normal file
140
pkgs/applications/misc/digitalbitbox/default.nix
Normal file
@ -0,0 +1,140 @@
|
||||
{ stdenv
|
||||
, autoreconfHook
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, libevent
|
||||
, libtool
|
||||
, libqrencode
|
||||
, libudev
|
||||
, libusb
|
||||
, makeWrapper
|
||||
, pkgconfig
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtwebsockets
|
||||
, qtmultimedia
|
||||
, udevRule51 ? ''
|
||||
, SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"
|
||||
, ''
|
||||
, udevRule52 ? ''
|
||||
, KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n"
|
||||
, ''
|
||||
, writeText
|
||||
}:
|
||||
|
||||
# Enabling the digitalbitbox program
|
||||
#
|
||||
# programs.digitalbitbox.enable = true;
|
||||
#
|
||||
# will install the digitalbitbox package and enable the corresponding hardware
|
||||
# module and is by far the easiest way to get started with the Digital Bitbox on
|
||||
# NixOS.
|
||||
|
||||
# In case you install the package only, please be aware that you may need to
|
||||
# apply some udev rules to allow the application to identify and access your
|
||||
# wallet. In a nixos-configuration, one may accomplish this by enabling the
|
||||
# digitalbitbox hardware module
|
||||
#
|
||||
# hardware.digitalbitbox.enable = true;
|
||||
#
|
||||
# or by adding the digitalbitbox package to system.udev.packages
|
||||
#
|
||||
# system.udev.packages = [ pkgs.digitalbitbox ];
|
||||
|
||||
# See https://digitalbitbox.com/start_linux for more information.
|
||||
let
|
||||
copyUdevRuleToOutput = name: rule:
|
||||
"cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "digitalbitbox-${version}";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digitalbitbox";
|
||||
repo = "dbb-app";
|
||||
rev = "v${version}";
|
||||
sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with stdenv.lib; [
|
||||
autoreconfHook
|
||||
curl
|
||||
git
|
||||
makeWrapper
|
||||
pkgconfig
|
||||
qttools
|
||||
];
|
||||
|
||||
buildInputs = with stdenv.lib; [
|
||||
libevent
|
||||
libtool
|
||||
libudev
|
||||
libusb
|
||||
libqrencode
|
||||
|
||||
qtbase
|
||||
qtwebsockets
|
||||
qtmultimedia
|
||||
];
|
||||
|
||||
LUPDATE="${qttools.dev}/bin/lupdate";
|
||||
LRELEASE="${qttools.dev}/bin/lrelease";
|
||||
MOC="${qtbase.dev}/bin/moc";
|
||||
QTDIR="${qtbase.dev}";
|
||||
RCC="${qtbase.dev}/bin/rcc";
|
||||
UIC="${qtbase.dev}/bin/uic";
|
||||
|
||||
configureFlags = [
|
||||
"--enable-libusb"
|
||||
];
|
||||
|
||||
hardeningDisable = [
|
||||
"format"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/lib"
|
||||
cp src/libbtc/.libs/*.so* $out/lib
|
||||
cp src/libbtc/src/secp256k1/.libs/*.so* $out/lib
|
||||
cp src/hidapi/libusb/.libs/*.so* $out/lib
|
||||
cp src/univalue/.libs/*.so* $out/lib
|
||||
|
||||
# [RPATH][patchelf] Avoid forbidden reference error
|
||||
rm -rf $PWD
|
||||
|
||||
wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib"
|
||||
wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib"
|
||||
|
||||
# Provide udev rules as documented in https://digitalbitbox.com/start_linux
|
||||
mkdir -p "$out/etc/udev/rules.d"
|
||||
${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51}
|
||||
${copyUdevRuleToOutput "52-hid-digitalbox.rules" udevRule52}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A QT based application for the Digital Bitbox hardware wallet";
|
||||
longDescription = ''
|
||||
Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices.
|
||||
|
||||
This package will only install the dbb-app and dbb-cli, however; in order for these applications to identify and access Digital Bitbox devices, one may want to enable the digitalbitbox hardware module by adding
|
||||
|
||||
hardware.digitalbitbox.enable = true;
|
||||
|
||||
to the configuration which is equivalent to adding this package to the udev.packages list.
|
||||
|
||||
|
||||
The easiest way to use the digitalbitbox package in NixOS is by adding
|
||||
|
||||
programs.digitalbitbox.enable = true;
|
||||
|
||||
to the configuration which installs the package and enables the hardware module.
|
||||
'';
|
||||
homepage = "https://digitalbitbox.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
vidbina
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
35
pkgs/applications/misc/gutenberg/default.nix
Normal file
35
pkgs/applications/misc/gutenberg/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "gutenberg-${version}";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keats";
|
||||
repo = "gutenberg";
|
||||
rev = "v${version}";
|
||||
sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd";
|
||||
};
|
||||
|
||||
cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
|
||||
|
||||
postInstall = ''
|
||||
install -D -m 444 completions/gutenberg.bash \
|
||||
-t $out/share/bash-completion/completions
|
||||
install -D -m 444 completions/_gutenberg \
|
||||
-t $out/share/zsh/site-functions
|
||||
install -D -m 444 completions/gutenberg.fish \
|
||||
-t $out/share/fish/vendor_completions.d
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An opinionated static site generator with everything built-in";
|
||||
homepage = https://www.getgutenberg.io;
|
||||
license = licenses.mit;
|
||||
maintainers = [];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -14,7 +14,7 @@ GEM
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
eventmachine (1.2.5)
|
||||
ffi (1.9.21)
|
||||
ffi (1.9.23)
|
||||
forwardable-extended (2.6.0)
|
||||
gemoji (3.0.0)
|
||||
html-pipeline (2.7.1)
|
||||
@ -23,7 +23,7 @@ GEM
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (3.7.2)
|
||||
jekyll (3.7.3)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
|
||||
@ -53,10 +53,10 @@
|
||||
ffi = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8";
|
||||
sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.21";
|
||||
version = "1.9.23";
|
||||
};
|
||||
forwardable-extended = {
|
||||
source = {
|
||||
@ -104,10 +104,10 @@
|
||||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05f61rqwz1isci7by34zyz38ah2rv5b8i5h618cxcl97hwqps8n2";
|
||||
sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
};
|
||||
jekyll-avatar = {
|
||||
dependencies = ["jekyll"];
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
, withOptionalDependencies ? false
|
||||
}:
|
||||
|
||||
# Bundix:
|
||||
# nix-shell -p bundix zlib
|
||||
bundlerEnv rec {
|
||||
name = pname + "-" + version;
|
||||
pname = "jekyll";
|
||||
|
||||
@ -10,7 +10,7 @@ gem "jemoji"
|
||||
# Optional dependencies:
|
||||
gem "coderay", "~> 1.1.0"
|
||||
gem "jekyll-coffeescript"
|
||||
gem "jekyll-docs"
|
||||
#gem "jekyll-docs"
|
||||
gem "jekyll-feed", "~> 0.9"
|
||||
gem "jekyll-gist"
|
||||
gem "jekyll-paginate"
|
||||
|
||||
@ -25,7 +25,7 @@ GEM
|
||||
faraday (0.14.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
fast-stemmer (1.0.2)
|
||||
ffi (1.9.21)
|
||||
ffi (1.9.23)
|
||||
forwardable-extended (2.6.0)
|
||||
gemoji (3.0.0)
|
||||
html-pipeline (2.7.1)
|
||||
@ -34,7 +34,7 @@ GEM
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (3.7.2)
|
||||
jekyll (3.7.3)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
@ -52,8 +52,6 @@ GEM
|
||||
jekyll-coffeescript (1.1.1)
|
||||
coffee-script (~> 2.2)
|
||||
coffee-script-source (~> 1.11.1)
|
||||
jekyll-docs (3.7.2)
|
||||
jekyll (= 3.7.2)
|
||||
jekyll-feed (0.9.3)
|
||||
jekyll (~> 3.3)
|
||||
jekyll-gist (1.5.0)
|
||||
@ -136,7 +134,6 @@ DEPENDENCIES
|
||||
jekyll
|
||||
jekyll-avatar
|
||||
jekyll-coffeescript
|
||||
jekyll-docs
|
||||
jekyll-feed (~> 0.9)
|
||||
jekyll-gist
|
||||
jekyll-mentions
|
||||
|
||||
@ -112,10 +112,10 @@
|
||||
ffi = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8";
|
||||
sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.21";
|
||||
version = "1.9.23";
|
||||
};
|
||||
forwardable-extended = {
|
||||
source = {
|
||||
@ -163,10 +163,10 @@
|
||||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05f61rqwz1isci7by34zyz38ah2rv5b8i5h618cxcl97hwqps8n2";
|
||||
sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
};
|
||||
jekyll-avatar = {
|
||||
dependencies = ["jekyll"];
|
||||
@ -186,15 +186,6 @@
|
||||
};
|
||||
version = "1.1.1";
|
||||
};
|
||||
jekyll-docs = {
|
||||
dependencies = ["jekyll"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dw8pvxr0q02rivc0n0v4w6151zi6s212xwl27iam6pjc8skbg9b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.7.2";
|
||||
};
|
||||
jekyll-feed = {
|
||||
dependencies = ["jekyll"];
|
||||
source = {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, desktop-file-utils, libSM, imagemagick }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "17.10";
|
||||
version = "17.12";
|
||||
name = "mediainfo-gui-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
|
||||
sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ola-${version}";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenLightingProject";
|
||||
repo = "ola";
|
||||
rev = version;
|
||||
sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al";
|
||||
sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
|
||||
|
||||
@ -13,14 +13,14 @@ let
|
||||
in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "pytrainer";
|
||||
version = "1.11.0";
|
||||
name = "pytrainer-${version}";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytrainer";
|
||||
repo = "pytrainer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy";
|
||||
sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581";
|
||||
};
|
||||
|
||||
namePrefix = "";
|
||||
@ -35,8 +35,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
./pytrainer-webkit.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./setup.py \
|
||||
--replace "'mysqlclient'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
|
||||
dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy sqlalchemy_migrate psycopg2
|
||||
] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
|
||||
|
||||
buildInputs = [ perl gpsbabel sqlite ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py
|
||||
--- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100
|
||||
+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200
|
||||
@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase):
|
||||
diff -Nurp source.orig/pytrainer/test/core/test_activity.py source/pytrainer/test/core/test_activity.py
|
||||
--- source.orig/pytrainer/test/core/test_activity.py 2018-02-27 22:15:32.078243354 +0100
|
||||
+++ source/pytrainer/test/core/test_activity.py 2018-02-27 22:16:33.936867052 +0100
|
||||
@@ -92,7 +92,7 @@ class ActivityTest(unittest.TestCase):
|
||||
self.assertEquals(self.activity.time, self.activity.duration)
|
||||
|
||||
def test_activity_starttime(self):
|
||||
@ -10,10 +10,10 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1
|
||||
|
||||
def test_activity_time_tuple(self):
|
||||
self.assertEquals(self.activity.time_tuple, (2, 3, 46))
|
||||
diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py
|
||||
--- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100
|
||||
+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200
|
||||
@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase)
|
||||
diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrainer/test/imports/test_garmintcxv2.py
|
||||
--- source.orig/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:15:32.079243364 +0100
|
||||
+++ source/pytrainer/test/imports/test_garmintcxv2.py 2018-02-27 22:17:10.778333751 +0100
|
||||
@@ -39,7 +39,7 @@ class GarminTCXv2Test(unittest.TestCase)
|
||||
self.fail()
|
||||
|
||||
def test_workout_summary(self):
|
||||
@ -22,9 +22,18 @@ diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrai
|
||||
try:
|
||||
current_path = os.path.dirname(os.path.abspath(__file__))
|
||||
data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
|
||||
diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py
|
||||
--- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100
|
||||
+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200
|
||||
@@ -52,7 +52,7 @@ class GarminTCXv2Test(unittest.TestCase)
|
||||
self.fail()
|
||||
|
||||
def test_summary_in_database(self):
|
||||
- summary = [(0, True, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
|
||||
+ summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
|
||||
activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1')
|
||||
self.ddbb.session.add(activity)
|
||||
self.ddbb.session.commit()
|
||||
diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py
|
||||
--- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100
|
||||
+++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100
|
||||
@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
|
||||
def test_getDateTime(self):
|
||||
utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
|
||||
|
||||
@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null;
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "ranger-${version}";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranger";
|
||||
repo = "ranger";
|
||||
rev = "v${version}";
|
||||
sha256= "0h3qz0sr21390xdshhlfisvscja33slv1plzcisg1wrdgwgyr5j6";
|
||||
sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj";
|
||||
};
|
||||
|
||||
checkInputs = with pythonPackages; [ pytest ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sakura-${version}";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
|
||||
sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04";
|
||||
sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkgconfig ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils
|
||||
, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
|
||||
, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor-icon-theme, adwaita-icon-theme }:
|
||||
, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spacefm-${version}";
|
||||
@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
rm -f $out/etc/spacefm/spacefm.conf
|
||||
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
|
||||
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
gtk3 udev desktop-file-utils shared-mime-info intltool
|
||||
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
|
||||
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2
|
||||
] ++ (if ifuseSupport then [ ifuse ] else []);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
# Revert when libplist builds again…
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.15";
|
||||
version = "1.4.17";
|
||||
name = "tnef-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "verdammelt";
|
||||
repo = "tnef";
|
||||
rev = version;
|
||||
sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj";
|
||||
sha256 = "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "translate-shell";
|
||||
version = "0.9.4";
|
||||
version = "0.9.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soimort";
|
||||
repo = "translate-shell";
|
||||
rev = "v" + version;
|
||||
sha256 = "166zhic3k4z37vc8p1fnhc4xx7i7q0j30nr324frmp1mrnwrdib8";
|
||||
sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase" "postFixup" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "worker-${version}";
|
||||
version = "3.8.5";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
|
||||
sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
|
||||
sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.9.8.2";
|
||||
version = "2.9.11.1";
|
||||
name = "snort-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
|
||||
sha256 = "0cwk02jan0vw6r3jl3vrf31vfp7i4c1r4yhb42h4gyhd6lnh2xa0";
|
||||
sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, pidgin } :
|
||||
|
||||
let
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pidgin-xmpp-receipts-${version}";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "noonien-d";
|
||||
repo = "pidgin-xmpp-receipts";
|
||||
rev = "release_${version}";
|
||||
sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm";
|
||||
sha256 = "13kwaymzkymjsdv8q95byd173i4vanj211vgx9cm0y8ag2r3cjsb";
|
||||
};
|
||||
|
||||
buildInputs = [ pidgin ];
|
||||
|
||||
@ -1,22 +1,50 @@
|
||||
{ fetchurl, stdenv, jre }:
|
||||
{ fetchurl, stdenv, jre, makeWrapper, coreutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jmeter-3.3";
|
||||
name = "jmeter-${version}";
|
||||
version = "4.0";
|
||||
src = fetchurl {
|
||||
url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
|
||||
sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5";
|
||||
sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4";
|
||||
};
|
||||
|
||||
buildInputs = [ jre ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS"
|
||||
substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS"
|
||||
mkdir $out
|
||||
cp ./* $out/ -R
|
||||
|
||||
rm bin/*.bat bin/*.cmd
|
||||
|
||||
cp -R * $out/
|
||||
|
||||
substituteInPlace $out/bin/create-rmi-keystore.sh --replace \
|
||||
"keytool -genkey" \
|
||||
"${jre}/lib/openjdk/jre/bin/keytool -genkey"
|
||||
|
||||
# Prefix some scripts with jmeter to avoid clobbering the namespace
|
||||
for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do
|
||||
mv $out/bin/$i $out/bin/jmeter-$i
|
||||
wrapProgram $out/bin/jmeter-$i \
|
||||
--prefix PATH : "${jre}/bin"
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/jmeter --set JAVA_HOME "${jre}"
|
||||
wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
doInstallCheck = true;
|
||||
|
||||
checkInputs = [ coreutils ];
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/jmeter --version 2>&1 | grep -q "${version}"
|
||||
$out/bin/jmeter-heapdump.sh > /dev/null
|
||||
$out/bin/jmeter-shutdown.sh > /dev/null
|
||||
$out/bin/jmeter-stoptest.sh > /dev/null
|
||||
timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance";
|
||||
longDescription = ''
|
||||
The Apache JMeter desktop application is open source software, a 100%
|
||||
@ -24,9 +52,9 @@ stdenv.mkDerivation rec {
|
||||
measure performance. It was originally designed for testing Web
|
||||
Applications but has since expanded to other test functions.
|
||||
'';
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.garbas ];
|
||||
priority = 1;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tribler";
|
||||
name = "${pname}-${version}";
|
||||
version = "7.0.0-rc3";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
|
||||
sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7";
|
||||
sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pjsip-${version}";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
|
||||
sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
|
||||
sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl libsamplerate alsaLib ];
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools
|
||||
{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools
|
||||
, seafile-shared, ccnet, makeWrapper
|
||||
, withShibboleth ? true, qtwebengine }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.1.0";
|
||||
version = "6.1.5";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
|
||||
sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ahz55cw2p3s78x5f77drz4h2jhknfzpkk83qd0ggma31q1pnpl9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
|
||||
@ -4,10 +4,10 @@ with stdenv.lib;
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "tryton-${version}";
|
||||
version = "4.2.1";
|
||||
version = "4.6.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/t/tryton/${name}.tar.gz";
|
||||
sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm";
|
||||
sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9";
|
||||
};
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
chardet
|
||||
|
||||
@ -5,10 +5,10 @@ with stdenv.lib;
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "trytond-${version}";
|
||||
version = "4.2.1";
|
||||
version = "4.6.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/t/trytond/${name}.tar.gz";
|
||||
sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7";
|
||||
sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda";
|
||||
};
|
||||
|
||||
# Tells the tests which database to use
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "tudu-${version}";
|
||||
version = "0.10";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.meskio.net/tudu/${name}.tar.gz";
|
||||
sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4";
|
||||
sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "picard-tools-${version}";
|
||||
version = "2.17.4";
|
||||
version = "2.17.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "00ffi8kkrlh72vjjkjpgi8zys3r9hkdk4xi82kcahch8pix4qzf2";
|
||||
sha256 = "0lf9appcs66mxmirzbys09xhq38kpa4ldxwwzrr9y2cklnxjn4hg";
|
||||
};
|
||||
|
||||
buildInputs = [ jre makeWrapper ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "verilator-${version}";
|
||||
version = "3.900";
|
||||
version = "3.920";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.veripool.org/ftp/${name}.tgz";
|
||||
sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b";
|
||||
sha256 = "1zs3d6h5sbz455fwpgg89h81hkfn92ary8bmhjinc1rd8fm3hp1b";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "pari-${version}";
|
||||
version = "2.9.3";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
|
||||
sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
|
||||
sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wxmaxima-${version}";
|
||||
version = "17.10.1";
|
||||
version = "18.02.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrejv";
|
||||
repo = "wxmaxima";
|
||||
rev = "Version-${version}";
|
||||
sha256 = "088h8dlc9chkppwl4ck9i0fgf2d1dcpi5kq8qbpr5w75vhwsb6qm";
|
||||
sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
|
||||
};
|
||||
|
||||
buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
assert stdenv.system != "powerpc-linux";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ver = "1.23.5";
|
||||
ver = "1.23.7";
|
||||
name = "recoll-${ver}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
|
||||
sha256 = "0ps7ckrv63ydviqkqxs57hn04z53s2jnjnp94n1prs63xx0njswv";
|
||||
sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn";
|
||||
};
|
||||
|
||||
configureFlags = [ "--with-inotify" ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, ruby, makeWrapper, git }:
|
||||
|
||||
let
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "svn2git-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
|
||||
sha256 = "1484mpcabqf9kr6xdpdgb1npkqav1bcah3w5lxj2djjx4bjf2g3y";
|
||||
sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transcrypt-${version}";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elasticdog";
|
||||
repo = "transcrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc";
|
||||
sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz";
|
||||
};
|
||||
|
||||
buildInputs = [ git makeWrapper openssl ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "peru-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildinspace";
|
||||
repo = "peru";
|
||||
rev = "${version}";
|
||||
sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8";
|
||||
sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ pyyaml docopt ];
|
||||
|
||||
@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
|
||||
# but they are linked against GPL'd softwares
|
||||
# - so the resulting program will be GPL
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
|
||||
, docutils, perl, pkgconfig, python3, which, ffmpeg
|
||||
, freefont_ttf, freetype, libass, libpthreadstubs
|
||||
, lua, lua5_sockets, libuchardet, libiconv ? null, darwin
|
||||
, lua, luasocket, libuchardet, libiconv ? null, darwin
|
||||
|
||||
, x11Support ? true,
|
||||
mesa ? null,
|
||||
@ -13,25 +13,25 @@
|
||||
wayland ? null,
|
||||
libxkbcommon ? null
|
||||
|
||||
, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null
|
||||
, rubberbandSupport ? true, rubberband ? null
|
||||
, xineramaSupport ? true, libXinerama ? null
|
||||
, xvSupport ? true, libXv ? null
|
||||
, sdl2Support ? true, SDL2 ? null
|
||||
, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, screenSaverSupport ? true, libXScrnSaver ? null
|
||||
, vdpauSupport ? true, libvdpau ? null
|
||||
, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null
|
||||
, dvdnavSupport ? dvdreadSupport, libdvdnav ? null
|
||||
, dvdreadSupport ? true, libdvdread ? null
|
||||
, dvdnavSupport ? true, libdvdnav ? null
|
||||
, bluraySupport ? true, libbluray ? null
|
||||
, speexSupport ? true, speex ? null
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
|
||||
, pulseSupport ? true, libpulseaudio ? null
|
||||
, bs2bSupport ? true, libbs2b ? null
|
||||
, cacaSupport ? true, libcaca ? null
|
||||
, libpngSupport ? true, libpng ? null
|
||||
, youtubeSupport ? true, youtube-dl ? null
|
||||
, vaapiSupport ? true, libva ? null
|
||||
, drmSupport ? !stdenv.isDarwin, libdrm ? null
|
||||
, drmSupport ? true, libdrm ? null
|
||||
, vapoursynthSupport ? false, vapoursynth ? null
|
||||
, archiveSupport ? false, libarchive ? null
|
||||
, jackaudioSupport ? false, libjack2 ? null
|
||||
@ -127,14 +127,15 @@ in stdenv.mkDerivation rec {
|
||||
python3 ${waf} configure --prefix=$out $configureFlags
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ];
|
||||
nativeBuildInputs = [
|
||||
docutils makeWrapper perl
|
||||
pkgconfig python3 which
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg freetype libass libpthreadstubs
|
||||
lua lua5_sockets libuchardet
|
||||
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
libiconv Cocoa CoreAudio ])
|
||||
++ optional alsaSupport alsaLib
|
||||
lua luasocket libuchardet
|
||||
] ++ optional alsaSupport alsaLib
|
||||
++ optional xvSupport libXv
|
||||
++ optional theoraSupport libtheora
|
||||
++ optional xineramaSupport libXinerama
|
||||
@ -157,7 +158,10 @@ in stdenv.mkDerivation rec {
|
||||
++ optional archiveSupport libarchive
|
||||
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
|
||||
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
|
||||
++ optionals waylandSupport [ wayland libxkbcommon ];
|
||||
++ optionals waylandSupport [ wayland libxkbcommon ]
|
||||
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
libiconv Cocoa CoreAudio
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -165,7 +169,14 @@ in stdenv.mkDerivation rec {
|
||||
python3 ${waf} build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
installPhase =
|
||||
let
|
||||
getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" +
|
||||
"${luasocket}/share/lua/${lua.luaversion}/?.${type}";
|
||||
luaPath = getPath "lua";
|
||||
luaCPath = getPath "so";
|
||||
in
|
||||
''
|
||||
python3 ${waf} install
|
||||
|
||||
# Use a standard font
|
||||
@ -174,6 +185,8 @@ in stdenv.mkDerivation rec {
|
||||
# Ensure youtube-dl is available in $PATH for MPV
|
||||
wrapProgram $out/bin/mpv \
|
||||
--add-flags "--scripts=${concatStringsSep "," scripts}" \
|
||||
--prefix LUA_PATH : "${luaPath}" \
|
||||
--prefix LUA_CPATH : "${luaCPath}" \
|
||||
'' + optionalString youtubeSupport ''
|
||||
--prefix PATH : "${youtube-dl}/bin" \
|
||||
'' + optionalString vapoursynthSupport ''
|
||||
@ -199,5 +212,3 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
};
|
||||
}
|
||||
# TODO: investigate caca support
|
||||
# TODO: investigate lua5_sockets bug
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "openshot-qt-${version}";
|
||||
version = "2.3.4";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenShot";
|
||||
repo = "openshot-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z";
|
||||
sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ doxygen wrapGAppsHook ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "peek-${version}";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phw";
|
||||
repo = "peek";
|
||||
rev = version;
|
||||
sha256 = "04sc6gfrqvnx288rmgsywpjx9l6jcfn2qdbwjcbdvx4wl3gna0qm";
|
||||
sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];
|
||||
|
||||
60
pkgs/applications/video/screenkey/default.nix
Normal file
60
pkgs/applications/video/screenkey/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, substituteAll
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, distutils_extra
|
||||
, setuptools-git
|
||||
, intltool
|
||||
, pygtk
|
||||
, libX11
|
||||
, libXtst
|
||||
, wrapGAppsHook
|
||||
, defaultIconTheme
|
||||
, hicolor_icon_theme
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "screenkey";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wavexx";
|
||||
repo = "screenkey";
|
||||
rev = "screenkey-${version}";
|
||||
sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
inherit libX11 libXtst;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
distutils_extra
|
||||
setuptools-git
|
||||
intltool
|
||||
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
defaultIconTheme
|
||||
hicolor_icon_theme
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pygtk
|
||||
];
|
||||
|
||||
# screenkey does not have any tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://www.thregr.org/~wavexx/software/screenkey/;
|
||||
description = "A screencast tool to display your keys inspired by Screenflick";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.rasendubi ];
|
||||
};
|
||||
}
|
||||
20
pkgs/applications/video/screenkey/paths.patch
Normal file
20
pkgs/applications/video/screenkey/paths.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- a/Screenkey/xlib.py
|
||||
+++ b/Screenkey/xlib.py
|
||||
@@ -6,7 +6,7 @@
|
||||
from ctypes import *
|
||||
|
||||
## base X11
|
||||
-libX11 = CDLL('libX11.so.6')
|
||||
+libX11 = CDLL('@libX11@/lib/libX11.so.6')
|
||||
|
||||
# types
|
||||
Atom = c_ulong
|
||||
@@ -278,7 +278,7 @@
|
||||
|
||||
|
||||
## record extensions
|
||||
-libXtst = CDLL('libXtst.so.6')
|
||||
+libXtst = CDLL('@libXtst@/lib/libXtst.so.6')
|
||||
|
||||
# types
|
||||
XPointer = String
|
||||
@ -198,13 +198,13 @@ rec {
|
||||
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
|
||||
|
||||
docker_17_12 = dockerGen rec {
|
||||
version = "17.12.0-ce";
|
||||
rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit
|
||||
sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps";
|
||||
runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f";
|
||||
runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l";
|
||||
containerdRev = "89623f28b87a6004d4b785663257362d1658a729";
|
||||
containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma";
|
||||
version = "17.12.1-ce";
|
||||
rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
|
||||
sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
|
||||
runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
|
||||
runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
|
||||
containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
|
||||
containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
|
||||
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
|
||||
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }:
|
||||
|
||||
let cairocffi-xcffib = python27Packages.cairocffi.override {
|
||||
pythonPath = [ python27Packages.xcffib ];
|
||||
withXcffib = true;
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ let
|
||||
else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3"
|
||||
else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1"
|
||||
else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1"
|
||||
else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1"
|
||||
else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1"
|
||||
else if targetPlatform.isDarwin then "/usr/lib/dyld"
|
||||
else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
|
||||
else null;
|
||||
@ -172,13 +172,20 @@ stdenv.mkDerivation {
|
||||
else if targetPlatform.isWindows then "pe"
|
||||
else "elf" + toString targetPlatform.parsed.cpu.bits;
|
||||
endianPrefix = if targetPlatform.isBigEndian then "big" else "little";
|
||||
sep = optionalString (!targetPlatform.isMips) "-";
|
||||
arch =
|
||||
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
|
||||
else if targetPlatform.isArm then endianPrefix + "arm"
|
||||
else if targetPlatform.isx86_64 then "x86-64"
|
||||
else if targetPlatform.isi686 then "i386"
|
||||
else if targetPlatform.isMips then {
|
||||
"mips" = "btsmipn32"; # n32 variant
|
||||
"mipsel" = "ltsmipn32"; # n32 variant
|
||||
"mips64" = "btsmip";
|
||||
"mips64el" = "ltsmip";
|
||||
}.${targetPlatform.parsed.cpu.name}
|
||||
else throw "unknown emulation for platform: " + targetPlatform.config;
|
||||
in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch);
|
||||
in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
|
||||
|
||||
depsTargetTargetPropagated = extraPackages;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "man-pages-${version}";
|
||||
version = "4.14";
|
||||
version = "4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
|
||||
sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih";
|
||||
sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f";
|
||||
};
|
||||
|
||||
makeFlags = [ "MANDIR=$(out)/share/man" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.204";
|
||||
version = "1.205";
|
||||
in fetchzip {
|
||||
name = "fira-code-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in fetchzip {
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad";
|
||||
sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/tonsky/FiraCode;
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }:
|
||||
|
||||
let
|
||||
name = "media-player-info-22";
|
||||
name = "media-player-info-23";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz";
|
||||
sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy";
|
||||
url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz";
|
||||
sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9";
|
||||
};
|
||||
|
||||
buildInputs = [ udev systemd ];
|
||||
@ -25,7 +25,7 @@ in
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A repository of data files describing media player capabilities";
|
||||
homepage = http://www.freedesktop.org/wiki/Software/media-player-info/;
|
||||
homepage = https://www.freedesktop.org/wiki/Software/media-player-info/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
platforms = with platforms; linux;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
options = rec {
|
||||
/* TODO: there are also MacOS, FreeBSD and Windows versions */
|
||||
/* TODO: there are also FreeBSD and Windows versions */
|
||||
x86_64-linux = {
|
||||
arch = "linuxx86";
|
||||
sha256 = "0hs1f3z7crgzvinpj990kv9gvbsipxvcvwbmk54n51nasvc5025q";
|
||||
@ -21,6 +21,18 @@ let
|
||||
runtime = "armcl";
|
||||
kernel = "linuxarm";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwinx86";
|
||||
sha256 = "5adbea3d8b4a2e29af30d141f781c6613844f468c0ccfa11bae908c3e9641939";
|
||||
runtime = "dx86cl64";
|
||||
kernel = "darwinx8664";
|
||||
};
|
||||
i686-darwin = {
|
||||
arch = "darwinx86";
|
||||
sha256 = x86_64-darwin.sha256;
|
||||
runtime = "dx86cl";
|
||||
kernel = "darwinx8632";
|
||||
};
|
||||
armv6l-linux = armv7l-linux;
|
||||
};
|
||||
cfg = options.${stdenv.system};
|
||||
@ -37,12 +49,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = cfg.sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ gcc glibc m4 ];
|
||||
buildInputs = if stdenv.isDarwin then [ m4 ] else [ gcc glibc m4 ];
|
||||
|
||||
CCL_RUNTIME = cfg.runtime;
|
||||
CCL_KERNEL = cfg.kernel;
|
||||
|
||||
postPatch = ''
|
||||
postPatch = if stdenv.isDarwin then ''
|
||||
substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
|
||||
--replace "M4 = gm4" "M4 = m4" \
|
||||
--replace "dtrace" "/usr/sbin/dtrace" \
|
||||
--replace "mig" "/usr/bin/mig" \
|
||||
--replace "/bin/rm" "${coreutils}/bin/rm" \
|
||||
--replace "/bin/echo" "${coreutils}/bin/echo"
|
||||
|
||||
substituteInPlace lisp-kernel/m4macros.m4 \
|
||||
--replace "/bin/pwd" "${coreutils}/bin/pwd"
|
||||
'' else ''
|
||||
substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
|
||||
--replace "/bin/rm" "${coreutils}/bin/rm" \
|
||||
--replace "/bin/echo" "${coreutils}/bin/echo"
|
||||
@ -63,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
cp -r . "$out/share/ccl-installation"
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}"
|
||||
echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}"
|
||||
chmod a+x "$out"/bin/"${CCL_RUNTIME}"
|
||||
ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl
|
||||
'';
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gambit-bootstrap-${version}";
|
||||
version = "4.8.8";
|
||||
tarball_version = "v4_8_8";
|
||||
version = "4.8.9";
|
||||
tarball_version = "v4_8_9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz";
|
||||
sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz";
|
||||
sha256 = "b7f86c794711792ca556ce41f8bc7043dffc395c01bb6d8d119bc2f454f89fbf";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gambit-${version}";
|
||||
version = "4.8.8-435-gd1991ba7";
|
||||
version = "4.8.9";
|
||||
bootstrap = import ./bootstrap.nix ( pkgs );
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/feeley/gambit.git";
|
||||
rev = "d1991ba7e90ed0149964320f7cafa1a8289e61f0";
|
||||
sha256 = "02harwcsqxxcxgn2yc1y9kyxdp32mampyvnbxrzg2jzfmnp5g6cm";
|
||||
rev = "dd54a71dfc0bd09813592f1645d755867a02195d";
|
||||
sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc";
|
||||
};
|
||||
|
||||
# Use makeStaticLibraries to enable creation of statically linked binaries
|
||||
|
||||
@ -317,8 +317,8 @@ stdenv.mkDerivation ({
|
||||
|
||||
# Platform-specific flags
|
||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
||||
# Trick that should be taken out once we have a mips64el-linux not loongson2f
|
||||
optional (targetPlatform == hostPlatform && stdenv.system == "mips64el-linux") "--with-arch=loongson2f"
|
||||
# Trick that should be taken out once we have a mipsel-linux not loongson2f
|
||||
optional (targetPlatform == hostPlatform && stdenv.system == "mipsel-linux") "--with-arch=loongson2f"
|
||||
;
|
||||
|
||||
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gerbil-${version}";
|
||||
|
||||
version = "0.12-DEV-1404-g0a266db";
|
||||
version = "0.12-RELEASE";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/vyzo/gerbil.git";
|
||||
rev = "0a266db5e2e241272711bc150cc2607204bf2b78";
|
||||
sha256 = "1lvawqn8havfyxkkgfqffc213zq2pgm179l42yj49fy3fhpzia4m";
|
||||
rev = "5618892d7939e1cb4ef5247912e0bc1ec99f6b52";
|
||||
sha256 = "0b2valahf5k81r4sp6y12d44fb286p92s7k6dphij0kmvg0dp818";
|
||||
};
|
||||
|
||||
# Use makeStaticLibraries to enable creation of statically linked binaries
|
||||
|
||||
206
pkgs/development/compilers/graalvm/default.nix
Normal file
206
pkgs/development/compilers/graalvm/default.nix
Normal file
@ -0,0 +1,206 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
|
||||
|
||||
let
|
||||
# pre-download some cache entries ('mx' will not be able to download under nixbld1)
|
||||
makeMxCache = list:
|
||||
stdenv.mkDerivation {
|
||||
name = "mx-cache";
|
||||
buildCommand = ''
|
||||
mkdir $out
|
||||
${lib.concatMapStrings ({url, name, sha1}: ''
|
||||
ln -s ${fetchurl { inherit url sha1; }} $out/${name}
|
||||
echo -n ${sha1} > $out/${name}.sha1
|
||||
'') list}
|
||||
'';
|
||||
};
|
||||
|
||||
jvmci8-mxcache = [
|
||||
rec { sha1 = "66215826a684eb6866d4c14a5a4f9c344f1d1eef"; name = "JACOCOCORE_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9.jar; }
|
||||
rec { sha1 = "a365ee459836b2aa18028929923923d15f0c3af9"; name = "JACOCOCORE.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.7.9/org.jacoco.core-0.7.9-sources.jar; }
|
||||
rec { sha1 = "8a7f78fdf2a4e58762890d8e896a9298c2980c10"; name = "JACOCOREPORT_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9.jar; }
|
||||
rec { sha1 = "e6703ef288523a8e63fa756d8adeaa70858d41b0"; name = "JACOCOREPORT.sources_${sha1}.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.7.9/org.jacoco.report-0.7.9-sources.jar; }
|
||||
rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; }
|
||||
rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; }
|
||||
rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; }
|
||||
rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; }
|
||||
rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar"; url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; }
|
||||
rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; }
|
||||
rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; }
|
||||
rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; }
|
||||
rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; }
|
||||
rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; }
|
||||
rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; }
|
||||
rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; }
|
||||
rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3-sources.jar; }
|
||||
rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}.so"; url = https://lafo.ssw.uni-linz.ac.at/pub/hsdis/intel/hsdis-amd64-linux-0d031013db9a80d6c88330c42c983fbfa7053193.so; }
|
||||
];
|
||||
|
||||
graal-mxcache = jvmci8-mxcache ++ [
|
||||
rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; }
|
||||
rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; }
|
||||
rec { sha1 = "aca5eb39e2a12fddd6c472b240afe9ebea3a6733"; name = "org.json_${sha1}.jar"; url = mirror://maven/org/json/json/20160810/json-20160810.jar; }
|
||||
rec { sha1 = "fdedd5f2522122102f0b3db85fe7aa563a009926"; name = "JLINE_${sha1}.jar"; url = mirror://maven/jline/jline/2.14.5/jline-2.14.5.jar; }
|
||||
rec { sha1 = "476d9a44cd19d6b55f81571077dfa972a4f8a083"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-allocation-instrumenter/java-allocation-instrumenter-8f0db117e64e.jar; }
|
||||
rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-5.0.4.jar; }
|
||||
rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/asm-tree-5.0.4.jar; }
|
||||
rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
|
||||
rec { sha1 = "616a4fca49c5d610a3354e78cd97e7627024bb66"; name = "GSON_SHADOWED_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4.jar; }
|
||||
rec { sha1 = "b13337a4ffd095c2e27ea401dc6edfca0d23a6e4"; name = "GSON_SHADOWED.sources_${sha1}.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/gson-shadowed-2.2.4-sources.jar; }
|
||||
];
|
||||
|
||||
in rec {
|
||||
|
||||
mx = stdenv.mkDerivation {
|
||||
name = "mx";
|
||||
src = fetchFromGitHub {
|
||||
owner = "graalvm";
|
||||
repo = "mx";
|
||||
rev = "22557cf7ec417c49aca20c13a9123045005d72d0"; # HEAD at 2018-02-16
|
||||
sha256 = "070647ih2qzcssj7yripbg1w9bjwi1rcp1blx5z3jbp1shrr6563";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildPhase = ''
|
||||
substituteInPlace mx --replace /bin/pwd pwd
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -dpR * $out/bin
|
||||
wrapProgram $out/bin/mx --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]}
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/graalvm/mx;
|
||||
description = "Command-line tool used for the development of Graal projects";
|
||||
license = licenses.unfree;
|
||||
platforms = python27.meta.platforms;
|
||||
};
|
||||
};
|
||||
|
||||
# copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
|
||||
jvmci8 = stdenv.mkDerivation rec {
|
||||
version = "0.41";
|
||||
name = let
|
||||
n = "jvmci8u161-${version}";
|
||||
in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
|
||||
n
|
||||
else
|
||||
throw "length of string `${n}' must be equal to the length of `${oraclejdk8.name}'";
|
||||
src = fetchFromGitHub {
|
||||
owner = "graalvm";
|
||||
repo = "graal-jvmci-8";
|
||||
rev = "jvmci-${version}";
|
||||
sha256 = "0pajf114l8lzczfdzz968c3s1ardiy4q5ya8p2kmwxl06giy95qr";
|
||||
};
|
||||
buildInputs = [ mx mercurial ];
|
||||
postUnpack = ''
|
||||
# a fake mercurial dir to prevent mx crash and supply the version to mx
|
||||
( cd $sourceRoot
|
||||
hg init
|
||||
hg add
|
||||
hg commit -m 'dummy commit'
|
||||
hg tag ${lib.escapeShellArg src.rev}
|
||||
hg checkout ${lib.escapeShellArg src.rev}
|
||||
)
|
||||
'';
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=format-overflow" # newly detected by gcc7
|
||||
];
|
||||
buildPhase = ''
|
||||
cp -dpR ${oraclejdk8} writable-copy-of-jdk
|
||||
chmod +w -R writable-copy-of-jdk
|
||||
|
||||
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
|
||||
export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
|
||||
mx --java-home $(pwd)/writable-copy-of-jdk build
|
||||
'';
|
||||
installPhase = ''
|
||||
mv jdk1.8.0_*/linux-amd64/product $out
|
||||
find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \;
|
||||
'';
|
||||
dontStrip = true; # why? see in oraclejdk derivation
|
||||
inherit (oraclejdk8) meta;
|
||||
};
|
||||
|
||||
graalvm8 = stdenv.mkDerivation rec {
|
||||
version = "0.31";
|
||||
name = let
|
||||
n = "graal-vm-8-${version}";
|
||||
in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
|
||||
n
|
||||
else
|
||||
throw "length of string `${n}' must be equal to the length of `${jvmci8.name}'";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "graal";
|
||||
rev = "vm-enterprise-${version}";
|
||||
sha256 = "0rhd6dk2jpbxgdprqvdk991b2k177jrjgyjabdnmv5lzlhczy676";
|
||||
};
|
||||
buildInputs = [ mx zlib mercurial jvmci8 ];
|
||||
postUnpack = ''
|
||||
# a fake mercurial dir to prevent mx crash and supply the version to mx
|
||||
( cd $sourceRoot
|
||||
hg init
|
||||
hg add
|
||||
hg commit -m 'dummy commit'
|
||||
hg tag ${lib.escapeShellArg src.rev}
|
||||
hg checkout ${lib.escapeShellArg src.rev}
|
||||
)
|
||||
'';
|
||||
buildPhase = ''
|
||||
# make a copy of jvmci8
|
||||
cp -dpR ${jvmci8} $out
|
||||
chmod +w -R $out
|
||||
find $out -type f -exec sed -i "s#${jvmci8}#$out#g" {} \;
|
||||
|
||||
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
|
||||
export MX_CACHE_DIR=${makeMxCache graal-mxcache}
|
||||
( cd substratevm; mx --java-home $out build --no-daemon )
|
||||
'';
|
||||
installPhase = ''
|
||||
# add graal files
|
||||
mkdir -p $out/jre/tools/{profiler,chromeinspector}
|
||||
cp -pR substratevm/svmbuild/native-image-root/linux-amd64/bin/* $out/jre/bin/
|
||||
cp -pLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks
|
||||
cp -pLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/
|
||||
cp -pR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/
|
||||
cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/
|
||||
cp -pR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/
|
||||
echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties
|
||||
ln -s --relative $out/jre/bin/native-image $out/bin/native-image
|
||||
cp $out/jre/tools/nfi/bin/libtrufflenfi.so $out/jre/lib/amd64/
|
||||
cp -dpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/
|
||||
|
||||
# BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
|
||||
substituteInPlace $out/jre/lib/security/java.security \
|
||||
--replace file:/dev/random file:/dev/./urandom \
|
||||
--replace NativePRNGBlocking SHA1PRNG
|
||||
'';
|
||||
dontStrip = true; # why? see in oraclejdk derivation
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
echo ${lib.escapeShellArg ''
|
||||
public class HelloWorld {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World");
|
||||
}
|
||||
}
|
||||
''} > HelloWorld.java
|
||||
$out/bin/javac HelloWorld.java
|
||||
|
||||
# run on JVM with Graal Compiler
|
||||
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld
|
||||
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
|
||||
|
||||
# Ahead-Of-Time compilation
|
||||
$out/bin/native-image -no-server HelloWorld
|
||||
./helloworld
|
||||
./helloworld | fgrep 'Hello World'
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/oracle/graal;
|
||||
description = "High-Performance Polyglot VM";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ volth ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -42,16 +42,6 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
|
||||
# Distribution/Simple/CCompiler.hs:64:10: error:
|
||||
# • No instance for (Semigroup CDialect)
|
||||
# arising from the superclasses of an instance declaration
|
||||
# • In the instance declaration for ‘Monoid CDialect’
|
||||
# |
|
||||
# 64 | instance Monoid CDialect where
|
||||
# | ^^^^^^^^^^^^^^^
|
||||
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal;
|
||||
|
||||
## Shadowed:
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
@ -66,7 +56,7 @@ self: super: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
##
|
||||
## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory))
|
||||
## uncaught exception: IOException of type NoSuchThing (cabal: rawSystem: runInteractiveProcess: exec: does not exist (No such file or directory))
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
@ -77,6 +67,8 @@ self: super: {
|
||||
free = super.free_5;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=3 && <4.11
|
||||
## Needed for (<>) in prelude
|
||||
funcmp = super.funcmp_1_9;
|
||||
|
||||
@ -107,9 +99,8 @@ self: super: {
|
||||
});
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## breaks hspec:
|
||||
## Setup: Encountered missing dependencies:
|
||||
## hspec-discover ==2.4.7
|
||||
## hspec-discover ==2.4.8
|
||||
hspec-discover = super.hspec-discover_2_4_8;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
@ -117,9 +108,6 @@ self: super: {
|
||||
## free ==4.*, template-haskell >=2.4 && <2.13
|
||||
lens = super.lens_4_16;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
QuickCheck = super.QuickCheck_2_11_3;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## doctest >=0.11.1 && <0.14
|
||||
@ -575,6 +563,13 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
cabal2nix = super.cabal2nix.override {
|
||||
## • No instance for (Semigroup (List a))
|
||||
## arising from the 'deriving' clause of a data type declaration
|
||||
## Possible fix:
|
||||
hpack = self.hpack;
|
||||
};
|
||||
|
||||
cabal-doctest = overrideCabal super.cabal-doctest (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## Cabal >=1.10 && <2.1, base >=4.3 && <4.11
|
||||
@ -588,6 +583,8 @@ self: super: {
|
||||
});
|
||||
|
||||
deepseq-generics = overrideCabal super.deepseq-generics (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
## https://github.com/haskell-hvr/deepseq-generics/pull/4
|
||||
jailbreak = true;
|
||||
});
|
||||
@ -635,6 +632,14 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
jailbreak-cabal = super.jailbreak-cabal.override {
|
||||
## • No instance for (Semigroup CDialect)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid CDialect’
|
||||
## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
|
||||
Cabal = self.Cabal;
|
||||
};
|
||||
|
||||
kan-extensions = overrideCabal super.kan-extensions (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## free ==4.*
|
||||
@ -671,13 +676,6 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
## Issue: https://github.com/pcapriotti/optparse-applicative/issues/288
|
||||
optparse-applicative = overrideCabal super.optparse-applicative (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.8 && <2.11
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
@ -704,7 +702,7 @@ self: super: {
|
||||
|
||||
tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.8 && <4.11, tasty ==0.11.*
|
||||
## base >=4.8 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
@ -731,12 +729,6 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
th-abstraction = overrideCabal super.th-abstraction (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## template-haskell >=2.5 && <2.13
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
these = overrideCabal super.these (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
|
||||
@ -1,61 +1,52 @@
|
||||
{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
|
||||
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "52.2.1gnome1";
|
||||
let
|
||||
version = "52.6.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "spidermonkey-${version}";
|
||||
|
||||
# the release notes point to some guys home directory, see
|
||||
# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
|
||||
# probably it would be more ideal to pull a particular tag/revision
|
||||
# from the mercurial repo
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz";
|
||||
sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i";
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q";
|
||||
};
|
||||
|
||||
buildInputs = [ readline icu zlib nspr ];
|
||||
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
patches = [
|
||||
# needed to build gnome3.gjs
|
||||
(fetchpatch {
|
||||
name = "mozjs52-disable-mozglue.patch";
|
||||
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be;
|
||||
sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CXXFLAGS="-fpermissive"
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON="${python2.interpreter}"
|
||||
|
||||
cd js/src
|
||||
|
||||
autoconf
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-threadsafe"
|
||||
"--with-system-nspr"
|
||||
"--with-system-zlib"
|
||||
"--with-system-icu"
|
||||
"--with-intl-api"
|
||||
"--enable-readline"
|
||||
|
||||
# enabling these because they're wanted by 0ad. They may or may
|
||||
# not be good defaults for other uses.
|
||||
"--enable-gcgenerational"
|
||||
"--enable-shared-js"
|
||||
];
|
||||
|
||||
# This addresses some build system bug. It's quite likely to be safe
|
||||
# to re-enable parallel builds if the source revision changes.
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postFixup = ''
|
||||
# The headers are symlinks to a directory that doesn't get put
|
||||
# into $out, so they end up broken. Fix that by just resolving the
|
||||
# symlinks.
|
||||
for i in $(find $out -type l); do
|
||||
cp --remove-destination "$(readlink "$i")" "$i";
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = https://developer.mozilla.org/en/SpiderMonkey;
|
||||
# TODO: MPL/GPL/LGPL tri-license.
|
||||
|
||||
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
|
||||
maintainers = [ maintainers.abbradar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glm-0.9.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip";
|
||||
sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/include"
|
||||
cp -r glm "$out/include"
|
||||
|
||||
mkdir -p "$doc/share/doc/glm"
|
||||
cp -r doc/* "$doc/share/doc/glm"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "OpenGL Mathematics library for C++";
|
||||
longDescription = ''
|
||||
OpenGL Mathematics (GLM) is a header only C++ mathematics library for
|
||||
graphics software based on the OpenGL Shading Language (GLSL)
|
||||
specification and released under the MIT license.
|
||||
'';
|
||||
homepage = http://glm.g-truc.net/;
|
||||
license = licenses.mit;
|
||||
branch = "0.9.5.4";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jsoncpp-${version}";
|
||||
version = "1.8.0";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-source-parsers";
|
||||
repo = "jsoncpp";
|
||||
rev = version;
|
||||
sha256 = "1lg22zrjnl10x1bw0wfz72xd2kfbzynyggk8vdwd89mp1g8xjl9d";
|
||||
sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
|
||||
};
|
||||
|
||||
/* During darwin bootstrap, we have a cp that doesn't understand the
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib }:
|
||||
|
||||
let
|
||||
ver_maj = "0.6";
|
||||
ver_min = "8";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgee-${ver_maj}.${ver_min}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6";
|
||||
};
|
||||
|
||||
buildInputs = [ glib ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
homepage = http://live.gnome.org/Libgee;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib }:
|
||||
|
||||
let
|
||||
ver_maj = "0.8";
|
||||
ver_min = "6";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgee-${ver_maj}.${ver_min}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg";
|
||||
};
|
||||
|
||||
buildInputs = [ glib ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
homepage = http://live.gnome.org/Libgee;
|
||||
maintainers = with maintainers; [ sternenseemann ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
{ fetchurl, stdenv, lib
|
||||
, buildPlatform, hostPlatform
|
||||
, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
|
||||
}:
|
||||
|
||||
# assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross
|
||||
@ -19,8 +20,8 @@ stdenv.mkDerivation rec {
|
||||
sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
lib.optional stdenv.isFreeBSD "--with-pic";
|
||||
configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"
|
||||
++ lib.optional enableStatic "--enable-static";
|
||||
|
||||
meta = {
|
||||
description = "An iconv(3) implementation";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
|
||||
|
||||
let name = "menu-cache-1.0.2";
|
||||
let name = "menu-cache-1.1.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lxde/${name}.tar.xz";
|
||||
sha256 = "1m8j40npykfcfqs43kc0fmksal2jfmfi8lnb3mq3xy1lvvrfv0vg";
|
||||
sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, cmake, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.0";
|
||||
version = "1.1.2";
|
||||
name = "nanomsg-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanomsg";
|
||||
repo = "nanomsg";
|
||||
rev = version;
|
||||
sha256 = "1iqlmvz5k8m4srb120g3kfkmm1w2p16hyxmx2asvihd21j285fmw";
|
||||
sha256 = "1zvs91afsg61azfv5fldv84gnhf76w3yndkdvpvaprlacxbxdvf5";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
, abiVersion
|
||||
, mouseSupport ? false
|
||||
, unicode ? true
|
||||
, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
|
||||
, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
|
||||
|
||||
, gpm
|
||||
|
||||
@ -30,6 +32,8 @@ stdenv.mkDerivation rec {
|
||||
"--enable-pc-files"
|
||||
"--enable-symlinks"
|
||||
] ++ lib.optional unicode "--enable-widec"
|
||||
++ lib.optional enableStatic "--enable-static"
|
||||
++ lib.optional (!withCxx) "--without-cxx"
|
||||
++ lib.optional (abiVersion == "5") "--with-abi-version=5";
|
||||
|
||||
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencollada-${version}";
|
||||
|
||||
version = "1.6.59";
|
||||
version = "1.6.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCOLLADA";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gpjvzcfyilb96x5ywajxgkw42ipwp4my36z9cq686bd9vpp3q0g";
|
||||
sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
name = "opencsg-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
|
||||
sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c";
|
||||
sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
|
||||
};
|
||||
|
||||
buildInputs = [mesa freeglut glew libXmu libXext libX11];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pythia-${version}";
|
||||
version = "8.219";
|
||||
version = "8.226";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
|
||||
sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy";
|
||||
sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g";
|
||||
};
|
||||
|
||||
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "thepeg-${version}";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
|
||||
sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71";
|
||||
sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va";
|
||||
};
|
||||
|
||||
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
|
||||
, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xlibs
|
||||
, sbc, SDL2
|
||||
, sbc, SDL2, makeFontsConf, freefont_ttf
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "pipewire-${version}";
|
||||
|
||||
@ -12,7 +16,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "PipeWire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
sha256 = "1nim8d1lsf6yxk97piwmsz686w84b09lk6cagbyjr9m3k2hwybqn";
|
||||
sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
@ -34,8 +38,9 @@ in stdenv.mkDerivation rec {
|
||||
"-Denable_gstreamer=true"
|
||||
];
|
||||
|
||||
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "meson test";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Server and user space API to deal with multimedia pipelines";
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "poco-${version}";
|
||||
|
||||
version = "1.7.8";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
|
||||
sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf";
|
||||
sha256 = "1pg48kk0354vsc6j2wnrk893l5xcsr3bjmkgykd3harcnvfqs7l8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qca-qt5-2.1.1";
|
||||
name = "qca-qt5-2.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz";
|
||||
sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm";
|
||||
url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz";
|
||||
sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl qtbase ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user