Merge branch 'master' into staging-next
This commit is contained in:
Jan Tojnar
commit
83442a3533
@ -6466,6 +6466,12 @@
|
||||
fingerprint = "86E6 792F C27B FD47 8860 C110 91F3 B339 B9A0 2A3D";
|
||||
}];
|
||||
};
|
||||
psanford = {
|
||||
email = "psanford@sanford.io";
|
||||
github = "psanford";
|
||||
githubId = 33375;
|
||||
name = "Peter Sanford";
|
||||
};
|
||||
pshendry = {
|
||||
email = "paul@pshendry.com";
|
||||
github = "pshendry";
|
||||
|
||||
@ -29,7 +29,7 @@ let
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Base64 private key generated by wg genkey.
|
||||
Base64 private key generated by <command>wg genkey</command>.
|
||||
|
||||
Warning: Consider using privateKeyFile instead if you do not
|
||||
want to store the key in the world-readable Nix store.
|
||||
@ -41,7 +41,7 @@ let
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Private key file as generated by wg genkey.
|
||||
Private key file as generated by <command>wg genkey</command>.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -106,9 +106,9 @@ let
|
||||
description = ''
|
||||
The kernel routing table to add this interface's
|
||||
associated routes to. Setting this is useful for e.g. policy routing
|
||||
("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric
|
||||
table IDs and table names (/etc/rt_tables) can be used. Defaults to
|
||||
"main".
|
||||
("ip rule") or virtual routing and forwarding ("ip vrf"). Both
|
||||
numeric table IDs and table names (/etc/rt_tables) can be used.
|
||||
Defaults to "main".
|
||||
'';
|
||||
};
|
||||
|
||||
@ -139,7 +139,7 @@ let
|
||||
publicKey = mkOption {
|
||||
example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
|
||||
type = types.str;
|
||||
description = "The base64 public key the peer.";
|
||||
description = "The base64 public key to the peer.";
|
||||
};
|
||||
|
||||
presharedKey = mkOption {
|
||||
@ -147,8 +147,8 @@ let
|
||||
example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
|
||||
type = with types; nullOr str;
|
||||
description = ''
|
||||
Base64 preshared key generated by wg genpsk. Optional,
|
||||
and may be omitted. This option adds an additional layer of
|
||||
Base64 preshared key generated by <command>wg genpsk</command>.
|
||||
Optional, and may be omitted. This option adds an additional layer of
|
||||
symmetric-key cryptography to be mixed into the already existing
|
||||
public-key cryptography, for post-quantum resistance.
|
||||
|
||||
@ -162,8 +162,8 @@ let
|
||||
example = "/private/wireguard_psk";
|
||||
type = with types; nullOr str;
|
||||
description = ''
|
||||
File pointing to preshared key as generated by wg pensk. Optional,
|
||||
and may be omitted. This option adds an additional layer of
|
||||
File pointing to preshared key as generated by <command>wg genpsk</command>.
|
||||
Optional, and may be omitted. This option adds an additional layer of
|
||||
symmetric-key cryptography to be mixed into the already existing
|
||||
public-key cryptography, for post-quantum resistance.
|
||||
'';
|
||||
|
||||
@ -91,11 +91,13 @@ let
|
||||
table = mkOption {
|
||||
default = "main";
|
||||
type = types.str;
|
||||
description = ''The kernel routing table to add this interface's
|
||||
associated routes to. Setting this is useful for e.g. policy routing
|
||||
("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric
|
||||
table IDs and table names (/etc/rt_tables) can be used. Defaults to
|
||||
"main".'';
|
||||
description = ''
|
||||
The kernel routing table to add this interface's
|
||||
associated routes to. Setting this is useful for e.g. policy routing
|
||||
("ip rule") or virtual routing and forwarding ("ip vrf"). Both
|
||||
numeric table IDs and table names (/etc/rt_tables) can be used.
|
||||
Defaults to "main".
|
||||
'';
|
||||
};
|
||||
|
||||
peers = mkOption {
|
||||
@ -174,7 +176,7 @@ let
|
||||
example = "/private/wireguard_psk";
|
||||
type = with types; nullOr str;
|
||||
description = ''
|
||||
File pointing to preshared key as generated by <command>wg pensk</command>.
|
||||
File pointing to preshared key as generated by <command>wg genpsk</command>.
|
||||
Optional, and may be omitted. This option adds an additional layer of
|
||||
symmetric-key cryptography to be mixed into the already existing
|
||||
public-key cryptography, for post-quantum resistance.
|
||||
@ -217,7 +219,6 @@ let
|
||||
|
||||
};
|
||||
|
||||
|
||||
generatePathUnit = name: values:
|
||||
assert (values.privateKey == null);
|
||||
assert (values.privateKeyFile != null);
|
||||
|
||||
@ -28,7 +28,7 @@ in
|
||||
(
|
||||
lib.mkRemovedOptionModule
|
||||
[ "virtualisation" "containers" "users" ]
|
||||
"All users with `isNormaUser = true` set now get appropriate subuid/subgid mappings."
|
||||
"All users with `isNormalUser = true` set now get appropriate subuid/subgid mappings."
|
||||
)
|
||||
];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BSEQuencer";
|
||||
version = "1.4.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
sha256 = "1fz0p0ba00b7k7a8q9mxwj01jwl8xwh9a2npn00pbbdrg9zv4fdr";
|
||||
sha256 = "0w21kzq695xy4i1r6xvvh7sad5m0rlmdgc7ykmrlzfsm1252dz80";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, intltool
|
||||
, gettext
|
||||
, json_c
|
||||
, lcms2
|
||||
, libpng
|
||||
@ -20,18 +20,18 @@ let
|
||||
inherit (python3.pkgs) pycairo pygobject3 numpy buildPythonApplication;
|
||||
in buildPythonApplication rec {
|
||||
pname = "mypaint";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mypaint";
|
||||
repo = "mypaint";
|
||||
rev = "v${version}";
|
||||
sha256 = "180kyilhf81ndhwl1hlvy82gh6hxpcvka2d1nkghbpgy431rls6r";
|
||||
sha256 = "rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
gettext
|
||||
pkgconfig
|
||||
swig
|
||||
wrapGAppsHook
|
||||
|
||||
@ -83,6 +83,7 @@ let
|
||||
eventviews = callPackage ./eventviews.nix {};
|
||||
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
|
||||
filelight = callPackage ./filelight.nix {};
|
||||
granatier = callPackage ./granatier.nix {};
|
||||
grantleetheme = callPackage ./grantleetheme {};
|
||||
gwenview = callPackage ./gwenview.nix {};
|
||||
incidenceeditor = callPackage ./incidenceeditor.nix {};
|
||||
|
||||
23
pkgs/applications/kde/granatier.nix
Normal file
23
pkgs/applications/kde/granatier.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ mkDerivation, lib
|
||||
, libkdegames, extra-cmake-modules
|
||||
, kdeclarative, knewstuff
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "granatier";
|
||||
meta = with lib; {
|
||||
homepage = "https://kde.org/applications/en/games/org.kde.granatier";
|
||||
description = "Granatier is a clone of the classic Bomberman game";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
kdeclarative
|
||||
knewstuff
|
||||
libkdegames
|
||||
];
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdfarranger";
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeromerobert";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0a9ap7p8iw57sn5nmhim7gp5as8gj6ir6l3p0bpmg4iqjsr4169h";
|
||||
sha256 = "03siz4ar6flyvrrgh7hr7sslc6n9x5d9i13lc5rm2qnssd0qdich";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec {
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
pikepdf
|
||||
img2pdf
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,16 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asuka";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "10hmsdwf2nrsmpycqa08vd31c6vhx7w5fhvv5a9f92sqp0lcavf0";
|
||||
sha256 = "07i80qmdpwfdgwrk1gzs10wln91v23qjrsk0x134xf5mjnakxc06";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "0csj63x77nkdh543pzl9cbaip6xp8anw0942hc6j19y7yicd29ns";
|
||||
cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ let
|
||||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
pname = "flashplayer-ppapi";
|
||||
version = "32.0.0.387";
|
||||
version = "32.0.0.403";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1igs8nh3zpfcps97ahzh7kknx3rddh6yliig8lxf6jskbpf0qgzf";
|
||||
sha256 = "1xirngiqypylgm8f3ddvny2ghqxgj8i98bm1carcj2vryw53wwal";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flashplayer";
|
||||
version = "32.0.0.387";
|
||||
version = "32.0.0.403";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 =
|
||||
if debug then
|
||||
if arch == "x86_64" then
|
||||
"1wmk60lnlrj9f8dvk4b6j7pqyl00w00qbzbdw4awzx91wmgfc4x0"
|
||||
"0nx0fxa6l438hvzgsxa561nrin8lx7l9ccqscjn9mdg42yw36k63"
|
||||
else
|
||||
"1afjxhi5jzn8zbkva940i9fayzxj1r3n6rqsiny02fpnv0waypfy"
|
||||
"0vbg4ijsbmn71kq5mynx0hfhazy10ghcxsxwbwaxdl11ilxikrli"
|
||||
else
|
||||
if arch == "x86_64" then
|
||||
"0si8rx955kyfsprk5465hfzafxvrdm7g686q7p5xykmh88nck6k2"
|
||||
"1paz9y3pcisw5ck3v6a740sr7plmsbg6bjqrj2yfqdixf95fk2pl"
|
||||
else
|
||||
"02pw2knvgdkahyp7lmy7fmynmplaz5wswdz48h3sdj6ibr066h97";
|
||||
"1b2r20yc94ibsw0vpr6xl1x1vbjgjw6qzxzr374ppck8famikyj2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "flashplayer-standalone";
|
||||
version = "32.0.0.387";
|
||||
version = "32.0.0.403";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@ -60,9 +60,9 @@ stdenv.mkDerivation {
|
||||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
|
||||
sha256 =
|
||||
if debug then
|
||||
"1yxdwmm2gz162rmc9hwlccqgq613gnrihjicnzgan4vk7hjlga5y"
|
||||
"164cah1h78vs068y19v0c40243sy2ip1n4jc6qvzv9acawy12ckw"
|
||||
else
|
||||
"0hm5is3giz45a4v9m77q0i1dgyhpqqkagpjndbnynsnl9a61r0ly";
|
||||
"0508jzaji3z52dyp49xx2m7impz1fdpp20af0h8dwdph1q3mxn32";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
27
pkgs/applications/networking/cluster/kpt/default.nix
Normal file
27
pkgs/applications/networking/cluster/kpt/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kpt";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1l5mpml6pf37b76wdq6il00k5q6rvw9ds7807m103k27p7pcqgdx";
|
||||
};
|
||||
|
||||
vendorSha256 = "1yb6dwbnimqfamdg57vq68q853fq04qfnh3sfbjg82sd8pz8069g";
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/{mdtogo,formula}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files";
|
||||
homepage = "https://googlecontainertools.github.io/kpt/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mikefaille ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rssguard";
|
||||
version = "3.6.2";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dx7gcmrjyi115lf6d36i129zmxfb16z7wy4ff8z9m65paci24mw";
|
||||
sha256 = "1maiazjsnjalx09rq1l84kd86s48cvljnwynv4rj6cln1h0al030";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
|
||||
, qtwebengine
|
||||
# Runtime
|
||||
, coreutils, libjpeg_turbo, pciutils, procps, utillinux
|
||||
, coreutils, libjpeg_turbo, faac, pciutils, procps, utillinux
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
@ -40,7 +40,7 @@ in mkDerivation {
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo qtbase
|
||||
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo faac qtbase
|
||||
qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2
|
||||
qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
|
||||
];
|
||||
@ -72,6 +72,9 @@ in mkDerivation {
|
||||
# TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd
|
||||
ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $out/share/zoom-us/libturbojpeg.so
|
||||
|
||||
# Again, requires faac with a nonstandard filename.
|
||||
ln -s $(readlink -e "${faac}/lib/libfaac.so") $out/share/zoom-us/libfaac1.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -32,16 +32,26 @@ perlPackages.buildPerlPackage rec {
|
||||
patchShebangs script/convos
|
||||
'';
|
||||
|
||||
# A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in
|
||||
# the sandbox, we replace the this out from a substitution expression
|
||||
#
|
||||
# Module::Install is a runtime dependency not covered by the tests, so we add
|
||||
# a test for it.
|
||||
#
|
||||
preCheck = ''
|
||||
# A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in
|
||||
# the sandbox, we replace the this out from a substitution expression
|
||||
#
|
||||
substituteInPlace t/web-register-open-to-public.t \
|
||||
--replace '!127.0.0.1!' '!localhost!'
|
||||
|
||||
# Time-impurity in test, (fixed in master)
|
||||
#
|
||||
substituteInPlace t/web-load-user.t \
|
||||
--replace '400' '410'
|
||||
|
||||
# Disk-space check fails on zfs, (fixed in master)
|
||||
#
|
||||
substituteInPlace t/web-admin.t \
|
||||
--replace 'qr{/dev/}' 'qr{\w}'
|
||||
|
||||
# Module::Install is a runtime dependency not covered by the tests, so we add
|
||||
# a test for it.
|
||||
#
|
||||
echo "use Test::More tests => 1;require_ok('Module::Install')" \
|
||||
> t/00_nixpkgs_module_install.t
|
||||
'';
|
||||
|
||||
@ -27,12 +27,12 @@ let
|
||||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8";
|
||||
version = "2.9";
|
||||
pname = "weechat";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
|
||||
sha256 = "0xpzl7985j47rpmly4r833jxd448xpy7chqphaxmhlql2c0gc08z";
|
||||
sha256 = "12h4m4ag8cdab7q6f5n357mfg0fdayab1gcikncjkkid3bjd4r4g";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, installShellFiles,
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, installShellFiles,
|
||||
qmake, qtbase, poppler, qtmultimedia }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "beamerpresenter";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stiglers-eponym";
|
||||
repo = "BeamerPresenter";
|
||||
rev = "v${version}";
|
||||
sha256 = "0j7wx3qqwhda33ig2464bi0j0a473y5p7ndy5f7f8x9cqdal1d01";
|
||||
sha256 = "12xngnhwa3haf0pdxczgvhq1j20zbsr30y2bfn9qwmlhbwklhkj2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake installShellFiles ];
|
||||
@ -26,23 +26,10 @@ mkDerivation rec {
|
||||
installPhase = ''
|
||||
install -m755 beamerpresenter -Dt $out/bin/
|
||||
install -m644 src/icons/beamerpresenter.svg -Dt $out/share/icons/hicolor/scalable/apps/
|
||||
install -m644 $desktopItem/share/applications/*.desktop -Dt $out/share/applications/
|
||||
install -m644 share/applications/beamerpresenter.desktop -Dt $out/share/applications/
|
||||
installManPage man/*.{1,5}
|
||||
'';
|
||||
|
||||
# TODO: replace with upstream's .desktop file once available.
|
||||
# https://github.com/stiglers-eponym/BeamerPresenter/pull/4
|
||||
desktopItem = makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = "BeamerPresenter";
|
||||
genericName = "Beamer presentation viewer";
|
||||
comment = "Simple dual screen pdf presentation software";
|
||||
icon = "beamerpresenter";
|
||||
categories = "Office;";
|
||||
exec = "beamerpresenter %F";
|
||||
mimeType = "application/pdf;application/x-pdf;";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple dual screen pdf presentation software";
|
||||
homepage = "https://github.com/stiglers-eponym/BeamerPresenter";
|
||||
|
||||
44
pkgs/applications/radio/dsd/default.nix
Normal file
44
pkgs/applications/radio/dsd/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ stdenv, fetchFromGitHub, cmake
|
||||
, mbelib, libsndfile, itpp
|
||||
, portaudioSupport ? true, portaudio ? null
|
||||
}:
|
||||
|
||||
assert portaudioSupport -> portaudio != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dsd";
|
||||
version = "2018-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "szechyjs";
|
||||
repo = "dsd";
|
||||
rev = "f175834e45a1a190171dff4597165b27d6b0157b";
|
||||
sha256 = "0w4r13sxvjwacdwxr326zr6p77a8p6ny0g6im574jliw5j3shlhr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
mbelib libsndfile itpp
|
||||
] ++ stdenv.lib.optionals portaudioSupport [ portaudio ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Digital Speech Decoder";
|
||||
longDescription = ''
|
||||
DSD is able to decode several digital voice formats from discriminator
|
||||
tap audio and synthesize the decoded speech. Speech synthesis requires
|
||||
mbelib, which is a separate package.
|
||||
'';
|
||||
homepage = https://github.com/szechyjs/dsd;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andrew-d ];
|
||||
};
|
||||
}
|
||||
24
pkgs/applications/science/geometry/gama/default.nix
Normal file
24
pkgs/applications/science/geometry/gama/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gama";
|
||||
version = "2.09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9";
|
||||
};
|
||||
|
||||
buildInputs = [ expat ];
|
||||
|
||||
nativeBuildInputs = [ texinfo ];
|
||||
|
||||
checkInputs = [ octave libxml2 ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib ; {
|
||||
description = "Tools for adjustment of geodetic networks";
|
||||
homepage = "https://www.gnu.org/software/gama/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,19 +1,20 @@
|
||||
{ stdenv, fetchurl, cln, gmp, swig, pkgconfig
|
||||
, readline, libantlr3c, boost, jdk, autoreconfHook
|
||||
, python3, antlr3_4
|
||||
{ stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig
|
||||
, readline, libantlr3c, boost, jdk, python3, antlr3_4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc4";
|
||||
version = "1.6";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz";
|
||||
sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc4";
|
||||
repo = "cvc4";
|
||||
rev = version;
|
||||
sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python3 ];
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ];
|
||||
configureFlags = [
|
||||
"--enable-language-bindings=c,c++,java"
|
||||
"--enable-gpl"
|
||||
@ -30,6 +31,10 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
patchShebangs ./src/
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Production"
|
||||
];
|
||||
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
|
||||
};
|
||||
|
||||
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
patchPhase = stdenv.lib.optionalString stdenv.cc.isClang ''
|
||||
substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
|
||||
'';
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcompare";
|
||||
version = "4.3.4.24657";
|
||||
version = "4.3.5.24893";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
|
||||
sha256 = "031ivmpy0mk43skb30r7p5zwf0m90pmsqhaq5kc08gzy6g4s0wd0";
|
||||
sha256 = "1gm8d6hgdg8f3hd83wqac28gkvz5nyn62wj7x44vmr60dh4i2jfn";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
26
pkgs/data/fonts/3270font/default.nix
Normal file
26
pkgs/data/fonts/3270font/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2.0.4";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "3270font-${version}";
|
||||
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_ece94f6.zip";
|
||||
|
||||
sha256 = "04q7dnrlq5hm30iibh3jafb33m5lwsgb3g9n9i188sg02ydkrsl9";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Monospaced font based on IBM 3270 terminals";
|
||||
homepage = "https://github.com/rbanffy/3270font";
|
||||
license = [ licenses.bsd3 licenses.ofl ];
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
28
pkgs/data/fonts/barlow/default.nix
Normal file
28
pkgs/data/fonts/barlow/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "1.422";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "barlow-${version}";
|
||||
|
||||
url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip";
|
||||
|
||||
sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot
|
||||
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
|
||||
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A grotesk variable font superfamily";
|
||||
homepage = "https://tribby.com/fonts/barlow/";
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "coq${coq.coq-version}-math-classes-${version}";
|
||||
version = "8.9.1";
|
||||
version = "8.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coq-community";
|
||||
repo = "math-classes";
|
||||
rev = version;
|
||||
sha256 = "1lw89js07m1wcaycpnyd85sf0snil2rrsfmry9lna2x66ah1mzn5";
|
||||
sha256 = "1hjgncvm1m46lw6264w4dqsy8dbh74vhmzq52x0fba2yqlvy94sf";
|
||||
};
|
||||
|
||||
buildInputs = [ coq bignums ];
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" ];
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
31
pkgs/development/libraries/audio/mbelib/default.nix
Normal file
31
pkgs/development/libraries/audio/mbelib/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mbelib";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "szechyjs";
|
||||
repo = "mbelib";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v6b7nf8fgxy7vzgcwffqyql5zhldrz30c88k1ylbjp78hwh4rif";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "P25 Phase 1 and ProVoice vocoder";
|
||||
homepage = https://github.com/szechyjs/mbelib;
|
||||
license = licenses.isc;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andrew-d ];
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flatbuffers";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flatbuffers";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gl8pnykzifh7pnnvl80f5prmj5ga60dp44inpv9az2k9zaqx3qr";
|
||||
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
|
||||
};
|
||||
|
||||
preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
|
||||
@ -36,12 +36,4 @@ stdenv.mkDerivation (rec {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
homepage = "https://google.github.io/flatbuffers/";
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
|
||||
# Remove when updating to the next version.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/flatbuffers/commit/2b52494047fb6e97af03e1801b42adc7ed3fd78a.diff";
|
||||
sha256 = "01k07ws0f4w7nnl8nli795wgjm4p94lxd3kva4yf7nf3pg4p8arx";
|
||||
})
|
||||
];
|
||||
})
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, libunwind }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gperftools-2.7";
|
||||
name = "gperftools-2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz";
|
||||
sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y";
|
||||
sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394";
|
||||
};
|
||||
|
||||
# tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "20.1.1";
|
||||
version = "20.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "1mww20c9r7a57njqa2835ayjvk46lrv2yks9a2y8i0s5qzdi8m1i";
|
||||
sha256 = "02a9wm7cz0nkpyfwic4a0dfm9bx1d2sybgh5rv0c618pl41mla33";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
# Un-deprecate virtual method to restore binary compatibility.
|
||||
(assert !(lib.versionOlder "5.72" self.version); fetchpatch {
|
||||
url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff";
|
||||
sha256 = "06h9g04syv6x3hqi0iy9wll78yf9ys95r5vm104sc25pnszvjbxv";
|
||||
sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcrafter";
|
||||
version = "0.3";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
|
||||
sha256 = "04lpmshh4wb1dav03p6rnskpd1zmmvhv80xwn8v7l8faps5gvjp4";
|
||||
sha256 = "1d2vgxawdwk2zg3scxclxdby1rhghmivly8azdjja89kw7gls9xl";
|
||||
};
|
||||
|
||||
preConfigure = "cd libcrafter";
|
||||
|
||||
@ -5,20 +5,23 @@
|
||||
, gnutls
|
||||
, nettle
|
||||
, pkgconfig
|
||||
, libiconv
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfilezilla";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0ylgxw1lxdqvayy5285mlfrkr9cvsgasy2zci6g6mv9rng261xn5";
|
||||
sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ gettext gnutls nettle ];
|
||||
buildInputs = [ gettext gnutls nettle ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -27,6 +30,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
|
||||
, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
|
||||
, libpsm2, libfabric, pmix
|
||||
, libpsm2, libfabric, pmix, ucx
|
||||
|
||||
# Enable CUDA support
|
||||
, cudaSupport ? false, cudatoolkit ? null
|
||||
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = with stdenv; [ gfortran zlib ]
|
||||
++ lib.optionals isLinux [ libnl numactl pmix ]
|
||||
++ lib.optionals isLinux [ libnl numactl pmix ucx ]
|
||||
++ lib.optionals cudaSupport [ cudatoolkit ]
|
||||
++ [ libevent hwloc ]
|
||||
++ lib.optional (isLinux || isFreeBSD) rdma-core
|
||||
|
||||
@ -158,6 +158,7 @@ let
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ../modules/qtscript.nix {};
|
||||
qtsensors = callPackage ../modules/qtsensors.nix {};
|
||||
qtserialbus = callPackage ../modules/qtserialbus.nix {};
|
||||
qtserialport = callPackage ../modules/qtserialport.nix {};
|
||||
qtspeech = callPackage ../modules/qtspeech.nix {};
|
||||
qtsvg = callPackage ../modules/qtsvg.nix {};
|
||||
|
||||
6
pkgs/development/libraries/qt-5/modules/qtserialbus.nix
Normal file
6
pkgs/development/libraries/qt-5/modules/qtserialbus.nix
Normal file
@ -0,0 +1,6 @@
|
||||
{ qtModule, qtbase, qtserialport }:
|
||||
|
||||
qtModule {
|
||||
name = "qtserialbus";
|
||||
qtInputs = [ qtbase qtserialport ];
|
||||
}
|
||||
@ -1,42 +1,49 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, ninja
|
||||
, bzip2, lz4, snappy, zlib, zstd
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, bzip2
|
||||
, lz4
|
||||
, snappy
|
||||
, zlib
|
||||
, zstd
|
||||
, enableLite ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "6.4.6";
|
||||
version = "6.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s0n4p1b4jzmslz9d2xd4ajra0m6l9x26mjwlbgw0klxjggmy8qn";
|
||||
sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
buildInputs = [ bzip2 lz4 snappy zlib zstd ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/facebook/rocksdb/pull/6076
|
||||
# Without this change private dependencies are exported.
|
||||
# Can be removed after the next release.
|
||||
# https://github.com/facebook/rocksdb/pull/6790
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebook/rocksdb/commit/c0be4b2ff1a5393419673fab961cb9b09ba38752.diff";
|
||||
sha256 = "1f2wg9kqlmf2hiiihmbp8m5fr2wnn7896g6i9yg9hdgi40pw30w6";
|
||||
url = "https://github.com/facebook/rocksdb/commit/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch";
|
||||
sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB "
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORTABLE=1"
|
||||
"-DWITH_JEMALLOC=0"
|
||||
"-DWITH_JNI=0"
|
||||
"-DWITH_TESTS=0"
|
||||
"-DWITH_BENCHMARK_TOOLS=0"
|
||||
"-DWITH_TESTS=1"
|
||||
"-DWITH_TOOLS=0"
|
||||
"-DWITH_BZ2=1"
|
||||
"-DWITH_LZ4=1"
|
||||
|
||||
55
pkgs/development/libraries/science/math/itpp/default.nix
Normal file
55
pkgs/development/libraries/science/math/itpp/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, gtest
|
||||
, blas
|
||||
, fftw
|
||||
, liblapack
|
||||
, gfortran
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "it++";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/itpp/itpp-${version}.tar.bz2";
|
||||
sha256 = "0xxqag9wi0lg78xgw7b40rp6wxqp5grqlbs9z0ifvdfzqlhpcwah";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
buildInputs = [
|
||||
fftw
|
||||
liblapack
|
||||
|
||||
# NOTE: OpenBLAS doesn't work here because IT++ doesn't pass aligned
|
||||
# buffers, which causes segfaults in the optimized kernels :-(
|
||||
blas
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBLAS_FOUND:BOOL=TRUE"
|
||||
"-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so"
|
||||
"-DLAPACK_FOUND:BOOL=TRUE"
|
||||
"-DLAPACK_LIBRARIES:STRING=${liblapack}/lib/liblapack.so"
|
||||
"-DGTEST_DIR:PATH=${gtest.src}/googletest"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/itpp
|
||||
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/itpp
|
||||
./gtests/itpp_gtests
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions.";
|
||||
homepage = http://itpp.sourceforge.net/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andrew-d ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv , fetchurl , blas , gfortran , lapack , python }:
|
||||
{ stdenv , darwin , fetchurl , blas , gfortran , lapack , python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "petsc";
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
--replace /bin/sh /usr/bin/python
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace config/install.py \
|
||||
--replace /usr/bin/install_name_tool install_name_tool
|
||||
--replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "ucx-${version}";
|
||||
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
|
||||
owner = "openucx";
|
||||
repo = "ucx";
|
||||
rev = "v${version}";
|
||||
sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h";
|
||||
sha256 = "0yfnx4shgydkp447kipavjzgl6z58jan6l7znhdi8ry4zbgk568a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook doxygen ];
|
||||
|
||||
@ -146,6 +146,7 @@
|
||||
, "purescript-language-server"
|
||||
, "purescript-psa"
|
||||
, "purty"
|
||||
, "pyright"
|
||||
, "react-native-cli"
|
||||
, "react-tools"
|
||||
, "reveal.js"
|
||||
|
||||
1409
pkgs/development/node-packages/node-packages.nix
generated
1409
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ lib, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio }:
|
||||
{ stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }:
|
||||
|
||||
buildPerlPackage rec {
|
||||
pname = "strip-nondeterminism";
|
||||
@ -17,6 +17,7 @@ buildPerlPackage rec {
|
||||
# stray test failure
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
|
||||
buildInputs = [ ArchiveZip ArchiveCpio file ];
|
||||
|
||||
perlPostHook = ''
|
||||
@ -25,7 +26,11 @@ buildPerlPackage rec {
|
||||
rm $out/share/man/man1/dh_strip_nondeterminism.1.gz
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/strip-nondeterminism
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Perl module for stripping bits of non-deterministic information";
|
||||
homepage = "https://reproducible-builds.org/";
|
||||
license = licenses.gpl3;
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ stdenv, python3Packages }:
|
||||
{ lib, pillow, fetchPypi, buildPythonPackage, isPy27 }:
|
||||
|
||||
with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "img2pdf";
|
||||
version = "0.3.6";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@ -15,7 +14,7 @@ buildPythonApplication rec {
|
||||
pillow
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Convert images to PDF via direct JPEG inclusion";
|
||||
homepage = "https://gitlab.mister-muffin.de/josch/img2pdf";
|
||||
license = licenses.lgpl2;
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030";
|
||||
sha256 = "0qrgyn0znpib485hk0mi68wab6nhwqd3pyjxvp7jn6kijr7mszc0";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest glibcLocales tox pytestcov ];
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "limnoria";
|
||||
version = "2020.04.11";
|
||||
version = "2020.07.01";
|
||||
disabled = isPy27; # abandoned upstream
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "41e27cae66aeb1e811bebe64140a9b5eb3ccb208103a0f42ac61369d9a7ca339";
|
||||
sha256 = "08q8krq8dqlvzz3wjgnki3n8d8qmk99pn7n3lfsim5rnrnx1jchb";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -21,17 +21,10 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
# Run the test suite.
|
||||
# It requires the build path to be in the python search path.
|
||||
checkPhase = ''
|
||||
pushd $out
|
||||
${python}/bin/${python.executable} <<EOF
|
||||
import sys
|
||||
import numexpr
|
||||
r = numexpr.test()
|
||||
if not r.wasSuccessful():
|
||||
sys.exit(1)
|
||||
EOF
|
||||
runtest="$(pwd)/numexpr/tests/test_numexpr.py"
|
||||
pushd "$out"
|
||||
${python}/bin/${python.executable} "$runtest"
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "14zsgapc18r0xccld21jalk50i6xa0bgd56a0l8kamffhf0jnifk";
|
||||
sha256 = "0644hzb7cpcqksl7j6v11dcq26la7g5l1svkmgm9c674gbv7argv";
|
||||
};
|
||||
|
||||
vendorSha256 = "0k14inpxg4qd28kg9n58n1hj40bzzqb1ywhiw9cb9az4j0xaa3hi";
|
||||
vendorSha256 = "1khb8rdy5agj904nig6dfhagckvfcx79f028wcvwr625la3pcjfc";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -13,8 +13,7 @@ buildGoModule rec {
|
||||
sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
vendorSha256 = "0qqkaskmyxgwv9qg3y5lckqf6nchn3bxp69fyqdbvki65p445608";
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "internal" ];
|
||||
|
||||
@ -34,4 +33,3 @@ buildGoModule rec {
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.28.1";
|
||||
version = "1.28.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "18rhd5baqg68wsil8rqzg1yiqys4y53lqy8gcp68wn4i4jnvkgsm";
|
||||
sha256 = "0bjjdr8nxbn2h23x62sywbiv5y4rpk3xg7lk6lkbvmn7625brfvx";
|
||||
};
|
||||
|
||||
vendorSha256 = "0dg3rjzkvzh4n7r4kp68qhg96ijqks9hkz1cjcc02xa38ygma7gz";
|
||||
vendorSha256 = "15wl6xblwyqs7pbbi2yy3y0ysj0k34qf05jfh69k9i9xf9k8hp6a";
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
pname = "visualvm";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx";
|
||||
sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jo";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpmens";
|
||||
repo = "jo";
|
||||
rev = version;
|
||||
sha256 ="11miqg0i83drwkn66b4333vhfdw62al11dyfgp30alg6pcab3icl";
|
||||
sha256 ="1jnv3g38vaa66m83hqibyki31ii81xfpvjw6wgdv18ci3iwvsz3v";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "k6";
|
||||
version = "0.26.2";
|
||||
version = "0.27.0";
|
||||
|
||||
goPackagePath = "github.com/loadimpact/k6";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "loadimpact";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s5haycpfnfyvxxhhm7205gzylsbjndx9f134f245p4xm5bxhxbf";
|
||||
sha256 = "15p81bv9z1nxixvwnfqynycwxvla3f1ldxnj9invna1sjx7lx3qq";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, zstd, jre }:
|
||||
{ stdenv, requireFile, makeDesktopItem, libicns, imagemagick, jre, fetchzip }:
|
||||
|
||||
let
|
||||
version = "5.3.0";
|
||||
version = "5.6.1";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "stm32CubeMX";
|
||||
exec = "stm32cubemx";
|
||||
@ -14,32 +14,19 @@ stdenv.mkDerivation rec {
|
||||
pname = "stm32cubemx";
|
||||
inherit version;
|
||||
|
||||
src = requireFile rec {
|
||||
name = "STM32CubeMX.tar.zst";
|
||||
message = ''
|
||||
Unfortunately, we cannot download file ${name} automatically.
|
||||
Please proceed with the following steps to download and add it to the Nix
|
||||
store yourself:
|
||||
|
||||
1. get en.STM32CubeMX_${builtins.replaceStrings ["."] ["-"] version}.zip
|
||||
2. unzip en.STM32CubeMX_${builtins.replaceStrings ["."] ["-"] version}.zip
|
||||
3. run the setup: java -jar SetupSTM32CubeMX-${version}.exe
|
||||
4. create a tar from created folder: tar --zstd -cf ${name} STM32CubeMX
|
||||
5. add the result to the store: nix-prefetch-url file://\$PWD/${name}
|
||||
|
||||
Notice: The setup will quit with an error about /bin/chmod
|
||||
'';
|
||||
sha256 = "1r5k5wmsvw1w2nfs3nb4gc6pb3j0x6bqljn9jzc4r8y5bxc34rr8";
|
||||
src = fetchzip {
|
||||
url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "1y4a340wcjl88kjw1f1x85ffp4b5g1psryn9mgkd717w2bfpf29l";
|
||||
stripRoot= false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libicns imagemagick zstd ];
|
||||
nativeBuildInputs = [ libicns imagemagick ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/{bin,opt,share/applications}
|
||||
|
||||
tar --extract --zstd --file $src --directory $out/opt/
|
||||
mkdir -p $out/{bin,opt/STM32CubeMX,share/applications}
|
||||
cp -r $src/. $out/opt/STM32CubeMX/
|
||||
chmod +rx $out/opt/STM32CubeMX/STM32CubeMX.exe
|
||||
|
||||
cat << EOF > $out/bin/${pname}
|
||||
#!${stdenv.shell}
|
||||
${jre}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX.exe
|
||||
@ -63,7 +50,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''
|
||||
description = "A graphical tool for configuring STM32 microcontrollers and microprocessors";
|
||||
longDescription = ''
|
||||
A graphical tool that allows a very easy configuration of STM32
|
||||
microcontrollers and microprocessors, as well as the generation of the
|
||||
corresponding initialization C code for the Arm® Cortex®-M core or a
|
||||
|
||||
@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
name = "steam-runtime";
|
||||
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/
|
||||
version = "0.20200417.0";
|
||||
version = "0.20200604.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
|
||||
sha256 = "0d4dfl6i31i8187wj8rr9yvmrg32bx96bsgs2ya21b00czf070sy";
|
||||
sha256 = "04ficg3lnf6ijwkj08094vgcsskfncnlhk61v2csls3wfwvkrmhv";
|
||||
name = "scout-runtime-${version}.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -440,6 +440,18 @@ self: super: {
|
||||
passthru.python3Dependencies = ps: with ps; [ jedi ];
|
||||
});
|
||||
|
||||
ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs(old: {
|
||||
dependencies = with super; [ neoinclude-vim ];
|
||||
});
|
||||
|
||||
ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs(old: {
|
||||
dependencies = with super; [ neosnippet-vim ];
|
||||
});
|
||||
|
||||
ncm2-syntax = super.ncm2-syntax.overrideAttrs(old: {
|
||||
dependencies = with super; [ neco-syntax ];
|
||||
});
|
||||
|
||||
ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
|
||||
dependencies = with super; [ ultisnips ];
|
||||
});
|
||||
|
||||
@ -81,6 +81,7 @@ dhruvasagar/vim-table-mode
|
||||
digitaltoad/vim-pug
|
||||
direnv/direnv.vim
|
||||
dleonard0/pony-vim-syntax
|
||||
dmix/elvish.vim
|
||||
dracula/vim
|
||||
drewtempelmeyer/palenight.vim
|
||||
drmingdrmer/xptemplate
|
||||
@ -130,7 +131,9 @@ guns/vim-clojure-highlight
|
||||
guns/vim-clojure-static
|
||||
guns/vim-sexp
|
||||
guns/xterm-color-table.vim
|
||||
hashivim/vim-packer
|
||||
hashivim/vim-terraform
|
||||
hashivim/vim-vagrant
|
||||
haya14busa/incsearch-easymotion.vim
|
||||
haya14busa/incsearch.vim
|
||||
haya14busa/is.vim
|
||||
@ -188,6 +191,7 @@ jsfaint/gen_tags.vim
|
||||
JuliaEditorSupport/deoplete-julia
|
||||
JuliaEditorSupport/julia-vim
|
||||
Julian/vim-textobj-variable-segment
|
||||
juliosueiras/vim-terraform-completion
|
||||
junegunn/fzf.vim
|
||||
junegunn/goyo.vim
|
||||
junegunn/gv.vim
|
||||
@ -314,10 +318,19 @@ nbouscal/vim-stylish-haskell
|
||||
ncm2/float-preview.nvim
|
||||
ncm2/ncm2
|
||||
ncm2/ncm2-bufword
|
||||
ncm2/ncm2-cssomni
|
||||
ncm2/ncm2-github
|
||||
ncm2/ncm2-html-subscope
|
||||
ncm2/ncm2-jedi
|
||||
ncm2/ncm2-markdown-subscope
|
||||
ncm2/ncm2-neoinclude
|
||||
ncm2/ncm2-neosnippet
|
||||
ncm2/ncm2-path
|
||||
ncm2/ncm2-syntax
|
||||
ncm2/ncm2-tagprefix
|
||||
ncm2/ncm2-tmux
|
||||
ncm2/ncm2-ultisnips
|
||||
ncm2/ncm2-vim
|
||||
ndmitchell/ghcid
|
||||
neoclide/coc-css
|
||||
neoclide/coc-denite
|
||||
@ -595,5 +608,6 @@ xolox/vim-misc
|
||||
xuhdev/vim-latex-live-preview
|
||||
ycm-core/YouCompleteMe
|
||||
Yggdroot/indentLine
|
||||
yuki-ycino/ncm2-dictionary
|
||||
zah/nim.vim
|
||||
ziglang/zig.vim
|
||||
|
||||
26
pkgs/os-specific/linux/sd-switch/default.nix
Normal file
26
pkgs/os-specific/linux/sd-switch/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sd-switch";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "rycee";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0njihfqvvp4lm2572sw5xadwg3nrvx2i1qrfm7fi0i3v5pxdc7g0";
|
||||
};
|
||||
|
||||
cargoSha256 = "0ba2j0v2z90fivwdr5akdrsz9f479gz20yh85yiy05rkjhjy8cvv";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A systemd unit switcher for Home Manager";
|
||||
homepage = "https://gitlab.com/rycee/sd-switch";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ rycee ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "etcd";
|
||||
version = "3.4.9";
|
||||
version = "3.4.10";
|
||||
|
||||
#vendorSha256 = null; revert to `null` for > 3.4.9
|
||||
#vendorSha256 = null; revert to `null` for > 3.4.10
|
||||
|
||||
vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z";
|
||||
deleteVendor = true;
|
||||
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
owner = "etcd-io";
|
||||
repo = "etcd";
|
||||
rev = "v${version}";
|
||||
sha256 = "16l4wmnm7mkhpb2vzf6xnhhyx6lj8xx3z6x1bfs05idajnrw824p";
|
||||
sha256 = "07kzgh2rm7kzprlpnay6fq8lziiyhiqyikf1qjx8gjjsdsjy180f";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exim";
|
||||
version = "4.93.0.4";
|
||||
version = "4.94";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.exim.org/pub/exim/exim4/fixes/${pname}-${version}.tar.xz";
|
||||
sha256 = "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak";
|
||||
url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
|
||||
sha256 = "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -92,11 +92,11 @@ stdenv.mkDerivation rec {
|
||||
done )
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://exim.org/";
|
||||
description = "A mail transfer agent (MTA)";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.tv ];
|
||||
license = with licenses; [ gpl2Plus bsd3 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ tv ajs124 das_j ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,6 +64,23 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
analysis-phonetic = esPlugin rec {
|
||||
pluginName = "analysis-phonetic";
|
||||
version = esVersion;
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "0znmbdf99bli4kvyb3vxr5x48yb6n64nl38gpa63iqsv3nlbi0hp"
|
||||
else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-phonetic";
|
||||
description = "The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
};
|
||||
|
||||
discovery-ec2 = esPlugin rec {
|
||||
pluginName = "discovery-ec2";
|
||||
version = esVersion;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslh";
|
||||
version = "1.20";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
|
||||
sha256 = "05jihpjxx094h7hqzgd9v5jmy77ipwrakzzmjyfvpdzw3h59px57";
|
||||
sha256 = "1am63nslvv9xkbn9xavpf1zl6f7g1snz8cvnzlya7dq4la4y97d7";
|
||||
};
|
||||
|
||||
postPatch = "patchShebangs *.sh";
|
||||
|
||||
@ -5,7 +5,7 @@ let
|
||||
name,
|
||||
src,
|
||||
pluginType,
|
||||
configuraPhase ? ":",
|
||||
configurePhase ? ":",
|
||||
buildPhase ? ":",
|
||||
buildInputs ? [ ],
|
||||
...
|
||||
@ -14,7 +14,7 @@ let
|
||||
name = name;
|
||||
|
||||
inherit pluginType;
|
||||
inherit configuraPhase buildPhase;
|
||||
inherit configurePhase buildPhase;
|
||||
|
||||
buildInputs = [ unzip ] ++ buildInputs;
|
||||
|
||||
|
||||
@ -2,23 +2,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "elvish";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
goPackagePath = "github.com/elves/elvish";
|
||||
excludedPackages = [ "website" ];
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X ${goPackagePath}/buildinfo.Version=${version}
|
||||
'';
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/elves/elvish/pkg/buildinfo.Version==${version} -X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elves";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm";
|
||||
sha256 = "1jsxhnm82pjzwvcjq7vrlldyjnv5j6c83a13dj6zphlqq99z68l4";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A friendly and expressive command shell";
|
||||
@ -36,4 +33,4 @@ buildGoModule rec {
|
||||
passthru = {
|
||||
shellPath = "/bin/elvish";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
|
||||
postPatch = ''
|
||||
sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
|
||||
chmod +x install.sh
|
||||
|
||||
# I think this is a typo and should be CXX? Either way let's kill it
|
||||
sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
|
||||
@ -28,7 +29,6 @@ stdenv.mkDerivation rec {
|
||||
# (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar)
|
||||
rm -r CPP/7zip/Compress/Rar*
|
||||
find . -name makefile'*' -exec sed -i '/Rar/d' {} +
|
||||
chmod +x install.sh
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdf2sfd";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcambus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1fhdl739a4v8296wpn2390fhlb6vlg9m1zik7mql4l9008ncd5mv";
|
||||
sha256 = "0v1kkds35qfyv1h5kxc2m7f2gsprg9c7jzpsm3p4f71qn982wry6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||
description = "BDF to SFD converter";
|
||||
homepage = "https://github.com/fcambus/bdf2sfd";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
let
|
||||
version = "4.12";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
commonMeta = with stdenv.lib; {
|
||||
description = "Various coreboot-related tools";
|
||||
homepage = "https://www.coreboot.org";
|
||||
license = licenses.gpl2;
|
||||
@ -12,7 +12,7 @@ let
|
||||
};
|
||||
|
||||
generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec {
|
||||
inherit pname version meta;
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
|
||||
@ -29,7 +29,9 @@ let
|
||||
"INSTALL=install"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
} // args);
|
||||
|
||||
meta = commonMeta // args.meta;
|
||||
} // (removeAttrs args ["meta"]));
|
||||
|
||||
utils = {
|
||||
msrtool = generic {
|
||||
@ -99,6 +101,7 @@ in utils // {
|
||||
paths = stdenv.lib.attrValues utils;
|
||||
postBuild = "rm -rf $out/sbin";
|
||||
}) // {
|
||||
inherit meta version;
|
||||
inherit version;
|
||||
meta = commonMeta;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pistol";
|
||||
version = "0.1.2";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doronbehar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ar8c7s8ihcwrwfspmqw7cb5560wkbdc5qyvddkx8lj03cjhcslj";
|
||||
sha256 = "1x9wb0gj5l71xz15ia0i2hrnhcpf457i21w41jzw2ink2fbdxp3b";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mhxb72fzpa2n88i9h154aci346dgcs2njznkjxchivz28crbqr8";
|
||||
vendorSha256 = "0dg4f9g6895nv3c6d74ijl6hzsyn620ndspbcq7ynvb1z0hsg6iz";
|
||||
|
||||
subPackages = [ "cmd/pistol" ];
|
||||
|
||||
@ -23,10 +23,12 @@ buildGoModule rec {
|
||||
file
|
||||
];
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant";
|
||||
homepage = "https://github.com/doronbehar/pistol";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
23
pkgs/tools/networking/wormhole-william/default.nix
Normal file
23
pkgs/tools/networking/wormhole-william/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wormhole-william";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psanford";
|
||||
repo = "wormhole-william";
|
||||
rev = "v${version}";
|
||||
sha256 = "1v6kw10gqhyd1adj0wwrr5bmpjqbshdnywsrjpqgg9bl61m5j3wr";
|
||||
};
|
||||
|
||||
vendorSha256 = "1niky252gcxai6vz0cx7pvflg530bc1lmcd2wm2hqg6446r1yxsq";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/psanford/wormhole-william";
|
||||
description = "End-to-end encrypted file transfers";
|
||||
changelog = "https://github.com/psanford/wormhole-william/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ psanford ];
|
||||
};
|
||||
}
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "facter";
|
||||
version = "3.14.11";
|
||||
version = "3.14.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1x7m11bda86xkr8mncy50nga9q3gnvnklcvwwpa7frka99kgai26";
|
||||
sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc";
|
||||
rev = version;
|
||||
repo = pname;
|
||||
owner = "puppetlabs";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FanFicFare";
|
||||
version = "3.19.0";
|
||||
version = "3.21.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01cr4941sg6is6k6sajlbr6hs5s47aq9xhp7gadhq4h3x6dilj40";
|
||||
sha256 = "16hklfbww6ibmjr32gg98nlnzl4dwanz6lm3fzg2x3vd7d54m92c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@ -990,6 +990,8 @@ in
|
||||
|
||||
gaia = callPackage ../development/libraries/gaia { };
|
||||
|
||||
gama = callPackage ../applications/science/geometry/gama { };
|
||||
|
||||
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
|
||||
|
||||
gammy = qt5.callPackage ../tools/misc/gammy { };
|
||||
@ -6616,6 +6618,8 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
sd-switch = callPackage ../os-specific/linux/sd-switch { };
|
||||
|
||||
sdate = callPackage ../tools/misc/sdate { };
|
||||
|
||||
sdcv = callPackage ../applications/misc/sdcv { };
|
||||
@ -7540,6 +7544,8 @@ in
|
||||
inherit (xorg) libxkbfile;
|
||||
};
|
||||
|
||||
wormhole-william = callPackage ../tools/networking/wormhole-william { };
|
||||
|
||||
wpscan = callPackage ../tools/security/wpscan { };
|
||||
|
||||
wsmancli = callPackage ../tools/system/wsmancli {};
|
||||
@ -13045,7 +13051,9 @@ in
|
||||
|
||||
libfido2 = callPackage ../development/libraries/libfido2 { };
|
||||
|
||||
libfilezilla = callPackage ../development/libraries/libfilezilla { };
|
||||
libfilezilla = callPackage ../development/libraries/libfilezilla {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
libfishsound = callPackage ../development/libraries/libfishsound { };
|
||||
|
||||
@ -16870,6 +16878,8 @@ in
|
||||
|
||||
dropwatch = callPackage ../os-specific/linux/dropwatch { };
|
||||
|
||||
dsd = callPackage ../applications/radio/dsd { };
|
||||
|
||||
dstat = callPackage ../os-specific/linux/dstat { };
|
||||
|
||||
# unstable until the first 1.x release
|
||||
@ -16995,6 +17005,8 @@ in
|
||||
|
||||
irqbalance = callPackage ../os-specific/linux/irqbalance { };
|
||||
|
||||
itpp = callPackage ../development/libraries/science/math/itpp { };
|
||||
|
||||
iw = callPackage ../os-specific/linux/iw { };
|
||||
|
||||
iwd = callPackage ../os-specific/linux/iwd { };
|
||||
@ -17572,6 +17584,8 @@ in
|
||||
enableCmdlib = true;
|
||||
};
|
||||
|
||||
mbelib = callPackage ../development/libraries/audio/mbelib { };
|
||||
|
||||
mbpfan = callPackage ../os-specific/linux/mbpfan { };
|
||||
|
||||
mdadm = mdadm4;
|
||||
@ -18030,6 +18044,8 @@ in
|
||||
|
||||
### DATA
|
||||
|
||||
_3270font = callPackage ../data/fonts/3270font { };
|
||||
|
||||
adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { };
|
||||
|
||||
adapta-gtk-theme = callPackage ../data/themes/adapta { };
|
||||
@ -18091,6 +18107,8 @@ in
|
||||
|
||||
bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
|
||||
|
||||
barlow = callPackage ../data/fonts/barlow { };
|
||||
|
||||
bgnet = callPackage ../data/documentation/bgnet { };
|
||||
|
||||
bibata-cursors = callPackage ../data/icons/bibata-cursors { };
|
||||
@ -20589,7 +20607,7 @@ in
|
||||
|
||||
inherit (nodePackages) imapnotify;
|
||||
|
||||
img2pdf = callPackage ../applications/misc/img2pdf { };
|
||||
img2pdf = with python3Packages; toPythonApplication img2pdf;
|
||||
|
||||
imgcat = callPackage ../applications/graphics/imgcat { };
|
||||
|
||||
@ -20716,7 +20734,7 @@ in
|
||||
recurseIntoAttrs (makeOverridable mkApplications attrs);
|
||||
|
||||
inherit (kdeApplications)
|
||||
akonadi akregator ark bovo dolphin dragon elisa ffmpegthumbs filelight gwenview k3b
|
||||
akonadi akregator ark bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b
|
||||
kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
|
||||
keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
|
||||
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle;
|
||||
@ -20799,6 +20817,8 @@ in
|
||||
|
||||
kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
|
||||
|
||||
kpt = callPackage ../applications/networking/cluster/kpt { };
|
||||
|
||||
krita = libsForQt5.callPackage ../applications/graphics/krita {
|
||||
openjpeg = openjpeg_1;
|
||||
};
|
||||
|
||||
@ -2433,6 +2433,8 @@ in {
|
||||
|
||||
impacket = callPackage ../development/python-modules/impacket { };
|
||||
|
||||
img2pdf = callPackage ../development/python-modules/img2pdf { };
|
||||
|
||||
jsonlines = callPackage ../development/python-modules/jsonlines { };
|
||||
|
||||
json-merge-patch = callPackage ../development/python-modules/json-merge-patch { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user