Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
cff0669a48
@ -140,8 +140,8 @@ self: super:
|
||||
<section xml:id="sec-overlays-alternatives">
|
||||
<title>Using overlays to configure alternatives</title>
|
||||
<para>
|
||||
Certain software has different implementations of the same
|
||||
interface. Other distributions have functionality to switch
|
||||
Certain software packages have different implementations of the
|
||||
same interface. Other distributions have functionality to switch
|
||||
between these. For example, Debian provides <link
|
||||
xlink:href="https://wiki.debian.org/DebianAlternatives">DebianAlternatives</link>.
|
||||
Nixpkgs has what we call <literal>alternatives</literal>, which
|
||||
@ -160,8 +160,9 @@ self: super:
|
||||
</para>
|
||||
<para>
|
||||
The Nixpkgs attribute is <literal>openblas</literal> for
|
||||
ILP64 and <literal>openblasCompat</literal> for LP64. This
|
||||
is the default.
|
||||
ILP64 (integer width = 64 bits) and
|
||||
<literal>openblasCompat</literal> for LP64 (integer width =
|
||||
32 bits). <literal>openblasCompat</literal> is the default.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
@ -190,8 +191,15 @@ self: super:
|
||||
#83888</link>, we are able to override the ‘blas’ and ‘lapack’
|
||||
packages to use different implementations, through the
|
||||
‘blasProvider’ and ‘lapackProvider’ argument. This can be used
|
||||
to select a different provider. For example, an overlay can be
|
||||
created that looks like:
|
||||
to select a different provider. BLAS providers will have
|
||||
symlinks in <literal>$out/lib/libblas.so.3</literal> and
|
||||
<literal>$out/lib/libcblas.so.3</literal> to their respective
|
||||
BLAS libraries. Likewise, LAPACK providers will have symlinks
|
||||
in <literal>$out/lib/liblapack.so.3</literal> and
|
||||
<literal>$out/lib/liblapacke.so.3</literal> to their respective
|
||||
LAPCK libraries. For example, Intel MKL is both a BLAS and
|
||||
LAPACK provider. An overlay can be created to use Intel MKL
|
||||
that looks like:
|
||||
</para>
|
||||
<programlisting>
|
||||
self: super:
|
||||
@ -208,9 +216,12 @@ self: super:
|
||||
<para>
|
||||
This overlay uses Intel’s MKL library for both BLAS and LAPACK
|
||||
interfaces. Note that the same can be accomplished at runtime
|
||||
using <literal>LD_PRELOAD</literal> of libblas.so.3 and
|
||||
liblapack.so.3.
|
||||
using <literal>LD_LIBRARY_PATH</literal> of libblas.so.3 and
|
||||
liblapack.so.3. For instance:
|
||||
</para>
|
||||
<programlisting>
|
||||
$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave
|
||||
</programlisting>
|
||||
<para>
|
||||
Intel MKL requires an <literal>openmp</literal> implementation
|
||||
when running with multiple processors. By default,
|
||||
@ -221,8 +232,8 @@ self: super:
|
||||
set it with <literal>LD_PRELOAD</literal>. Note that
|
||||
<literal>mkl</literal> is only available on
|
||||
<literal>x86_64-linux</literal> and
|
||||
<literal>x86_64-darwin</literal>. Moreover, Hydra is not build
|
||||
and distributing pre-compiled binaries using it.
|
||||
<literal>x86_64-darwin</literal>. Moreover, Hydra is not
|
||||
building and distributing pre-compiled binaries using it.
|
||||
</para>
|
||||
<para>
|
||||
For BLAS/LAPACK switching to work correctly, all packages must
|
||||
|
||||
@ -6738,6 +6738,12 @@
|
||||
githubId = 2347889;
|
||||
name = "Sauyon Lee";
|
||||
};
|
||||
savannidgerinel = {
|
||||
email = "savanni@luminescent-dreams.com";
|
||||
github = "savannidgerinel";
|
||||
githubId = 8534888;
|
||||
name = "Savanni D'Gerinel";
|
||||
};
|
||||
sb0 = {
|
||||
email = "sb@m-labs.hk";
|
||||
github = "sbourdeauducq";
|
||||
|
||||
@ -442,7 +442,7 @@ in
|
||||
Whether this NixOS machine is a lightweight container running
|
||||
in another NixOS system. If set to true, support for nested
|
||||
containers is disabled by default, but can be reenabled by
|
||||
setting <config>boot.enableContainers</config> to true.
|
||||
setting <option>boot.enableContainers</option> to true.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ./make-test.nix {
|
||||
import ./make-test-python.nix {
|
||||
name = "systemd-confinement";
|
||||
|
||||
machine = { pkgs, lib, ... }: let
|
||||
@ -17,7 +17,7 @@ import ./make-test.nix {
|
||||
exit "''${ret:-1}"
|
||||
'';
|
||||
|
||||
mkTestStep = num: { description, config ? {}, testScript }: {
|
||||
mkTestStep = num: { config ? {}, testScript }: {
|
||||
systemd.sockets."test${toString num}" = {
|
||||
description = "Socket for Test Service ${toString num}";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
@ -34,52 +34,48 @@ import ./make-test.nix {
|
||||
};
|
||||
} // removeAttrs config [ "confinement" "serviceConfig" ];
|
||||
|
||||
__testSteps = lib.mkOrder num ''
|
||||
subtest '${lib.escape ["\\" "'"] description}', sub {
|
||||
$machine->succeed('echo ${toString num} > /teststep');
|
||||
${testScript}
|
||||
};
|
||||
'';
|
||||
__testSteps = lib.mkOrder num (''
|
||||
machine.succeed("echo ${toString num} > /teststep")
|
||||
'' + testScript);
|
||||
};
|
||||
|
||||
in {
|
||||
imports = lib.imap1 mkTestStep [
|
||||
{ description = "chroot-only confinement";
|
||||
config.confinement.mode = "chroot-only";
|
||||
{ config.confinement.mode = "chroot-only";
|
||||
testScript = ''
|
||||
$machine->succeed(
|
||||
'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix',
|
||||
'test "$(chroot-exec id -u)" = 0',
|
||||
'chroot-exec chown 65534 /bin',
|
||||
);
|
||||
with subtest("chroot-only confinement"):
|
||||
machine.succeed(
|
||||
'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix',
|
||||
'test "$(chroot-exec id -u)" = 0',
|
||||
"chroot-exec chown 65534 /bin",
|
||||
)
|
||||
'';
|
||||
}
|
||||
{ description = "full confinement with APIVFS";
|
||||
testScript = ''
|
||||
$machine->fail(
|
||||
'chroot-exec ls -l /etc',
|
||||
'chroot-exec ls -l /run',
|
||||
'chroot-exec chown 65534 /bin',
|
||||
);
|
||||
$machine->succeed(
|
||||
'test "$(chroot-exec id -u)" = 0',
|
||||
'chroot-exec chown 0 /bin',
|
||||
);
|
||||
{ testScript = ''
|
||||
with subtest("full confinement with APIVFS"):
|
||||
machine.fail(
|
||||
"chroot-exec ls -l /etc",
|
||||
"chroot-exec ls -l /run",
|
||||
"chroot-exec chown 65534 /bin",
|
||||
)
|
||||
machine.succeed(
|
||||
'test "$(chroot-exec id -u)" = 0', "chroot-exec chown 0 /bin",
|
||||
)
|
||||
'';
|
||||
}
|
||||
{ description = "check existence of bind-mounted /etc";
|
||||
config.serviceConfig.BindReadOnlyPaths = [ "/etc" ];
|
||||
{ config.serviceConfig.BindReadOnlyPaths = [ "/etc" ];
|
||||
testScript = ''
|
||||
$machine->succeed('test -n "$(chroot-exec cat /etc/passwd)"');
|
||||
with subtest("check existence of bind-mounted /etc"):
|
||||
machine.succeed('test -n "$(chroot-exec cat /etc/passwd)"')
|
||||
'';
|
||||
}
|
||||
{ description = "check if User/Group really runs as non-root";
|
||||
config.serviceConfig.User = "chroot-testuser";
|
||||
{ config.serviceConfig.User = "chroot-testuser";
|
||||
config.serviceConfig.Group = "chroot-testgroup";
|
||||
testScript = ''
|
||||
$machine->succeed('chroot-exec ls -l /dev');
|
||||
$machine->succeed('test "$(chroot-exec id -u)" != 0');
|
||||
$machine->fail('chroot-exec touch /bin/test');
|
||||
with subtest("check if User/Group really runs as non-root"):
|
||||
machine.succeed("chroot-exec ls -l /dev")
|
||||
machine.succeed('test "$(chroot-exec id -u)" != 0')
|
||||
machine.fail("chroot-exec touch /bin/test")
|
||||
'';
|
||||
}
|
||||
(let
|
||||
@ -87,62 +83,60 @@ import ./make-test.nix {
|
||||
target = pkgs.writeText "symlink-target" "got me\n";
|
||||
} "ln -s \"$target\" \"$out\"";
|
||||
in {
|
||||
description = "check if symlinks are properly bind-mounted";
|
||||
config.confinement.packages = lib.singleton symlink;
|
||||
testScript = ''
|
||||
$machine->fail('chroot-exec test -e /etc');
|
||||
$machine->succeed('chroot-exec cat ${symlink} >&2');
|
||||
$machine->succeed('test "$(chroot-exec cat ${symlink})" = "got me"');
|
||||
with subtest("check if symlinks are properly bind-mounted"):
|
||||
machine.fail("chroot-exec test -e /etc")
|
||||
machine.succeed(
|
||||
"chroot-exec cat ${symlink} >&2",
|
||||
'test "$(chroot-exec cat ${symlink})" = "got me"',
|
||||
)
|
||||
'';
|
||||
})
|
||||
{ description = "check if StateDirectory works";
|
||||
config.serviceConfig.User = "chroot-testuser";
|
||||
{ config.serviceConfig.User = "chroot-testuser";
|
||||
config.serviceConfig.Group = "chroot-testgroup";
|
||||
config.serviceConfig.StateDirectory = "testme";
|
||||
testScript = ''
|
||||
$machine->succeed('chroot-exec touch /tmp/canary');
|
||||
$machine->succeed('chroot-exec "echo works > /var/lib/testme/foo"');
|
||||
$machine->succeed('test "$(< /var/lib/testme/foo)" = works');
|
||||
$machine->succeed('test ! -e /tmp/canary');
|
||||
with subtest("check if StateDirectory works"):
|
||||
machine.succeed("chroot-exec touch /tmp/canary")
|
||||
machine.succeed('chroot-exec "echo works > /var/lib/testme/foo"')
|
||||
machine.succeed('test "$(< /var/lib/testme/foo)" = works')
|
||||
machine.succeed("test ! -e /tmp/canary")
|
||||
'';
|
||||
}
|
||||
{ description = "check if /bin/sh works";
|
||||
{ testScript = ''
|
||||
with subtest("check if /bin/sh works"):
|
||||
machine.succeed(
|
||||
"chroot-exec test -e /bin/sh",
|
||||
'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar',
|
||||
)
|
||||
'';
|
||||
}
|
||||
{ config.confinement.binSh = null;
|
||||
testScript = ''
|
||||
$machine->succeed(
|
||||
'chroot-exec test -e /bin/sh',
|
||||
'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar',
|
||||
);
|
||||
with subtest("check if suppressing /bin/sh works"):
|
||||
machine.succeed("chroot-exec test ! -e /bin/sh")
|
||||
machine.succeed('test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo')
|
||||
'';
|
||||
}
|
||||
{ description = "check if suppressing /bin/sh works";
|
||||
config.confinement.binSh = null;
|
||||
{ config.confinement.binSh = "${pkgs.hello}/bin/hello";
|
||||
testScript = ''
|
||||
$machine->succeed(
|
||||
'chroot-exec test ! -e /bin/sh',
|
||||
'test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo',
|
||||
);
|
||||
with subtest("check if we can set /bin/sh to something different"):
|
||||
machine.succeed("chroot-exec test -e /bin/sh")
|
||||
machine.succeed('test "$(chroot-exec /bin/sh -g foo)" = foo')
|
||||
'';
|
||||
}
|
||||
{ description = "check if we can set /bin/sh to something different";
|
||||
config.confinement.binSh = "${pkgs.hello}/bin/hello";
|
||||
{ config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n";
|
||||
testScript = ''
|
||||
$machine->succeed(
|
||||
'chroot-exec test -e /bin/sh',
|
||||
'test "$(chroot-exec /bin/sh -g foo)" = foo',
|
||||
);
|
||||
with subtest("check if only Exec* dependencies are included"):
|
||||
machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek')
|
||||
'';
|
||||
}
|
||||
{ description = "check if only Exec* dependencies are included";
|
||||
config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n";
|
||||
testScript = ''
|
||||
$machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek');
|
||||
'';
|
||||
}
|
||||
{ description = "check if all unit dependencies are included";
|
||||
config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n";
|
||||
{ config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n";
|
||||
config.confinement.fullUnit = true;
|
||||
testScript = ''
|
||||
$machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek');
|
||||
with subtest("check if all unit dependencies are included"):
|
||||
machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek')
|
||||
'';
|
||||
}
|
||||
];
|
||||
@ -162,7 +156,6 @@ import ./make-test.nix {
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
$machine->waitForUnit('multi-user.target');
|
||||
${nodes.machine.config.__testSteps}
|
||||
'';
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
'' + nodes.machine.config.__testSteps;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
|
||||
|
||||
let
|
||||
|
||||
@ -26,7 +26,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in mkDerivation rec {
|
||||
pname = "dfasma";
|
||||
version = "1.4.5";
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
mkDerivation {
|
||||
pname = "iannix";
|
||||
version = "2016-01-31";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig
|
||||
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig
|
||||
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
|
||||
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
mkDerivation {
|
||||
pname = "traverso";
|
||||
version = "0.49.6";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, qmake, qtbase, qtwebkit }:
|
||||
{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "mindforger";
|
||||
version = "1.48.2";
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
|
||||
{ mkDerivation, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
|
||||
, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
|
||||
, qca-qt5, shared-mime-info }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "okteta";
|
||||
version = "0.26.3";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }:
|
||||
{ mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }:
|
||||
|
||||
|
||||
let
|
||||
@ -11,7 +11,7 @@ let
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
qtnproperty = stdenv.mkDerivation {
|
||||
qtnproperty = mkDerivation {
|
||||
name = "qtnproperty";
|
||||
inherit src;
|
||||
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
|
||||
@ -22,7 +22,7 @@ let
|
||||
install -D bin-linux/QtnPEG $out/bin/QtnPEG
|
||||
'';
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
in mkDerivation {
|
||||
pname = "awesomebump";
|
||||
inherit version;
|
||||
|
||||
@ -30,12 +30,13 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ qtbase qtscript qtdeclarative ];
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper ];
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
preBuild = ''
|
||||
ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
postInstall = ''
|
||||
d=$out/libexec/AwesomeBump
|
||||
|
||||
@ -44,7 +45,7 @@ in stdenv.mkDerivation {
|
||||
cp -prd Bin/Configs Bin/Core $d/
|
||||
|
||||
# AwesomeBump expects to find Core and Configs in its current directory.
|
||||
makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
|
||||
makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \
|
||||
--run "cd $d"
|
||||
'';
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "phototonic";
|
||||
version = "2.1";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "qcomicbook";
|
||||
version = "0.9.1";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
|
||||
{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
|
||||
let
|
||||
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
|
||||
# license: Free for commercial use
|
||||
@ -7,7 +7,7 @@ let
|
||||
sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "write_stylus";
|
||||
version = "209";
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
|
||||
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
|
||||
, qtbase, qttools, qtsvg, qtwebkit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
|
||||
version = "2.11.2";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "candle";
|
||||
version = "1.1";
|
||||
|
||||
|
||||
43
pkgs/applications/misc/fitnesstrax/default.nix
Normal file
43
pkgs/applications/misc/fitnesstrax/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ fetchFromGitHub
|
||||
, glib
|
||||
, gtk3
|
||||
, lib
|
||||
, rustPlatform
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fitnesstrax";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luminescent-dreams";
|
||||
repo = "fitnesstrax";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1k6zhnbs0ggx7q0ig2abcnzprsgrychlpvsh6d36dw6mr8zpfkp7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
];
|
||||
|
||||
cargoSha256 = "1xgyyxd2kz21xan0pk7rbxiym90s7m2qrzg2ddilcszva60bxdd9";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/glib-2.0/schemas
|
||||
cp -r $src/share/* $out/share/
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Privacy-first fitness tracking";
|
||||
homepage = "https://github.com/luminescent-dreams/fitnesstrax";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ savannidgerinel ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
mkDerivation {
|
||||
name = "openbrf-unstable-2016-01-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
{ mkDerivation
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, qtbase
|
||||
, qtsvg
|
||||
@ -7,7 +8,7 @@
|
||||
, tesseract
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
mkDerivation {
|
||||
pname = "qt-box-editor";
|
||||
version = "unstable-2019-07-12";
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchhg
|
||||
{ mkDerivation, stdenv, fetchhg
|
||||
, qmake, qttools
|
||||
, qtbase, qtsvg, qtxmlpatterns
|
||||
, poppler_utils
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "valentina";
|
||||
version = "0.6.1";
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, pkgconfig, makeDesktopItem
|
||||
{ mkDerivation, stdenv, fetchurl, pkgconfig, makeDesktopItem
|
||||
, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
|
||||
, openssl, protobuf, qmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "ricochet";
|
||||
version = "1.1.4";
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, pkgconfig, qttools, scons
|
||||
{ mkDerivation, stdenv, fetchurl, pkgconfig, qttools, scons
|
||||
, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
|
||||
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "swift-im";
|
||||
version = "4.0.2";
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
|
||||
{ mkDerivation, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
|
||||
|
||||
# we now have libqmatrixclient so a future version of tensor that supports it
|
||||
# should use that
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "tensor-git";
|
||||
version = "2017-02-21";
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tixati";
|
||||
version = "2.67";
|
||||
version = "2.72";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
|
||||
sha256 = "0510wkwmwrlv61958zd5nsc4lr0l0lka3jf4pq3dyiyfsf4k20rq";
|
||||
sha256 = "04si7xwbpvljdbngmzlfvkn51wih3aqcb5g6r76wdh3pfpppskhr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,6 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, meson, ninja, pkgconfig, desktop-file-utils
|
||||
, python3, vala, wrapGAppsHook
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, desktop-file-utils
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, evolution-data-server
|
||||
, libical
|
||||
, libgee
|
||||
@ -63,8 +69,15 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# the theme is hardcoded
|
||||
--prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Task and project manager designed to elementary OS";
|
||||
description = "Task manager with Todoist support designed for GNU/Linux 🚀️";
|
||||
homepage = "https://planner-todo.web.app";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "caneda";
|
||||
version = "0.3.1";
|
||||
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "0.6.4";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8";
|
||||
sha256 = "054mag8jgxkvx2f95ha10n45v4xv5lms69w76g95z18m62qhjcyl";
|
||||
};
|
||||
|
||||
modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1";
|
||||
modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags=-X github.com/cli/cli/command.Version=${version}"
|
||||
"-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/gh" ];
|
||||
|
||||
@ -1,23 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }:
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-gone";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunaryorn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
|
||||
sha256 = "0zc4cb1dg30np5yc4ymkr894qs2bk0r123i302md00niayk4njyd";
|
||||
};
|
||||
|
||||
cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33";
|
||||
cargoSha256 = "1d892889ml7sqyxzmjipq5fvizb4abqhmmn450qm7yam9fn5q5wf";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage git-gone.1
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}"
|
||||
'';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ config, stdenv, fetchFromGitHub
|
||||
{ mkDerivation, config, stdenv, fetchFromGitHub
|
||||
, fetchpatch, pkgconfig, perl, python, which
|
||||
, libX11, libxcb, libGLU, libGL
|
||||
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
|
||||
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
|
||||
, libchardet
|
||||
, ffmpeg
|
||||
|
||||
@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null;
|
||||
assert cddaSupport -> libcdda != null;
|
||||
assert youtubeSupport -> youtube-dl != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "bomi";
|
||||
version = "0.9.11";
|
||||
|
||||
@ -90,8 +90,9 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs build-mpv
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/bomi \
|
||||
wrapQtApp $out/bin/bomi \
|
||||
${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
|
||||
'';
|
||||
|
||||
@ -105,7 +106,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional cddaSupport "--enable-cdda"
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ];
|
||||
nativeBuildInputs = [ pkgconfig perl python which qttools qmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Powerful and easy-to-use multimedia player";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "QMediathekView";
|
||||
version = "2019-01-06";
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
|
||||
{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
|
||||
, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
|
||||
, qwt, extra-cmake-modules }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "qstopmotion";
|
||||
version = "2.4.1";
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
|
||||
{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "aqemu";
|
||||
version = "0.9.2";
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ stdenv.mkDerivation {
|
||||
installPhase = (''
|
||||
mkdir -p $out/lib $dev/include $dev/lib/pkgconfig
|
||||
|
||||
libblas="${lib.getLib blasProvider}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
libblas="${lib.getLib blasProvider}/lib/libblas${canonicalExtension}"
|
||||
|
||||
if ! [ -e "$libblas" ]; then
|
||||
echo "$libblas does not exist, ${blasProvider.name} does not provide libblas."
|
||||
@ -100,7 +100,7 @@ Libs: -L$out/lib -lblas
|
||||
Cflags: -I$dev/include
|
||||
EOF
|
||||
|
||||
libcblas="${lib.getLib blasProvider}/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
libcblas="${lib.getLib blasProvider}/lib/libcblas${canonicalExtension}"
|
||||
|
||||
if ! [ -e "$libcblas" ]; then
|
||||
echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas."
|
||||
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
installPhase = (''
|
||||
mkdir -p $out/lib $dev/include $dev/lib/pkgconfig
|
||||
|
||||
liblapack="${lib.getLib lapackProvider}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
liblapack="${lib.getLib lapackProvider}/lib/liblapack${canonicalExtension}"
|
||||
|
||||
if ! [ -e "$liblapack" ]; then
|
||||
echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack."
|
||||
@ -74,7 +74,7 @@ Cflags: -I$dev/include
|
||||
Libs: -L$out/lib -llapack
|
||||
EOF
|
||||
|
||||
liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${canonicalExtension}"
|
||||
|
||||
if ! [ -e "$liblapacke" ]; then
|
||||
echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke."
|
||||
|
||||
@ -103,6 +103,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# for the compositor
|
||||
--prefix PATH : "$out/bin"
|
||||
|
||||
# the theme is hardcoded
|
||||
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitHub
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -28,6 +28,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0a0pqrpmrdd5pch30lizr9righlc7165z7krmnaxrzd0fvfkbr2h";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/elementary/wingpanel-indicator-datetime/pull/207
|
||||
# Fixes lots of issues despite being rejected upstream
|
||||
# https://github.com/elementary/wingpanel-indicator-datetime/issues/206
|
||||
# https://github.com/elementary/wingpanel-indicator-datetime/issues/55
|
||||
# https://github.com/elementary/wingpanel-indicator-datetime/issues/127
|
||||
./207.patch
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
attrPath = "pantheon.${pname}";
|
||||
|
||||
@ -65,6 +65,13 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# this theme is required
|
||||
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The extensible top panel for Pantheon";
|
||||
longDescription = ''
|
||||
|
||||
@ -46,8 +46,13 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove gegl:simple / backend-file test that times out frequently
|
||||
./patches/no-simple-backend-file-test.patch
|
||||
# Prevent deadlock making tests time-out
|
||||
# https://gitlab.gnome.org/GNOME/gegl/issues/226
|
||||
# https://gitlab.gnome.org/GNOME/glib/issues/1941
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch";
|
||||
sha256 = "8PlUcLQkuskjDGCA2obUPDW3jE++A6B5YWVgvn+GFrU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
diff --git a/tests/simple/meson.build b/tests/simple/meson.build
|
||||
index 2c735d80a..ae4d50f2a 100644
|
||||
--- a/tests/simple/meson.build
|
||||
+++ b/tests/simple/meson.build
|
||||
@@ -1,5 +1,4 @@
|
||||
testnames = [
|
||||
- 'backend-file',
|
||||
'buffer-cast',
|
||||
'buffer-changes',
|
||||
'buffer-extract',
|
||||
@ -114,10 +114,10 @@ in stdenvNoCC.mkDerivation {
|
||||
'') + ''
|
||||
|
||||
# Setup symlinks for blas / lapack
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
|
||||
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
|
||||
'';
|
||||
|
||||
# fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
|
||||
|
||||
@ -178,10 +178,10 @@ EOF
|
||||
done
|
||||
|
||||
# Setup symlinks for blas / lapack
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
|
||||
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python library for date manipulation";
|
||||
license = "apache";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, tzlocal, requests, vobject, lxml, nose }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, tzlocal
|
||||
, requests
|
||||
, vobject
|
||||
, lxml
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "caldav";
|
||||
@ -12,11 +19,16 @@ buildPythonPackage rec {
|
||||
sha256 = "80c33b143539da3a471148ac89512f67d9df3a5286fae5a023e2ad3923246c0d";
|
||||
};
|
||||
|
||||
# xandikos is only a optional test dependency, not available for python3
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ", 'xandikos'" ""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "This project is a CalDAV (RFC4791) client library for Python.";
|
||||
homepage = "https://pythonhosted.org/caldav/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marenz ];
|
||||
broken = true; # missing xandikos package
|
||||
};
|
||||
}
|
||||
|
||||
@ -53,6 +53,8 @@ in buildPythonPackage rec {
|
||||
|
||||
setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
|
||||
|
||||
SCIPY_USE_G77_ABI_WRAPPER = 1;
|
||||
|
||||
meta = {
|
||||
description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
|
||||
homepage = "https://www.scipy.org/";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "1.10.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i";
|
||||
sha256 = "0y8cv8y92a4nqwrvqk2cxgs6nspqjk8jm4spr8rgkwlpfbrg74xn";
|
||||
};
|
||||
|
||||
cargoSha256 = "08fi0c4s0d1p2rqxvj1y82zg6xl3n0ikgyhgrjwh6xay8f0121f0";
|
||||
cargoSha256 = "1qi1c4v5d5a4xcf1bjbdicrv35w6chl5swlm96c1h3pr9s09lqy7";
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitLab, cmake, qtbase }:
|
||||
{ mkDerivation, stdenv, fetchFromGitLab, cmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "enyo-doom";
|
||||
version = "1.06.9";
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
|
||||
stdenv.mkDerivation rec {
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
|
||||
mkDerivation rec {
|
||||
version = "1.0.13";
|
||||
pname = "pro-office-calculator";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
name = "calaos_installer-3.1";
|
||||
version = "3.1";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "firebird-emu";
|
||||
version = "1.4";
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL
|
||||
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL
|
||||
, freeglut ? null, openal ? null, SDL2 ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "yabause";
|
||||
version = "0.9.15";
|
||||
|
||||
|
||||
@ -57,16 +57,16 @@ self: super: {
|
||||
};
|
||||
|
||||
LanguageClient-neovim = let
|
||||
version = "0.1.156";
|
||||
version = "0.1.157";
|
||||
LanguageClient-neovim-src = fetchurl {
|
||||
url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz";
|
||||
sha256 = "0bf2va6lpgw7wqpwpfidijbzphhvw48hyc2b529qv12vwgnd1shq";
|
||||
sha256 = "1ccq5akkm8n612ni5g7w7v5gv73g7p1d9i92k0bnsy33fvi3pmnh";
|
||||
};
|
||||
LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
|
||||
name = "LanguageClient-neovim-bin";
|
||||
src = LanguageClient-neovim-src;
|
||||
|
||||
cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6";
|
||||
cargoSha256 = "0r3f7sixkvgfrw0j81bxj1jpam5si9dnivrw63s29cvjxrdbnmqz";
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
# FIXME: Use impure version of CoreFoundation because of missing symbols.
|
||||
|
||||
@ -4,24 +4,24 @@
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch",
|
||||
"version_suffix": "a"
|
||||
},
|
||||
"4.19.116": {
|
||||
"sha256": "00y4i905gzs9w9kckrn1frh2vw32fsndz03g2psl1gk17snc3q7c",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch",
|
||||
"4.19.117": {
|
||||
"sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch",
|
||||
"version_suffix": "a"
|
||||
},
|
||||
"5.4.33": {
|
||||
"sha256": "1hjfvhyvz5kyvx25809brhsvfv9mjv9q1mw6ydb71gfwhw6q8d8b",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.33.a/linux-hardened-5.4.33.a.patch",
|
||||
"5.4.34": {
|
||||
"sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch",
|
||||
"version_suffix": "a"
|
||||
},
|
||||
"5.5.18": {
|
||||
"sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.18.a/linux-hardened-5.5.18.a.patch",
|
||||
"5.5.19": {
|
||||
"sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch",
|
||||
"version_suffix": "a"
|
||||
},
|
||||
"5.6.5": {
|
||||
"sha256": "19cdpygm5zx3szxl456lfjg5sffqcmn18470wv7prm8rf6liqdj3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.5.a/linux-hardened-5.6.5.a.patch",
|
||||
"5.6.6": {
|
||||
"sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch",
|
||||
"version_suffix": "a"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.116";
|
||||
version = "4.19.117";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0r3vdc3npl1bn06w9v6wsq7d5mm7bnhm9wsz36pb9ar3xhimvrlf";
|
||||
sha256 = "12xc1pwhwq4vp67hmn7hdynl4ik76cni79356hpzf1lbiqlrya6n";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.33";
|
||||
version = "5.4.34";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0q9q48ij6vppfcrdf7fr24pvpwsd13pxjkdni6rnjq9a60hrcmxm";
|
||||
sha256 = "1ljcsrw9jknw2d9hb0yfr1pwy85l8z4rqycgd0kad9mb9lrw2glh";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.5.18";
|
||||
version = "5.5.19";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "01iiiq4dsyyc5y6b52wax9as6dzhdi172vd1423sc1yp4rrk8178";
|
||||
sha256 = "1sqiw9d25sqqzdh04dd722i7ff6kchj869jp4l8zalpvf51k6j0l";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.6.5";
|
||||
version = "5.6.6";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1rjjkcmzsj9azggh960qnk2x44ns475b8nbd4nxazrz1rgdx76zp";
|
||||
sha256 = "1m3blvkma08v5y11jh0vhf4sr7jbcylkh15bssb5dgp40p8cx134";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "17402";
|
||||
sha256 = "1g151h6hdiwpvpip1r2rhbma8j13xghcyxddh0ppg9h548wwwack";
|
||||
rev = "17445";
|
||||
sha256 = "0d2gd2w4pbb728a7mw9dnq3aicwpjzg8zahg80ismvc9l1sym50a";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "00kydp6aysggng9a7m0q3zj3591yk6jgcibbqxx4ki20pd4vmqnb";
|
||||
sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -17,10 +17,11 @@ in stdenv.mkDerivation {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp * $out/bin/
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
|
||||
'';
|
||||
|
||||
buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
|
||||
nativeBuildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://pulumi.io/";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, lib, enableUnfree ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p7zip";
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace makefile.machine \
|
||||
--replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \
|
||||
--replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
|
||||
'' + ''
|
||||
'' + lib.optionalString (!enableUnfree) ''
|
||||
# Remove non-free RAR source code
|
||||
# (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar)
|
||||
rm -r CPP/7zip/Compress/Rar*
|
||||
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
# RAR code is under non-free UnRAR license, but we remove it
|
||||
license = stdenv.lib.licenses.lgpl2Plus;
|
||||
license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
|
||||
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper
|
||||
, httrack, qtbase, qtmultimedia }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "httraqt";
|
||||
version = "1.4.9";
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl
|
||||
{ mkDerivation, stdenv, fetchurl
|
||||
, pkgconfig, libtool, qmake
|
||||
, rsync, ssh
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "luckybackup";
|
||||
version = "0.5.0";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, qmake, qtbase }:
|
||||
{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
mkDerivation {
|
||||
pname = "rocket";
|
||||
version = "2018-06-09";
|
||||
|
||||
|
||||
@ -4,17 +4,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bat";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1kaa6ps6v1wk9qs63h116k4pbz7y9mfbfxfbq7g89yjhzkjmh6xc";
|
||||
sha256 = "0wxmn3ifrgpfq44xs747qqik2p2vazdw5zi4imxqap2krha4k2ms";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "01l1y124gjh6gf9z1jkbpfzh0w92hrgwvsmqkqdw3a9pa4w5f6yg";
|
||||
cargoSha256 = "0bs6pqrg0vdam2h2ddikmgmksqlfjljqacc52rh6p546is6jcp2s";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, lib, fetchurl
|
||||
{ mkDerivation, lib, fetchurl
|
||||
, extra-cmake-modules, ki18n
|
||||
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
|
||||
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
|
||||
, kitemviews, lcms2, libXrandr, qtx11extras
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
pname = "colord-kde";
|
||||
version = "0.5.0";
|
||||
|
||||
|
||||
@ -53,6 +53,9 @@ python3Packages.buildPythonApplication rec {
|
||||
echo 'Version: ${version}' >PKG-INFO
|
||||
|
||||
sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
|
||||
|
||||
# fixing test
|
||||
sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babeld";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "1d503igqv9s5pgrhvxp1czjy2xfsjhagyyh2iny7g4cjvl0kq6qy";
|
||||
sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nixpkgs-review";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nixpkgs-review";
|
||||
rev = version;
|
||||
sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr";
|
||||
sha256 = "0qkvjl4f8a1905yj3ml32rfdr5q76igz21gn3dcya0pfqhrnb28i";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jwt-cli";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-engel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "108pwk0h6zcbfmp0k8rhjxaa9yk8rhb78aaql22x48n11fnjl27i";
|
||||
sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y";
|
||||
};
|
||||
|
||||
cargoSha256 = "1xh2ylx5fqblhlrs8yhl3zf8kvgrqnwdwmix6yzch9bi5mv5c11w";
|
||||
cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -1,25 +1,28 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsc-cyberjack";
|
||||
version = "3.99.5_SP13";
|
||||
let
|
||||
version = "3.99.5";
|
||||
suffix = "SP13";
|
||||
tarBall = "${version}final.${suffix}";
|
||||
|
||||
src = with stdenv.lib; let
|
||||
splittedVer = splitString "_" version;
|
||||
mainVer = if length splittedVer >= 1 then head splittedVer else version;
|
||||
spVer = optionalString (length splittedVer >= 1) ("." + last splittedVer);
|
||||
tarballVersion = "${mainVer}final${spVer}";
|
||||
in fetchurl {
|
||||
url = "http://support.reiner-sct.de/downloads/LINUX/V${version}"
|
||||
+ "/pcsc-cyberjack_${tarballVersion}.tar.gz";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pcsc-cyberjack";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"http://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.gz";
|
||||
sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tools" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
buildInputs = [ libusb1 pcsclite ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--with-usbdropdir=${placeholder "out"}/pcsc/drivers"
|
||||
"--bindir=${placeholder "tools"}/bin"
|
||||
@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
description = "REINER SCT cyberJack USB chipcard reader user space driver";
|
||||
homepage = "https://www.reiner-sct.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aszlig ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, qmake, boost }:
|
||||
{ mkDerivation, stdenv, fetchurl, qmake, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
|
||||
pname = "glogg";
|
||||
version = "1.1.4";
|
||||
|
||||
@ -76,6 +76,14 @@ let
|
||||
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398";
|
||||
sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l";
|
||||
})
|
||||
|
||||
# Needed for ghostscript>=9.50
|
||||
(fetchpatch {
|
||||
name = "xdvipdfm-fix.patch";
|
||||
url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/dvipdfm-x/spc_dvips.c?view=patch&r1=52765&r2=52764&pathrev=52765";
|
||||
sha256 = "0qvrc7yxhbl5f4g340z8aql388bwib0m2gxd473skbmviy5bjr3f";
|
||||
stripLen = 2;
|
||||
})
|
||||
];
|
||||
|
||||
# remove when removing synctex-missing-header.patch
|
||||
|
||||
@ -920,6 +920,8 @@ in
|
||||
|
||||
libfx2 = with python3Packages; toPythonApplication fx2;
|
||||
|
||||
fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { };
|
||||
|
||||
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
|
||||
|
||||
genymotion = callPackage ../development/mobile/genymotion { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user