Merge branch 'master' into staging-next
This commit is contained in:
Jan Tojnar
commit
a69ad18da9
@ -4162,6 +4162,12 @@
|
||||
github = "marcweber";
|
||||
githubId = 34086;
|
||||
name = "Marc Weber";
|
||||
};
|
||||
marcus7070 = {
|
||||
email = "marcus@geosol.com.au";
|
||||
github = "marcus7070";
|
||||
githubId = 50230945;
|
||||
name = "Marcus Boyd";
|
||||
};
|
||||
marenz = {
|
||||
email = "marenz@arkom.men";
|
||||
@ -7658,4 +7664,10 @@
|
||||
githubId = 50867187;
|
||||
name = "Rakesh Gupta";
|
||||
};
|
||||
waiting-for-dev = {
|
||||
email = "marc@lamarciana.com";
|
||||
github = "waiting-for-dev";
|
||||
githubId = 52650;
|
||||
name = "Marc Busqué";
|
||||
};
|
||||
}
|
||||
|
||||
@ -214,17 +214,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
|
||||
# Reload the changed mount unit to force a remount.
|
||||
$unitsToReload{$unit} = 1;
|
||||
recordUnit($reloadListFile, $unit);
|
||||
} elsif ($unit =~ /\.socket$/) {
|
||||
my $unitInfo = parseUnit($newUnitFile);
|
||||
# If a socket unit has been changed, the corresponding
|
||||
# service unit has to be stopped before the socket can
|
||||
# be restarted. The service will be started again on demand.
|
||||
my $serviceUnit = $unitInfo->{'Unit'} // "$baseName.service";
|
||||
$unitsToStop{$serviceUnit} = 1;
|
||||
$unitsToStop{$unit} = 1;
|
||||
$unitsToStart{$unit} = 1;
|
||||
recordUnit($startListFile, $unit);
|
||||
} elsif ($unit =~ /\.path$/ || $unit =~ /\.slice$/) {
|
||||
} elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) {
|
||||
# FIXME: do something?
|
||||
} else {
|
||||
my $unitInfo = parseUnit($newUnitFile);
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "5.984";
|
||||
version = "5.987";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
||||
sha256 = "01yy0s9b9mkl6v66vgdfxl2zhr36abridih1d4ajbrdn60vppykw";
|
||||
sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rednotebook";
|
||||
version = "2.11.1";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jendrikseipp";
|
||||
repo = "rednotebook";
|
||||
rev = "v${version}";
|
||||
sha256 = "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1";
|
||||
sha256 = "1xs2wvm9g8vypz25li7rm8m0j4dsdpqpajcvrc756x5m149dxc08";
|
||||
};
|
||||
|
||||
# We have not packaged tests.
|
||||
@ -35,7 +35,7 @@ buildPythonApplication rec {
|
||||
strictDeps = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://rednotebook.sourceforge.net/;
|
||||
homepage = "https://rednotebook.sourceforge.io/";
|
||||
description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ orivej tstrobel ];
|
||||
|
||||
57
pkgs/applications/graphics/cq-editor/default.nix
Normal file
57
pkgs/applications/graphics/cq-editor/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, mkDerivationWith
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "cq-editor";
|
||||
version = "0.1RC1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = "CQ-editor";
|
||||
rev = version;
|
||||
sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cadquery
|
||||
Logbook
|
||||
pyqt5
|
||||
pyparsing
|
||||
pyqtgraph
|
||||
spyder
|
||||
pathpy
|
||||
qtconsole
|
||||
requests
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapQtApp "$out/bin/cq-editor"
|
||||
'';
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
pytest
|
||||
pytest-xvfb
|
||||
pytest-mock
|
||||
pytestcov
|
||||
pytest-repeat
|
||||
pytest-qt
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest --no-xvfb
|
||||
'';
|
||||
|
||||
# requires X server
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CadQuery GUI editor based on PyQT";
|
||||
homepage = "https://github.com/CadQuery/CQ-editor";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ costrouc marcus7070 ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub
|
||||
, git, gnupg, pass, pwgen
|
||||
, git, gnupg, pass, pwgen, qrencode
|
||||
, qtbase, qtsvg, qttools, qmake
|
||||
}:
|
||||
|
||||
@ -14,6 +14,11 @@ mkDerivation rec {
|
||||
sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/qtpass.cpp \
|
||||
--replace "/usr/bin/qrencode" "${qrencode}/bin/qrencode"
|
||||
'';
|
||||
|
||||
buildInputs = [ git gnupg pass qtbase qtsvg ];
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xchm";
|
||||
version = "1.30";
|
||||
version = "1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rzvncj";
|
||||
repo = "xCHM";
|
||||
rev = version;
|
||||
sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v";
|
||||
sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "17bgz1rpix1zgzzn4zz84jp7hl6b2k968h918y3av5asxn0mji49";
|
||||
sha256 = "0w6vbrp44l25jhv3kx1m0841rkv7im30581gds0qb7lhyqm0hnbg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -47,11 +47,11 @@ let
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "64.0.3417.83";
|
||||
version = "65.0.3467.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "09ygnfma5ncx6y8yr6dm3hz98cd9srv6687wgs786dw5glfhsd57";
|
||||
sha256 = "0vcpq2p8si6rlyvd8nzs0a7pjxks2qn8i8czna968wyfxlczckyr";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rambox-pro";
|
||||
version = "1.1.7";
|
||||
version = "1.2.0";
|
||||
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
|
||||
sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as";
|
||||
sha256 = "189rpsrs25c4100xf1zhcwvdyigbzsw8ffhayj8mmrx4akg39653";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.6.3";
|
||||
version = "0.6.5";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
|
||||
sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59";
|
||||
sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "urh";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jopohl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1c87lff9bqhf574420ycqz88x6ad5hmy36wrb8pi0dqd1s1d72qb";
|
||||
sha256 = "0vwc1jw1fjirdpavrnvc95bql8023ayrz9srbwn0p6n0ia038948";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.21.1";
|
||||
version = "2.21.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "0knfx0by7rml19kr5ynb7860iykij1z1mx2hx0bg3s287sld1ppl";
|
||||
sha256 = "0s1gn2bkya41866kd8zj0g8xjbivs763jqmlzdpjz4c25h6xkhns";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "subgit-3.3.8";
|
||||
name = "subgit-3.3.9";
|
||||
|
||||
meta = {
|
||||
description = "A tool for a smooth, stress-free SVN to Git migration";
|
||||
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://subgit.com/download/${name}.zip";
|
||||
sha256 = "0gvyyr4prx1v06f9j9fmmr8br1gjd45bnncl40c9agiqsyy0q06n";
|
||||
sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchgit, buildPythonPackage
|
||||
, python
|
||||
, srht, asyncpg, unidiff, aiosmtpd, emailthreads }:
|
||||
, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "listssrht";
|
||||
@ -20,6 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
asyncpg
|
||||
unidiff
|
||||
aiosmtpd
|
||||
|
||||
@ -13,13 +13,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "38.0.0";
|
||||
version = "40.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0874rfslglywpa8ilhqv59zvn2hisdsbwd7r61psf5rd64v72ym4";
|
||||
sha256 = "103rvj6f6nlzybzbkqix7q5f2017bmzsn9z5g7bwnjjwgih5mrpq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pname = "streamlink";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "streamlink";
|
||||
repo = "streamlink";
|
||||
rev = version;
|
||||
sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh";
|
||||
sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah";
|
||||
};
|
||||
|
||||
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "man-pages";
|
||||
version = "5.03";
|
||||
version = "5.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
|
||||
sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz";
|
||||
sha256 = "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x";
|
||||
};
|
||||
|
||||
makeFlags = [ "MANDIR=$(out)/share/man" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "cascadia-code";
|
||||
version = "1910.04";
|
||||
version = "1911.20";
|
||||
in
|
||||
fetchurl {
|
||||
name = "${pname}-${version}";
|
||||
@ -15,7 +15,7 @@ fetchurl {
|
||||
install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
|
||||
'';
|
||||
|
||||
sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q";
|
||||
sha256 = "1dfd3g7cf2h0z2gxvk4pxy46xswd3wyqz3p8ypxcv2dkz4ri6l0j";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plata-theme";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "tista500";
|
||||
repo = "plata-theme";
|
||||
rev = version;
|
||||
sha256 = "1bcjrnh6bm7pxyqrr39yx5zykf3yzxrsydd5xcawjfihnph3yrlg";
|
||||
sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -28,14 +28,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rygel";
|
||||
version = "0.38.1";
|
||||
version = "0.38.3";
|
||||
|
||||
# TODO: split out lib
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0";
|
||||
sha256 = "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yelp-xsl";
|
||||
version = "3.34.0";
|
||||
version = "3.34.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8";
|
||||
sha256 = "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nim";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
|
||||
sha256 = "1rjinrs119c8i6wzz5fzjfml7n7kbd5hb9642g4rr8qxkq4sx83k";
|
||||
sha256 = "1q5fx9g40bk4ajghi856w5l34fmrl7avq5j6p0dr2xa4l52ib149";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -12,16 +12,18 @@ in
|
||||
|
||||
{ stdenv, fetchurl, ncurses, buildEnv
|
||||
, libX11, xorgproto, useX11 ? safeX11 stdenv
|
||||
, aflSupport ? false
|
||||
, flambdaSupport ? false
|
||||
}:
|
||||
|
||||
assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
|
||||
assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
|
||||
assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
|
||||
|
||||
let
|
||||
useNativeCompilers = !stdenv.isMips;
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}";
|
||||
name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}";
|
||||
in
|
||||
|
||||
let
|
||||
@ -41,11 +43,16 @@ stdenv.mkDerivation (args // {
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = optionals useX11 (
|
||||
configureFlags =
|
||||
let flags = new: old:
|
||||
if stdenv.lib.versionAtLeast version "4.08"
|
||||
then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
|
||||
else [ "-x11lib" x11lib "-x11include" x11inc ])
|
||||
++ optional flambdaSupport "-flambda"
|
||||
then new else old
|
||||
; in
|
||||
optionals useX11 (flags
|
||||
[ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
|
||||
[ "-x11lib" x11lib "-x11include" x11inc ])
|
||||
++ optional aflSupport (flags "--with-afl" "-afl-instrument")
|
||||
++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
|
||||
;
|
||||
|
||||
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "X11basic";
|
||||
version = "1.26";
|
||||
version = "1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kollokollo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd";
|
||||
sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, libyaml
|
||||
, swig
|
||||
, eigen
|
||||
, pkgconfig
|
||||
, wafHook
|
||||
, makeWrapper
|
||||
@ -19,13 +20,13 @@ assert pythonSupport -> pythonPackages != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gaia";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MTG";
|
||||
repo = "gaia";
|
||||
rev = "v${version}";
|
||||
sha256 = "12jxb354s2dblr2ghnl3w05m23jgzvrrgywfj8jaa32j3gw48fv2";
|
||||
sha256 = "03vmdq7ca4f7zp2f4sxyqa8sdpdma3mn9fz4z7d93qryl0bhi7z3";
|
||||
};
|
||||
|
||||
# Fix installation error when waf tries to put files in /etc/
|
||||
@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
libyaml
|
||||
eigen
|
||||
qt4
|
||||
];
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# TODO: Resolve the issues with the Mono bindings.
|
||||
|
||||
{ stdenv, fetchurl, fetchpatch, lib, file
|
||||
, pkgconfig, autoconf
|
||||
{ stdenv, fetchurl, fetchpatch, lib
|
||||
, pkgconfig, autoreconfHook
|
||||
, glib, dbus-glib, gtkVersion ? "3"
|
||||
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
|
||||
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ];
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
if gtkVersion == "2"
|
||||
@ -46,14 +46,6 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
autoconf
|
||||
for f in {configure,ltmain.sh,m4/libtool.m4}; do
|
||||
substituteInPlace $f \
|
||||
--replace /usr/bin/file ${file}/bin/file
|
||||
done
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"CFLAGS=-Wno-error"
|
||||
"--sysconfdir=/etc"
|
||||
@ -61,11 +53,6 @@ stdenv.mkDerivation rec {
|
||||
"--with-gtk=${gtkVersion}"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace configure \
|
||||
--replace /usr/bin/file ${file}/bin/file
|
||||
'';
|
||||
|
||||
doCheck = false; # generates shebangs in check phase, too lazy to fix
|
||||
|
||||
installFlags = [
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
pname = "libdigidocpp";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
|
||||
sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl";
|
||||
sha256 = "0yrcfw5i1jddz7x3j9zzlcwjlzdbi10wns7kbblbp03nx7vk2vqy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig xxd ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libisoburn";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
|
||||
sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc";
|
||||
};
|
||||
|
||||
buildInputs = [ attr zlib libburn libisofs ];
|
||||
|
||||
@ -1,24 +1,28 @@
|
||||
{stdenv, fetchFromGitHub, cmake}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
pname = "nanoflann";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jlblancoc";
|
||||
repo = "nanoflann";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv";
|
||||
sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_EXAMPLES=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/jlblancoc/nanoflann;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
homepage = "https://github.com/jlblancoc/nanoflann";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
description = "Header only C++ library for approximate nearest neighbor search";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prometheus-cpp";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupp0r";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "15bda1q1jbvixbx1qf41ykcdmsywhhwmi4xgsha12r5m9fh8jzxj";
|
||||
sha256 = "0j12ir8skw3y2q8n743zql4ddp7v1j4h030pjcsqn0xqrqw7m5hg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simpleitk";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nmsq0qx4jmrrhrc6bfm11wwvyszvfgl45xizw69yra3cv9pgmm6";
|
||||
sha256 = "0dvf2407z9n6lczm0l5vzcvpw6r6z1wzrs2gk3dqjrgynq6952qr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git swig ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
|
||||
pname = "smarty3";
|
||||
version = "3.1.33";
|
||||
version = "3.1.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smarty-php";
|
||||
repo = "smarty";
|
||||
rev = "v${version}";
|
||||
sha256 = "12kll8nv4b90nlx3y0213lsncqw2ydshjx4g6dv7jah6j1pv29ix";
|
||||
sha256 = "0a44p71aqyifm7qkp892aczb0bn6a9fv4657dsscxszvdm25a92x";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -37,5 +37,5 @@ let
|
||||
};
|
||||
};
|
||||
in {
|
||||
xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k";
|
||||
xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp";
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
pname = "bitarray";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3eb500f8b9cde19e14472fcbee0195dbf0fbac006f8406a03f0cfb495dff20a0";
|
||||
sha256 = "0nv1283qcfilhnb4q6znlijply6lfxwpvp10cr0v33l0qwa86mwz";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
93
pkgs/development/python-modules/cadquery/default.nix
Normal file
93
pkgs/development/python-modules/cadquery/default.nix
Normal file
@ -0,0 +1,93 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pyparsing
|
||||
, opencascade
|
||||
, stdenv
|
||||
, python
|
||||
, cmake
|
||||
, swig
|
||||
, ninja
|
||||
, smesh
|
||||
, freetype
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, six
|
||||
}:
|
||||
|
||||
let
|
||||
pythonocc-core-cadquery = stdenv.mkDerivation {
|
||||
pname = "pythonocc-core-cadquery";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = "pythonocc-core";
|
||||
# no proper release to to use, this commit copied from the Anaconda receipe
|
||||
rev = "701e924ae40701cbe6f9992bcbdc2ef22aa9b5ab";
|
||||
sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
opencascade
|
||||
smesh
|
||||
freetype
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
"-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
|
||||
"-DSMESH_INCLUDE_PATH=${smesh}/include/smesh"
|
||||
"-DSMESH_LIB_PATH=${smesh}/lib"
|
||||
"-DPYTHONOCC_WRAP_SMESH=TRUE"
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "cadquery";
|
||||
version = "2.0RC0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
opencascade
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyparsing
|
||||
pythonocc-core-cadquery
|
||||
];
|
||||
|
||||
# Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7).
|
||||
disabled = !(isPy3k && (pythonOlder "3.8"));
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parametric scripting language for creating and traversing CAD models";
|
||||
homepage = "https://github.com/CadQuery/cadquery";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ costrouc marcus7070 ];
|
||||
};
|
||||
}
|
||||
29
pkgs/development/python-modules/pyscreenshot/default.nix
Normal file
29
pkgs/development/python-modules/pyscreenshot/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, EasyProcess
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyscreenshot";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "19ec6d17a61c0cd4e7fcf3ab2685598a54b53dc781755393cc5f76dcb7bf359c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
EasyProcess
|
||||
];
|
||||
|
||||
# recursive dependency on pyvirtualdisplay
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "python screenshot";
|
||||
homepage = "https://github.com/ponty/pyscreenshot";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/pytest-qt/default.nix
Normal file
39
pkgs/development/python-modules/pytest-qt/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
, pyqt5
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-qt";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f6ecf4b38088ae1092cbd5beeaf714516d1f81f8938626a2eac546206cdfe7fa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools_scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pyqt5
|
||||
];
|
||||
|
||||
# tests require X server
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "pytest support for PyQt and PySide applications";
|
||||
homepage = "https://github.com/pytest-dev/pytest-qt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
@ -8,33 +8,29 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-repeat";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3";
|
||||
sha256 = "1nbdmklpi0ra1jnfm032wz96y9nxdlcr4m9sjlnffwm7n4x43g2j";
|
||||
};
|
||||
|
||||
# fixes support for pytest >3.6. Should be droppable during the
|
||||
# next bump.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch;
|
||||
sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
setuptools_scm
|
||||
];
|
||||
|
||||
buildInputs = [ setuptools_scm ];
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin for repeating tests";
|
||||
homepage = https://github.com/pytest-dev/pytest-repeat;
|
||||
maintainers = with lib.maintainers; [ costrouc ];
|
||||
license = lib.licenses.mpl20;
|
||||
homepage = "https://github.com/pytest-dev/pytest-repeat";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
28
pkgs/development/python-modules/pytest-xvfb/default.nix
Normal file
28
pkgs/development/python-modules/pytest-xvfb/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, virtual-display
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-xvfb";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytest
|
||||
virtual-display
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pytest plugin to run Xvfb for tests";
|
||||
homepage = "https://github.com/The-Compiler/pytest-xvfb";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/tinydb/default.nix
Normal file
39
pkgs/development/python-modules/tinydb/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, pytestcov
|
||||
, pytestrunner
|
||||
, pycodestyle
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinydb";
|
||||
version = "v3.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msiemens";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02idbvrm8j4mwsjfkzy11f4png19k307p53s4qa2ifzssysxpb96";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytestrunner
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestcov
|
||||
pycodestyle
|
||||
pyyaml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight document oriented database written in pure Python with no external dependencies";
|
||||
homepage = "https://github.com/msiemens/tinydb";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marcus7070 ];
|
||||
};
|
||||
}
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qbs";
|
||||
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbs";
|
||||
repo = "qbs";
|
||||
rev = "v${version}";
|
||||
sha256 = "19adxjyp5bf5hrjisv3ff9ndcmh1glrxfrzifs46xjn3r69kyv1k";
|
||||
sha256 = "0rqfnclhzln6v4gm68fn4vn6ncf5qpi90295fwm4fx6dq4l94b3v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://piccolo.link/sbt-${version}.tgz"
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
|
||||
];
|
||||
sha256 = "0v27i8pd9ss53ipi1cs40426mnyppdjgcdjk8nn05bi6rm7a4r7y";
|
||||
sha256 = "0bz6jj7jiwxd35xw9l1jbd846r0129pwgdi8m6dxwb8zybj73k2m";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronaut";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
|
||||
sha256 = "1ka70cr6kznl68ilc42blzqk59gy20spkyqfn26n6zbk0jm5ssxv";
|
||||
sha256 = "0y7qshg6v8s5rwi0fz9xpyhd1yhv8jrw2jhp276a30dfkglx19qn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkquake";
|
||||
version = "1.02.1";
|
||||
version = "1.03.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Novum";
|
||||
repo = "vkQuake";
|
||||
rev = version;
|
||||
sha256 = "0fk9jqql0crnf0s12cxnris392ajciyw1zbz17qgs5hdyivp9vdx";
|
||||
sha256 = "1x2lx1fvr2p91clbx2jcc29j5yyh0xwq9fh0lyxhyadf5a710fn0";
|
||||
};
|
||||
|
||||
sourceRoot = "source/Quake";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, zlib, pcre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tintin-2.01.91";
|
||||
name = "tintin-2.01.92";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tintin/${name}.tar.gz";
|
||||
sha256 = "0nb3przw84r5zaibhpcb8gxm5vllrchca663c3f650fm83asd5im";
|
||||
sha256 = "0id8rd2yhh6ccjnlwyixflsay1rq3sw6pwlhz1ic3nzj22cd91ik";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib pcre ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.203";
|
||||
version = "4.4.205";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj";
|
||||
sha256 = "19pasidvfmf94rs86v80x7hpirz9gavmkxwcl76ya61fq7lqy7zs";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.203";
|
||||
version = "4.9.205";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0jd8n8y3yf59sgfjhgjxsznxng7s4b30x5vdb48wrpgqmz7m1n8w";
|
||||
sha256 = "01cbqxw77g6rdg7dgk73pg9a2n9v4sxp48q2a77w1b068xjfifcq";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.3.13";
|
||||
version = "5.3.14";
|
||||
|
||||
# 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 = "0by9lmgmllf19yflzm9f24cy9glcq6m73ywm25bddsnh0czya14z";
|
||||
sha256 = "0ckrbzwsc4lxd3l287wsd88mkfsd0kpf8nzchd9nfmkjiil14mwm";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4";
|
||||
version = "5.4.1";
|
||||
|
||||
# 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 = "14glqppn90z79b36k4c76mv90q933i2bg54rgwlcl2v7n608jcxz";
|
||||
sha256 = "1nagqx18a49hgj13spvyf095231wgc441np4zcgl4gnm4jrqpm57";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libratbag";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libratbag";
|
||||
repo = "libratbag";
|
||||
rev = "v${version}";
|
||||
sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb";
|
||||
sha256 = "1fcdcs4i83yic4rp3dsr7rq040f78lh8fb1ni1nnvp3y78fmibmi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tomb";
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dyne";
|
||||
repo = "Tomb";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pr0lw1byxwkgv857zfmd8yqa03a7mckhzklrf9rkv1l6nisz0z0";
|
||||
sha256 = "1vzkpzci6cp1r1q2n34pcgcns78i726k8d89dd6pibyj0vfnkl57";
|
||||
};
|
||||
|
||||
buildInputs = [ sudo zsh pinentry ];
|
||||
|
||||
@ -12,14 +12,14 @@ with stdenv.lib;
|
||||
assert libgcrypt != null -> libsodium == null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
pname = "usbguard";
|
||||
|
||||
repo = "https://github.com/USBGuard/usbguard";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b";
|
||||
sha256 = "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
pname = "tigervnc";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TigerVNC";
|
||||
repo = "tigervnc";
|
||||
rev = "v1.9.0";
|
||||
sha256 = "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x";
|
||||
rev = "v1.10.0";
|
||||
sha256 = "0l0x7cq65wv9n93r952qsikwzcls1sq3r32mx0c4wg19dha0x1m4";
|
||||
};
|
||||
|
||||
inherit fontDirectories;
|
||||
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.tigervnc.org/;
|
||||
homepage = "https://tigervnc.org/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
description = "Fork of tightVNC, made in cooperation with VirtualGL";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moosefs";
|
||||
version = "3.0.105";
|
||||
version = "3.0.107";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx";
|
||||
sha256 = "18mw7a1by8l09fb2pan6zak29bcrgbf5zgfzrlw3c203yawqbx3k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, autoconf, automake, pkgconfig, pango }:
|
||||
, autoconf, automake, pkgconfig, intltool, pango }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "paps";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dov";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1f0qcawak76zk2xypipb6sy4bd8mixlrjby851x216a7f6z8fd4y";
|
||||
rev = "v${version}";
|
||||
sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake pkgconfig ];
|
||||
nativeBuildInputs = [ autoconf automake pkgconfig intltool ];
|
||||
buildInputs = [ pango ];
|
||||
|
||||
preConfigure = ''
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pango to PostScript converter";
|
||||
homepage = https://github.com/dov/paps;
|
||||
homepage = "https://github.com/dov/paps";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ etu ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "termtosvg";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1mf2vlq083mzhja449il78zpvjq6fv36pzakwrqmgxdjbsdyvxbd";
|
||||
sha256 = "1d0lmvprraspdqpn0rsqzvkkmpj8zk0crid5l39kxpjpxrv2irfg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmate";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmate-io";
|
||||
repo = "tmate";
|
||||
rev = version;
|
||||
sha256 = "183rvga8nvh9r7p8104vwcmzp3vrfdhnx73vh06m2fgdq9i5rz3l";
|
||||
sha256 = "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, libevent, pkgconfig, makeWrapper }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkgconfig
|
||||
, makeWrapper
|
||||
, bison
|
||||
, ncurses
|
||||
, libevent
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -13,20 +21,28 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmux";
|
||||
version = "2.9a";
|
||||
version = "3.0";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "tmux";
|
||||
repo = "tmux";
|
||||
rev = version;
|
||||
sha256 = "040plbgxlz14q5p0p3wapr576jbirwripmsjyq3g1nxh76jh1ipg";
|
||||
sha256 = "0772hajzgpl4cvb9l2bma9hmnh4jg1phvqr2gg4292w34n5dsl3k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
autoreconfHook
|
||||
bison
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses libevent makeWrapper ];
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libevent
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
@ -39,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://tmux.github.io/;
|
||||
homepage = "http://tmux.github.io/";
|
||||
description = "Terminal multiplexer";
|
||||
|
||||
longDescription =
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stunnel";
|
||||
version = "5.55";
|
||||
version = "5.56";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh";
|
||||
sha256 = "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k";
|
||||
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
|
||||
# not the output of `nix-prefetch-url`
|
||||
};
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.2";
|
||||
version = "5.5.3";
|
||||
pname = "whois";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfc1036";
|
||||
repo = "whois";
|
||||
rev = "v${version}";
|
||||
sha256 = "0587xvw0ifjrwxgisw0nfx7qykmkly1knfdghrpph9vicpzwsidw";
|
||||
sha256 = "099yvqng085f69k815961jnwk50nzmiknvhl1wwmji2hl36r160g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl gettext pkgconfig ];
|
||||
|
||||
41
pkgs/tools/system/java-service-wrapper/default.nix
Normal file
41
pkgs/tools/system/java-service-wrapper/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv, fetchurl
|
||||
, jdk
|
||||
, ant, cunit, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "java-service-wrapper";
|
||||
version = "3.5.41";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
|
||||
sha256 = "0wvazc4y134brn99aa4rc9jdh1h2q3l7qhhvbcs6lhf4ym47sskm";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
nativeBuildInputs = [ ant cunit ncurses ];
|
||||
|
||||
buildPhase = ''
|
||||
export ANT_HOME=${ant}
|
||||
export JAVA_HOME=${jdk}/lib/openjdk/jre/
|
||||
export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
|
||||
export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
|
||||
|
||||
${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp bin/wrapper $out/bin/wrapper
|
||||
cp lib/wrapper.jar $out/lib/wrapper.jar
|
||||
cp lib/libwrapper.so $out/lib/libwrapper.so
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Enables a Java Application to be run as a Windows Service or Unix Daemon";
|
||||
homepage = "https://wrapper.tanukisoftware.com/";
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ maintainers.suhr ];
|
||||
};
|
||||
}
|
||||
47
pkgs/tools/text/boxes/default.nix
Normal file
47
pkgs/tools/text/boxes/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ stdenv, fetchFromGitHub, bison, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boxes";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ascii-boxes";
|
||||
repo = "boxes";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b12rsynrmkldlwcb62drk33kk0aqwbj10mq5y5x3hjf626gjwsi";
|
||||
};
|
||||
|
||||
# Building instructions:
|
||||
# https://boxes.thomasjensen.com/build.html#building-on-linux--unix
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
# Makefile references a system wide config file in '/usr/share'. Instead, we
|
||||
# move it within the store by default.
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "GLOBALCONF = /usr/share/boxes" \
|
||||
"GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
|
||||
'';
|
||||
|
||||
makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin src/boxes
|
||||
install -Dm644 -t $out/share/boxes boxes-config
|
||||
install -Dm644 -t $out/share/man/man1 doc/boxes.1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command line ASCII boxes unlimited!";
|
||||
longDescription = ''
|
||||
Boxes is a command line filter program that draws ASCII art boxes around
|
||||
your input text.
|
||||
'';
|
||||
homepage = https://boxes.thomasjensen.com;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ waiting-for-dev ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -724,6 +724,8 @@ in
|
||||
|
||||
brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
|
||||
|
||||
boxes = callPackage ../tools/text/boxes { };
|
||||
|
||||
ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
|
||||
|
||||
ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
|
||||
@ -8335,6 +8337,8 @@ in
|
||||
|
||||
jasmin = callPackage ../development/compilers/jasmin { };
|
||||
|
||||
java-service-wrapper = callPackage ../tools/system/java-service-wrapper { };
|
||||
|
||||
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
|
||||
|
||||
julia_07 = callPackage ../development/compilers/julia/0.7.nix {
|
||||
@ -18247,6 +18251,8 @@ in
|
||||
|
||||
coyim = callPackage ../applications/networking/instant-messengers/coyim {};
|
||||
|
||||
cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { };
|
||||
|
||||
cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };
|
||||
|
||||
crun = callPackage ../applications/virtualization/crun {};
|
||||
|
||||
@ -497,6 +497,8 @@ in {
|
||||
|
||||
cachy = callPackage ../development/python-modules/cachy { };
|
||||
|
||||
cadquery = callPackage ../development/python-modules/cadquery { };
|
||||
|
||||
catalogue = callPackage ../development/python-modules/catalogue { };
|
||||
|
||||
cdecimal = callPackage ../development/python-modules/cdecimal { };
|
||||
@ -1101,6 +1103,8 @@ in {
|
||||
|
||||
pyschedule = callPackage ../development/python-modules/pyschedule { };
|
||||
|
||||
pyscreenshot = callPackage ../development/python-modules/pyscreenshot { };
|
||||
|
||||
pyside = callPackage ../development/python-modules/pyside {
|
||||
inherit (pkgs) mesa;
|
||||
};
|
||||
@ -1155,12 +1159,16 @@ in {
|
||||
|
||||
pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
|
||||
|
||||
pytest-qt = callPackage ../development/python-modules/pytest-qt { };
|
||||
|
||||
pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
|
||||
|
||||
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
|
||||
|
||||
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
|
||||
|
||||
pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { };
|
||||
|
||||
pytmx = callPackage ../development/python-modules/pytmx { };
|
||||
|
||||
python-binance = callPackage ../development/python-modules/python-binance { };
|
||||
@ -5264,6 +5272,8 @@ in {
|
||||
|
||||
tiros = callPackage ../development/python-modules/tiros { };
|
||||
|
||||
tinydb = callPackage ../development/python-modules/tinydb { };
|
||||
|
||||
tifffile = callPackage ../development/python-modules/tifffile { };
|
||||
|
||||
tmdb3 = callPackage ../development/python-modules/tmdb3 { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user