Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
9fa8c7670d
46 changed files with 431 additions and 252 deletions
|
|
@ -52,7 +52,7 @@ let
|
|||
};
|
||||
|
||||
type = mkOption {
|
||||
type = types.enum [ "inet" "unix" "fifo" "pass" ];
|
||||
type = types.enum [ "inet" "unix" "unix-dgram" "fifo" "pass" ];
|
||||
default = "unix";
|
||||
example = "inet";
|
||||
description = "The type of the service";
|
||||
|
|
|
|||
|
|
@ -119,15 +119,17 @@ in {
|
|||
# firewall rules before sshguard starts.
|
||||
preStart = optionalString config.networking.firewall.enable ''
|
||||
${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet
|
||||
${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6
|
||||
${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP
|
||||
'' + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
|
||||
${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6
|
||||
${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP
|
||||
'';
|
||||
|
||||
postStop = optionalString config.networking.firewall.enable ''
|
||||
${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP
|
||||
${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
|
||||
${pkgs.ipset}/bin/ipset -quiet destroy sshguard4
|
||||
'' + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
|
||||
${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
|
||||
${pkgs.ipset}/bin/ipset -quiet destroy sshguard6
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ let
|
|||
withCD = config.clementine.cd or true;
|
||||
withCloud = config.clementine.cloud or true;
|
||||
|
||||
# On the update after all 1.4rc, qt5.15 will be supported.
|
||||
version = "1.4.0rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.9.24";
|
||||
version = "1.9.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j";
|
||||
sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "1qbg44cryiv9kvcak6qjrbmkc9bxyk5fybj62vdkskqfjvv86068";
|
||||
vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.17.1.5";
|
||||
version = "0.17.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0";
|
||||
sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "turbo-geth";
|
||||
version = "2020.12.01";
|
||||
version = "2020.12.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0l1qj10vhfkrk66zihz8m24pnyj8jbb65a7amvphp07r199swy2a";
|
||||
sha256 = "0ynnpvpd84qncvzmk4hmq8mn6m14a9p3zg4svijqwlsrr39amp3q";
|
||||
};
|
||||
|
||||
vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr";
|
||||
vendorSha256 = "0sk064iyaxq9ig9xv3h1p1c4994hna9bky16g3hblbnh3v7mmqar";
|
||||
runVend = true;
|
||||
|
||||
subPackages = [
|
||||
|
|
|
|||
|
|
@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Fix version in qtikz.pro
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fhackenberger/ktikz/commit/972685a406517bb85eb561f2c8e26f029eacd7db.patch";
|
||||
sha256 = "13z40rcd4m4n088v7z2ns17lnpn0z3rzp31lsamic3qdcwjwa5k8";
|
||||
})
|
||||
# Fix missing qt5.15 QPainterPath include
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fhackenberger/ktikz/commit/ebe4dfb72ac8a137b475ef688b9f7ac3e5c7f242.patch";
|
||||
sha256 = "GIgPh+iUBPftHKIpZR3a0FxmLhMLuPUapF/t+bCuqMs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ];
|
||||
|
|
|
|||
28
pkgs/applications/misc/chrysalis/default.nix
Normal file
28
pkgs/applications/misc/chrysalis/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, appimageTools, fetchurl }:
|
||||
|
||||
let
|
||||
pname = "chrysalis";
|
||||
version = "0.7.9";
|
||||
in appimageTools.wrapType2 rec {
|
||||
name = "${pname}-${version}-binary";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/keyboardio/${pname}/releases/download/${pname}-${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "12w4vv7dwfpvxpc8kpfas90y7yy8mb8dj2096z3vw1bli5lrn3zi";
|
||||
};
|
||||
|
||||
multiPkgs = null;
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
||||
p.glib
|
||||
];
|
||||
|
||||
extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graphical configurator for Kaleidoscope-powered keyboards";
|
||||
homepage = "https://github.com/keyboardio/Chrysalis";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ aw ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }:
|
||||
{ stdenv, fetchFromGitHub, gradle_6, perl, makeWrapper, jdk11, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
version = "0.9.3-3";
|
||||
|
|
@ -36,7 +36,7 @@ let
|
|||
deps = stdenv.mkDerivation {
|
||||
name = "${name}-deps";
|
||||
inherit src postPatch;
|
||||
nativeBuildInputs = [ gradle_4_10 perl ];
|
||||
nativeBuildInputs = [ gradle_6 perl ];
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
gradle --no-daemon build
|
||||
|
|
@ -54,7 +54,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation {
|
||||
inherit name src postPatch;
|
||||
nativeBuildInputs = [ gradle_4_10 perl makeWrapper ];
|
||||
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
|
@ -73,7 +73,7 @@ in stdenv.mkDerivation {
|
|||
tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1
|
||||
wrapProgram $out/bin/mucommander \
|
||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
|
||||
--set JAVA_HOME ${jre}
|
||||
--set JAVA_HOME ${jdk11}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -81,6 +81,9 @@ in stdenv.mkDerivation {
|
|||
description = "Cross-platform file manager";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ volth ];
|
||||
# build is broken on MacOS
|
||||
# https://github.com/NixOS/nixpkgs/pull/105784
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "89.0.4343.0",
|
||||
"sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa",
|
||||
"sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d",
|
||||
"version": "89.0.4350.4",
|
||||
"sha256": "1jh3r227j70imjzj0gm7cf1mv25zcdd2waa9qvim0p3g6wbdacmq",
|
||||
"sha256bin64": "06963r7a1xc9vjlwgn0wgzqfj6mavfks20lzf49axw6izrxf8sbr",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2020-11-05",
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.19.4";
|
||||
version = "1.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi";
|
||||
sha256 = "15bv620fj4x731f2z2a9dcdss18rk379kc40g49bpqsdn42jjx2z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
|
||||
|
|
|
|||
41
pkgs/applications/networking/cluster/lens/default.nix
Normal file
41
pkgs/applications/networking/cluster/lens/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib, fetchurl, appimageTools }:
|
||||
|
||||
let
|
||||
pname = "lens";
|
||||
version = "3.6.7";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage";
|
||||
sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8";
|
||||
name="${pname}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraInstallCommands =
|
||||
''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/kontena-lens.desktop $out/share/applications/${pname}.desktop
|
||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/kontena-lens.png \
|
||||
$out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Icon=kontena-lens' 'Icon=${pname}' \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Kubernetes IDE";
|
||||
homepage = "https://k8slens.dev/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dbirks ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl }:
|
||||
let
|
||||
version = "0.16.0";
|
||||
version = "0.16.3";
|
||||
|
||||
system = stdenv.hostPlatform.system;
|
||||
suffix = {
|
||||
|
|
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
|
|||
inherit version;
|
||||
|
||||
src = fetchsrc {
|
||||
x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr";
|
||||
aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p";
|
||||
x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql";
|
||||
x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x";
|
||||
aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs";
|
||||
x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz";
|
||||
};
|
||||
|
||||
doBuild = false;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, mtxclient
|
||||
, boost17x
|
||||
, spdlog
|
||||
, fmt
|
||||
, olm
|
||||
, pkgconfig
|
||||
, nlohmann_json
|
||||
|
|
@ -47,6 +48,7 @@ mkDerivation rec {
|
|||
boost17x
|
||||
lmdb
|
||||
spdlog
|
||||
fmt
|
||||
cmark
|
||||
qtbase
|
||||
qtmultimedia
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ let
|
|||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.38.2"; # Please backport all updates to the stable channel.
|
||||
version = "1.39.2"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1lq830760y4kmhqd29hhgnab6lryiipb01y0c5bbl886zk3z35n4";
|
||||
sha256 = "15lv8jpnn2cx7hmb7pn32cvq6nqvzjflf77bbnvxva5hf9zjkma9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,25 +28,15 @@
|
|||
, phonon
|
||||
}:
|
||||
|
||||
let
|
||||
mkDerivation rec {
|
||||
pname = "konversation";
|
||||
version = "1.7.5";
|
||||
in mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "1.7.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Delete this patch for konversation > 1.7.5
|
||||
(fetchpatch {
|
||||
url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53";
|
||||
sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kbookmarks
|
||||
karchive
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
{ stdenv, fetchurl, binutils, patchelf, makeWrapper
|
||||
, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype, pango
|
||||
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inboxer";
|
||||
version = "1.2.3";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Unofficial, free and open-source Google Inbox Desktop App";
|
||||
homepage = "https://denysdovhan.com/inboxer";
|
||||
maintainers = [ maintainers.mgttlinger ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
|
||||
sha256 = "1ak8sr9sc0fkbrmfynxivbn9csrbyly4fhjlk7kx10aq8hk893a7";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
ar p $src data.tar.xz | tar xJ
|
||||
'';
|
||||
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||
buildInputs = [ binutils ];
|
||||
|
||||
preFixup = with stdenv.lib; let
|
||||
lpath = makeLibraryPath [
|
||||
alsaLib
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
nss
|
||||
nspr
|
||||
freetype
|
||||
fontconfig
|
||||
gtk2-x11
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXi
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXcomposite
|
||||
xorg.libXtst
|
||||
xorg.libXScrnSaver
|
||||
xorg.libxcb
|
||||
gdk-pixbuf
|
||||
glib
|
||||
pango
|
||||
gnome2.GConf
|
||||
expat
|
||||
stdenv.cc.cc.lib
|
||||
libpulseaudio
|
||||
udev
|
||||
];
|
||||
in ''
|
||||
patchelf \
|
||||
--set-rpath "$out/opt/Inboxer:${lpath}" \
|
||||
$out/opt/Inboxer/libnode.so
|
||||
patchelf \
|
||||
--set-rpath "$out/opt/Inboxer:${lpath}" \
|
||||
$out/opt/Inboxer/libffmpeg.so
|
||||
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$out/opt/Inboxer:${lpath}" \
|
||||
$out/opt/Inboxer/inboxer
|
||||
|
||||
wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -R usr/share opt $out/
|
||||
# fix the path in the desktop file
|
||||
substituteInPlace \
|
||||
$out/share/applications/inboxer.desktop \
|
||||
--replace /opt/ $out/opt/
|
||||
# symlink the binary to bin/
|
||||
ln -s $out/opt/Inboxer/inboxer $out/bin/inboxer
|
||||
'';
|
||||
}
|
||||
45
pkgs/applications/science/astronomy/siril/default.nix
Normal file
45
pkgs/applications/science/astronomy/siril/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja,
|
||||
git, criterion, wrapGAppsHook, gtk3, libconfig, gnuplot, opencv,
|
||||
fftwFloat, cfitsio, gsl, exiv2, curl, librtprocess, ffmpeg,
|
||||
libraw, libtiff, libpng, libjpeg, libheif, ffms
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "siril";
|
||||
version = "0.99.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "free-astro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "06vh8x45gv0gwlnqjwxglf12jmpdaxkiv5sixkqh20420wabx3ha";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config git criterion wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 cfitsio gsl exiv2 gnuplot curl opencv fftwFloat librtprocess
|
||||
libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg
|
||||
];
|
||||
|
||||
# Necessary because project uses default build dir for flatpaks/snaps
|
||||
dontUseMesonConfigure = true;
|
||||
|
||||
configureScript = ''
|
||||
${meson}/bin/meson --buildtype release nixbld .
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
cd nixbld
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.siril.org/";
|
||||
description = "Astronomical image processing tool";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages
|
||||
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
|
||||
, llvmPackages ? null
|
||||
, fmt, llvmPackages ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig ];
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog wrapQtAppsHook ]
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt wrapQtAppsHook ]
|
||||
++ (with python3Packages; [ python pybind11 ])
|
||||
++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
|
|
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
|
|||
# the qt mkDerivation - the latter forcibly overrides this.
|
||||
cmakeBuildType = "MinSizeRel";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists";
|
||||
homepage = "https://github.com/emsec/hal";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ ris ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ris shamilton ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ in buildEnv {
|
|||
--prefix KODI_HOME : $out/share/kodi \
|
||||
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
|
||||
(stdenv.lib.concatMap
|
||||
(plugin: plugin.extraRuntimeDependencies) plugins)}"
|
||||
(plugin: plugin.extraRuntimeDependencies or []) plugins)}"
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Couldn't find an upstream version of this patch
|
||||
# https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1
|
||||
./fix-missing-includes-with-qt-5.15.patch
|
||||
];
|
||||
|
||||
# VLC uses a *ton* of libraries for various pieces of functionality, many of
|
||||
# which are not included here for no other reason that nobody has mentioned
|
||||
# needing them
|
||||
|
|
@ -99,6 +105,5 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.videolan.org/vlc/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
|
||||
===================================================================
|
||||
--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp
|
||||
+++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "qt.hpp"
|
||||
|
||||
#include <QWidget>
|
||||
+#include <QPainterPath>
|
||||
|
||||
class TimeTooltip : public QWidget
|
||||
{
|
||||
Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
|
||||
===================================================================
|
||||
--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp
|
||||
+++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "input_manager.hpp" /* THEMIM */
|
||||
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QRect>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QFontMetrics>
|
||||
Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
|
||||
===================================================================
|
||||
--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp
|
||||
+++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp
|
||||
@@ -53,6 +53,7 @@
|
||||
#include <QListView>
|
||||
#include <QListWidget>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <QKeyEvent>
|
||||
#include <QPushButton>
|
||||
|
||||
|
|
@ -1,7 +1,19 @@
|
|||
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which
|
||||
, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile, mpg123
|
||||
, CoreServices, AudioUnit, AudioToolbox
|
||||
, enableNativeMidi ? false, fluidsynth ? null }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, AudioToolbox
|
||||
, AudioUnit
|
||||
, CoreServices
|
||||
, SDL2
|
||||
, flac
|
||||
, fluidsynth
|
||||
, libmodplug
|
||||
, libogg
|
||||
, libvorbis
|
||||
, mpg123
|
||||
, opusfile
|
||||
, smpeg2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL2_mixer";
|
||||
|
|
@ -12,19 +24,37 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
|
||||
};
|
||||
|
||||
preAutoreconf = ''
|
||||
aclocal
|
||||
'';
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig which ];
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
|
||||
AudioToolbox
|
||||
AudioUnit
|
||||
CoreServices
|
||||
];
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
|
||||
propagatedBuildInputs = [
|
||||
SDL2
|
||||
flac
|
||||
fluidsynth
|
||||
libmodplug
|
||||
libogg
|
||||
libvorbis
|
||||
mpg123
|
||||
opusfile
|
||||
smpeg2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile mpg123 ];
|
||||
|
||||
configureFlags = [ "--disable-music-ogg-shared" ]
|
||||
++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"
|
||||
++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
|
||||
configureFlags = [
|
||||
"--disable-music-ogg-shared"
|
||||
"--disable-music-flac-shared"
|
||||
"--disable-music-mod-modplug-shared"
|
||||
"--disable-music-mp3-mpg123-shared"
|
||||
"--disable-music-opus-shared"
|
||||
"--disable-music-midi-fluidsynth-shared"
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
"--disable-sdltest"
|
||||
"--disable-smpegtest"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SDL multi-channel audio mixer library";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
gwenhywfar.version = "5.1.3";
|
||||
gwenhywfar.sha256 = "0xjr9d94y46h7pfdhz5ygn01pmlm66rhiybr520h13nvjh4zid0r";
|
||||
gwenhywfar.releaseId = "242";
|
||||
gwenhywfar.version = "5.4.1";
|
||||
gwenhywfar.sha256 = "16waq39mbhhjcma2ykdbqvpcw0ba3ksqqwsp55zczhg320s41zgv";
|
||||
gwenhywfar.releaseId = "344";
|
||||
libchipcard.version = "5.0.4";
|
||||
libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
|
||||
libchipcard.releaseId = "158";
|
||||
aqbanking.version = "6.0.2";
|
||||
aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx";
|
||||
aqbanking.releaseId = "273";
|
||||
aqbanking.version = "6.2.5";
|
||||
aqbanking.sha256 = "1pyny15g8y5dzzl4yg7jjnavygfzsi2g1jl7as9grqy77q70cnyg";
|
||||
aqbanking.releaseId = "342";
|
||||
}
|
||||
|
|
|
|||
23
pkgs/development/libraries/librtprocess/default.nix
Normal file
23
pkgs/development/libraries/librtprocess/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librtprocess";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CarVac";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1bivy3rymmmkdx5phbxq4qaq15hw633dgpks57z9ara15mh817xx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/CarVac/librtprocess";
|
||||
description = "Highly optimized library for processing RAW images";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nlohmann_json";
|
||||
version = "3.7.3";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
rev = "v${version}";
|
||||
sha256 = "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w";
|
||||
sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rivet";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
|
||||
sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0";
|
||||
sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
|
||||
sha256 = "03hm7hax0n5irqi0kzjag6fyr9zws9jqz95hr8afpikwkcfa894x";
|
||||
sha256 = "1z9jmabsaddhs003zzq73fpq2absd12rnc2sa5qn45zwf62nnbjc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -88,11 +88,17 @@ let
|
|||
})
|
||||
]
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qtwebkit = [
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-bison-3.7-build.patch";
|
||||
url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
|
||||
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
|
||||
})
|
||||
./qtwebkit.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qttools = [ ./qttools.patch ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ qtModule {
|
|||
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
|
||||
|
||||
meta = {
|
||||
broken = lib.versionAtLeast qtbase.version "5.15";
|
||||
maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,28 @@
|
|||
{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }:
|
||||
{ stdenv
|
||||
, autoconf
|
||||
, automake
|
||||
, darwin
|
||||
, fetchsvn
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smpeg2-svn${version}";
|
||||
version = "412";
|
||||
pname = "smpeg2";
|
||||
version = "unstable-2017-10-18";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.icculus.org/smpeg/trunk";
|
||||
rev = version;
|
||||
sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96";
|
||||
rev = "413";
|
||||
sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./gcc6.patch
|
||||
./sdl2.patch
|
||||
./hufftable-uint_max.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
|
||||
nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [ SDL2 ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
|
@ -25,10 +32,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
sed -e 's,#include "\(SDL.*.h\)",#include <SDL2/\1>,' -i $out/include/smpeg2/*.h
|
||||
|
||||
wrapProgram $out/bin/smpeg2-config \
|
||||
--prefix PATH ":" "${pkgconfig}/bin" \
|
||||
--prefix PATH ":" "${pkg-config}/bin" \
|
||||
--prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
diff --git a/smpeg2-config.in b/smpeg2-config.in
|
||||
index 5cce954..0e61939 100644
|
||||
--- a/smpeg2-config.in
|
||||
+++ b/smpeg2-config.in
|
||||
@@ -42,7 +42,7 @@ while test $# -gt 0; do
|
||||
if test @includedir@ != /usr/include ; then
|
||||
includes=-I@includedir@
|
||||
fi
|
||||
- echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags`
|
||||
+ echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
|
||||
;;
|
||||
--libs)
|
||||
if [ "`uname`" = "SunOS" ]; then
|
||||
@@ -50,7 +50,7 @@ while test $# -gt 0; do
|
||||
else
|
||||
libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
|
||||
fi
|
||||
- echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
|
||||
+ echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
{ stdenv, fetchFromGitHub, cmake, fmt }:
|
||||
|
||||
let
|
||||
generic = { version, sha256 }:
|
||||
|
|
@ -14,12 +14,14 @@ let
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ fmt ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSPDLOG_BUILD_SHARED=ON"
|
||||
"-DSPDLOG_BUILD_EXAMPLE=OFF"
|
||||
"-DSPDLOG_BUILD_BENCH=OFF"
|
||||
"-DSPDLOG_BUILD_TESTS=ON"
|
||||
"-DSPDLOG_FMT_EXTERNAL=ON"
|
||||
];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, brotli, fontmath, mutatormath, booleanoperations
|
||||
, ufoprocessor, ufonormalizer, psautohint, tqdm
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -52,10 +52,18 @@ buildPythonPackage rec {
|
|||
# https://github.com/adobe-type-tools/afdko/issues/1163
|
||||
# https://github.com/adobe-type-tools/afdko/issues/1216
|
||||
doCheck = stdenv.isx86_64;
|
||||
checkInputs = [ pytest ];
|
||||
checkPhase = ''
|
||||
PATH="$PATH:$out/bin" py.test
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
preCheck = "export PATH=$PATH:$out/bin";
|
||||
disabledTests = [
|
||||
# Disable slow tests, reduces test time ~25 %
|
||||
"test_report"
|
||||
"test_post_overflow"
|
||||
"test_cjk"
|
||||
"test_extrapolate"
|
||||
"test_filename_without_dir"
|
||||
"test_overwrite"
|
||||
"test_options"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Adobe Font Development Kit for OpenType";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
|
||||
, fonttools, lxml, fs
|
||||
, setuptools_scm
|
||||
, pytest, pytestcov, pytest_xdist, pytest-randomly
|
||||
, pytestCheckHook, pytest_5, pytestcov, pytest_xdist
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -11,10 +11,10 @@ buildPythonPackage rec {
|
|||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adobe-type-tools";
|
||||
repo = pname;
|
||||
owner = "adobe-type-tools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # data dir for tests
|
||||
};
|
||||
|
||||
|
|
@ -28,8 +28,24 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ fonttools lxml fs ];
|
||||
|
||||
checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ];
|
||||
checkPhase = "pytest tests";
|
||||
checkInputs = [
|
||||
# Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6
|
||||
# https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965
|
||||
# Override might be able to be removed in future, check package dependency pins (coverage.yml)
|
||||
(pytestCheckHook.override{ pytest = pytest_5; })
|
||||
pytestcov
|
||||
pytest_xdist
|
||||
];
|
||||
disabledTests = [
|
||||
# Slow tests, reduces test time from ~5 mins to ~30s
|
||||
"test_mmufo"
|
||||
"test_flex_ufo"
|
||||
"test_ufo"
|
||||
"test_flex_otf"
|
||||
"test_multi_outpath"
|
||||
"test_mmhint"
|
||||
"test_otf"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Script to normalize the XML and other data inside of a UFO";
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, catch2
|
||||
, cmake
|
||||
, cython
|
||||
, fmt
|
||||
, muparserx
|
||||
, ninja
|
||||
, nlohmann_json
|
||||
|
|
@ -47,6 +48,7 @@ buildPythonPackage rec {
|
|||
buildInputs = [
|
||||
blas
|
||||
catch2
|
||||
fmt
|
||||
muparserx
|
||||
nlohmann_json
|
||||
spdlog
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, setuptools_scm
|
||||
, requests, requests-file, idna, pytest
|
||||
, requests, requests-file, idna, filelock, pytest
|
||||
, responses
|
||||
}:
|
||||
|
||||
|
|
@ -12,14 +12,17 @@ buildPythonPackage rec {
|
|||
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests requests-file idna ];
|
||||
propagatedBuildInputs = [ requests requests-file idna filelock ];
|
||||
checkInputs = [ pytest responses ];
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
# No tests included
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "tldextract" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/john-kurkowski/tldextract";
|
||||
description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List.";
|
||||
description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, libarchive, python3, file }:
|
||||
{ stdenv, fetchurl, libarchive, python, file, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remarkable-toolchain";
|
||||
|
|
@ -6,31 +6,30 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh";
|
||||
sha256 = "6299955721bcd9bef92a87ad3cfe4d31df8e2da95b0c4b2cdded4431aa6748b0";
|
||||
sha256 = "1rk1r80m5d18sw6hrybj6f78s8pna0wrsa40ax6j8jzfwahgzmfb";
|
||||
executable = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
libarchive
|
||||
python3
|
||||
python
|
||||
file
|
||||
which
|
||||
];
|
||||
|
||||
unpackCmd = "mkdir src; install $curSrc src/install-toolchain.sh";
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
patchShebangs install-toolchain.sh
|
||||
sed -i -e '3,9d' install-toolchain.sh # breaks PATH
|
||||
sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh
|
||||
./install-toolchain.sh -D -y -d $out
|
||||
mkdir -p $out
|
||||
ENVCLEANED=1 $src -y -d $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A toolchain for cross-compiling to reMarkable tablets";
|
||||
homepage = "https://remarkable.engineering/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.nickhu ];
|
||||
platforms = platforms.x86_64;
|
||||
maintainers = with maintainers; [ nickhu siraben ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,22 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.7.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1afdd1zs242nh1cync5ip1fbah34wc3gbsx3hwwiisc8yziwiq18";
|
||||
sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk=";
|
||||
};
|
||||
vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI=";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/terraform-ls";
|
||||
|
||||
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
|
||||
doCheck = false;
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }:
|
||||
{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
|
||||
coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.4.14";
|
||||
|
|
@ -11,9 +12,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper wrapGAppsHook ];
|
||||
buildInputs = [ gtk3 intltool libxslt ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/xarchiver \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
|
||||
homepage = "https://github.com/ib/xarchiver";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2020-12-10 10:39:37.775694976 +0100
|
||||
+++ b/CMakeLists.txt 2020-12-10 10:40:41.984575938 +0100
|
||||
@@ -127,6 +127,7 @@
|
||||
add_definitions(-D__STDC_LIMIT_MACROS)
|
||||
add_definitions(-D__STDC_CONSTANT_MACROS)
|
||||
add_definitions(-D__STDC_FORMAT_MACROS)
|
||||
+add_definitions(-DSPDLOG_FMT_EXTERNAL)
|
||||
if(MINGW)
|
||||
add_definitions(-DWINVER=0x0602)
|
||||
add_definitions(-D_WIN32_WINNT=0x0602)
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
, judy
|
||||
, pam
|
||||
, spdlog
|
||||
, fmt
|
||||
, zlib # optional
|
||||
}:
|
||||
|
||||
|
|
@ -30,13 +31,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
|
||||
buildInputs =
|
||||
[ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
|
||||
zlib boost judy pam spdlog python2
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Use system-provided spdlog instead of downloading an old one (next two patches)
|
||||
(fetchpatch {
|
||||
|
|
@ -53,13 +47,26 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch";
|
||||
sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv";
|
||||
})
|
||||
# Add SPDLOG_FMT_EXTERNAL flag to disable spdlog from using bundled fmt
|
||||
# Would use https://github.com/lizardfs/lizardfs/commit/31b0cd40f84ee75f99643ad19122061e3d6fb6cc.patch
|
||||
# if it didn't failed to patch
|
||||
./cmake-def-spdlog-fmt-external.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
|
||||
buildInputs =
|
||||
[ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
|
||||
zlib boost judy pam spdlog fmt python2
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DSPDLOG_FMT_EXTERNAL=ON" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://lizardfs.com";
|
||||
description = "A highly reliable, scalable and efficient distributed file system";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.rushmorem ];
|
||||
maintainers = with maintainers; [ rushmorem shamilton ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
sha256 = "0464a5d39g20hif3dz3qr78dqb0cmxbazy0q48j9gkawhxm30c1h";
|
||||
hash = "sha256-JaYFJL24Pgwh5CrsKjJPL8u0fx1x0beFTK+EGNT1iqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -226,6 +226,7 @@ mapAliases ({
|
|||
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
idea = jetbrains; # added 2017-04-03
|
||||
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
|
||||
infiniband-diags = rdma-core; # added 2019-08-09
|
||||
inotifyTools = inotify-tools;
|
||||
jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
|
||||
|
|
|
|||
|
|
@ -178,6 +178,8 @@ in
|
|||
|
||||
cereal = callPackage ../development/libraries/cereal { };
|
||||
|
||||
chrysalis = callPackage ../applications/misc/chrysalis { };
|
||||
|
||||
clj-kondo = callPackage ../development/tools/clj-kondo { };
|
||||
|
||||
cmark = callPackage ../development/libraries/cmark { };
|
||||
|
|
@ -240,6 +242,7 @@ in
|
|||
|
||||
archiver = callPackage ../applications/misc/archiver { };
|
||||
|
||||
# It segfaults if it uses qt5.15
|
||||
digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { };
|
||||
|
||||
gretl = callPackage ../applications/science/math/gretl { };
|
||||
|
|
@ -4818,8 +4821,6 @@ in
|
|||
|
||||
inadyn = callPackage ../tools/networking/inadyn { };
|
||||
|
||||
inboxer = callPackage ../applications/networking/mailreaders/inboxer { };
|
||||
|
||||
incron = callPackage ../tools/system/incron { };
|
||||
|
||||
industrializer = callPackage ../applications/audio/industrializer { };
|
||||
|
|
@ -5999,7 +6000,7 @@ in
|
|||
inherit (callPackage ../servers/nextcloud {})
|
||||
nextcloud17 nextcloud18 nextcloud19 nextcloud20;
|
||||
|
||||
nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { };
|
||||
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
|
||||
|
||||
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
|
||||
|
||||
|
|
@ -6822,7 +6823,7 @@ in
|
|||
|
||||
qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
|
||||
|
||||
qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { };
|
||||
qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
|
||||
|
||||
quickjs = callPackage ../development/interpreters/quickjs { };
|
||||
|
||||
|
|
@ -7289,6 +7290,8 @@ in
|
|||
|
||||
sipsak = callPackage ../tools/networking/sipsak { };
|
||||
|
||||
siril = callPackage ../applications/science/astronomy/siril { };
|
||||
|
||||
sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
|
||||
|
||||
sit = callPackage ../applications/version-management/sit {
|
||||
|
|
@ -14276,6 +14279,8 @@ in
|
|||
|
||||
librime = callPackage ../development/libraries/librime {};
|
||||
|
||||
librtprocess = callPackage ../development/libraries/librtprocess { };
|
||||
|
||||
libsamplerate = callPackage ../development/libraries/libsamplerate {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices;
|
||||
};
|
||||
|
|
@ -22285,14 +22290,13 @@ in
|
|||
|
||||
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
|
||||
|
||||
# Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15
|
||||
kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { };
|
||||
kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
|
||||
|
||||
kodestudio = callPackage ../applications/editors/kodestudio { };
|
||||
|
||||
kondo = callPackage ../applications/misc/kondo { };
|
||||
|
||||
konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { };
|
||||
konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
|
||||
|
||||
kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
|
||||
|
||||
|
|
@ -22382,6 +22386,8 @@ in
|
|||
|
||||
legit = gitAndTools.legit;
|
||||
|
||||
lens = callPackage ../applications/networking/cluster/lens { };
|
||||
|
||||
leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
|
||||
|
||||
libowfat = callPackage ../development/libraries/libowfat { };
|
||||
|
|
@ -23599,7 +23605,7 @@ in
|
|||
|
||||
qsstv = qt5.callPackage ../applications/radio/qsstv { };
|
||||
|
||||
qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { };
|
||||
qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
|
||||
|
||||
qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion {
|
||||
guvcview = guvcview.override {
|
||||
|
|
@ -24601,7 +24607,7 @@ in
|
|||
|
||||
vkeybd = callPackage ../applications/audio/vkeybd {};
|
||||
|
||||
vlc = libsForQt514.callPackage ../applications/video/vlc {};
|
||||
vlc = libsForQt5.callPackage ../applications/video/vlc {};
|
||||
|
||||
vlc_qt5 = vlc;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue