Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
a7d1600c5e
163 changed files with 1236 additions and 4357 deletions
|
|
@ -2096,6 +2096,16 @@
|
|||
githubId = 25088352;
|
||||
name = "Christian Kögler";
|
||||
};
|
||||
ckie = {
|
||||
email = "nixpkgs-0efe364@ckie.dev";
|
||||
github = "ckiee";
|
||||
githubId = 2526321;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x13E79449C0525215";
|
||||
fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";
|
||||
}];
|
||||
name = "ckie";
|
||||
};
|
||||
clkamp = {
|
||||
email = "c@lkamp.de";
|
||||
github = "clkamp";
|
||||
|
|
@ -8326,6 +8336,17 @@
|
|||
githubId = 127548;
|
||||
name = "Judson Lester";
|
||||
};
|
||||
nzbr = {
|
||||
email = "nixos@nzbr.de";
|
||||
github = "nzbr";
|
||||
githubId = 7851175;
|
||||
name = "nzbr";
|
||||
matrix = "@nzbr:nzbr.de";
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0x6C78B50B97A42F8A";
|
||||
fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A";
|
||||
}];
|
||||
};
|
||||
nzhang-zh = {
|
||||
email = "n.zhang.hp.au@gmail.com";
|
||||
github = "nzhang-zh";
|
||||
|
|
@ -9684,16 +9705,6 @@
|
|||
githubId = 1312525;
|
||||
name = "Rongcui Dong";
|
||||
};
|
||||
ronthecookie = {
|
||||
name = "Ron B";
|
||||
email = "me@ronthecookie.me";
|
||||
github = "ronthecookie";
|
||||
githubId = 2526321;
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0x6F5B32DE5E5FA80C";
|
||||
fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C";
|
||||
}];
|
||||
};
|
||||
roosemberth = {
|
||||
email = "roosembert.palacios+nixpkgs@posteo.ch";
|
||||
github = "roosemberth";
|
||||
|
|
|
|||
|
|
@ -1126,9 +1126,9 @@ class Driver:
|
|||
try:
|
||||
yield
|
||||
return True
|
||||
except:
|
||||
rootlog.error(f'Test "{name}" failed with error:')
|
||||
raise
|
||||
except Exception as e:
|
||||
rootlog.error(f'Test "{name}" failed with error: "{e}"')
|
||||
raise e
|
||||
|
||||
def test_symbols(self) -> Dict[str, Any]:
|
||||
@contextmanager
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ let
|
|||
serviceConfig.MemoryDenyWriteExecute = true;
|
||||
serviceConfig.NoNewPrivileges = true;
|
||||
serviceConfig.PrivateDevices = true;
|
||||
serviceConfig.ProtectClock = true;
|
||||
serviceConfig.ProtectClock = mkDefault true;
|
||||
serviceConfig.ProtectControlGroups = true;
|
||||
serviceConfig.ProtectHome = true;
|
||||
serviceConfig.ProtectHostname = true;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@ in
|
|||
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
# The systemd collector needs AF_UNIX
|
||||
RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX";
|
||||
# The timex collector needs to access clock APIs
|
||||
ProtectClock = lib.any (x: x == "timex") cfg.disabledCollectors;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -172,9 +172,15 @@ in
|
|||
ExecStart = "${(removeSuffix "\n" cmd)} start";
|
||||
ExecStop = "${(removeSuffix "\n" cmd)} stop";
|
||||
Restart = "on-failure";
|
||||
TimeoutSec = "5min";
|
||||
User = "unifi";
|
||||
UMask = "0077";
|
||||
WorkingDirectory = "${stateDir}";
|
||||
# the stop command exits while the main process is still running, and unifi
|
||||
# wants to manage its own child processes. this means we have to set KillSignal
|
||||
# to something the main process ignores, otherwise every stop will have unifi.service
|
||||
# fail with SIGTERM status.
|
||||
KillSignal = "SIGCONT";
|
||||
|
||||
# Hardening
|
||||
AmbientCapabilities = "";
|
||||
|
|
|
|||
|
|
@ -14,9 +14,6 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "csound";
|
||||
# When updating, please check if https://github.com/csound/csound/issues/1078
|
||||
# has been fixed in the new version so we can use the normal fluidsynth
|
||||
# version and remove fluidsynth 1.x from nixpkgs again.
|
||||
version = "6.16.2";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, lilv
|
||||
, lsp-plugins
|
||||
, lv2
|
||||
, mda_lv2
|
||||
, meson
|
||||
, ninja
|
||||
, nlohmann_json
|
||||
|
|
@ -25,20 +26,20 @@
|
|||
, rnnoise
|
||||
, rubberband
|
||||
, speexdsp
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, zam-plugins
|
||||
, zita-convolver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyeffects";
|
||||
version = "6.0.3";
|
||||
version = "6.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GzqPC/m/HMthLMamhJ4EXX6fxZYscdX1QmXgqHOPEcg=";
|
||||
sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -74,17 +75,20 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
# https://github.com/wwmm/easyeffects/pull/1205
|
||||
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
preFixup =
|
||||
let
|
||||
lv2Plugins = [
|
||||
calf # limiter, compressor exciter, bass enhancer and others
|
||||
lsp-plugins # delay
|
||||
calf # compressor exciter, bass enhancer and others
|
||||
lsp-plugins # delay, limiter, multiband compressor
|
||||
mda_lv2 # loudness
|
||||
zam-plugins # maximizer
|
||||
];
|
||||
ladspaPlugins = [
|
||||
rubberband # pitch shifting
|
||||
zam-plugins # maximizer
|
||||
];
|
||||
in
|
||||
''
|
||||
|
|
|
|||
45
pkgs/applications/audio/in-formant/default.nix
Normal file
45
pkgs/applications/audio/in-formant/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, cmake, lib, fetchFromGitHub, qt5, fftw, libtorch-bin, portaudio, eigen
|
||||
, xorg, pkg-config, autoPatchelfHook, soxr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "in-formant";
|
||||
version = "2021-06-30";
|
||||
|
||||
# no Qt6 yet, so we're stuck in the last Qt5-supporting commit: https://github.com/NixOS/nixpkgs/issues/108008
|
||||
src = fetchFromGitHub {
|
||||
owner = "in-formant";
|
||||
repo = "in-formant";
|
||||
rev = "e28e628cf5ff0949a7b046d220cc884f6035f31a";
|
||||
sha256 = "sha256-YvtV0wGUNmI/+GGxrIfTk/l8tqUsWgc/LAI17X+AWGI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qtquickcontrols
|
||||
qt5.qtquickcontrols2
|
||||
qt5.qtcharts
|
||||
fftw
|
||||
libtorch-bin
|
||||
portaudio
|
||||
eigen
|
||||
xorg.libxcb
|
||||
soxr
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp in-formant $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A real-time pitch and formant tracking software";
|
||||
homepage = "https://github.com/in-formant/in-formant";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -4,17 +4,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "librespot";
|
||||
version = "0.1.6";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librespot-org";
|
||||
repo = "librespot";
|
||||
rev = "v${version}";
|
||||
sha256 = "153i9n3qwmmwc29f62cz8nbqrlry16iygvibm1sdnvpf0s6wk5f3";
|
||||
sha256 = "0n7h690gplpp47gdj038g6ncgwr7wvwfkg00cbrbvxhv7kzqqa1f";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
cargoSha256 = "11d64rpq4b5rdxk5wx0hhzgc6mvs6h2br0w3kfncfklp67vn3v4v";
|
||||
cargoSha256 = "0qakvpxvn84ppgs3qlsfan4flqkmjcgs698w25jasx9ymiv8wc3s";
|
||||
|
||||
cargoBuildFlags = with lib; [
|
||||
"--no-default-features"
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
|||
description = "The extensible, customizable GNU text editor";
|
||||
homepage = "https://www.gnu.org/software/emacs/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ];
|
||||
maintainers = with maintainers; [ lovek323 jwiegley adisbladis ];
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1mpvikps5l2vynw7afrpkp4ah0q6q2q4q8d074b4vfwhaj1v6v75";
|
||||
x86_64-darwin = "0r65wfyzc90lhd0i61xkb8kq9339b3ddyqp5dx7wf0aydgi203br";
|
||||
aarch64-linux = "0d4kqjhyq8s7ini25m2igf37bzb2dw01jv62nps3yx3cr52vzyn2";
|
||||
aarch64-darwin = "0h5g3h8z1wl7pz6ddlchnwqns956pyi1c3fjivsff0f0yhmdlva7";
|
||||
armv7l-linux = "0fyxmq3i4kc1x013xs9flcbkmzzy9sqhjhcj5n38w6mswsb97qrv";
|
||||
x86_64-linux = "069jdwqs9z2z95mjs9nx58rp1516dyyqn5bc0vgr7xvlbis97lq0";
|
||||
x86_64-darwin = "1bd32dkpyfgknxqn76jcwpa47rac9q14glbf5sb1rh9rfav0m1m8";
|
||||
aarch64-linux = "1axxnys3pd2qrvj6mqpa5cih44b4dbpgi8mvn616d8d45jgdnc1r";
|
||||
aarch64-darwin = "0bdp0k20lfwpsl1a3dz6c97s0b5bp3rhb66jwgbyyc16zrz79r1z";
|
||||
armv7l-linux = "077w5hvc4brb56zs0w37nr4a8vlcij5z3yrv3rz16p58nnkj56hs";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.61.0";
|
||||
version = "1.61.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A boxy 3D model editor powered by Electron";
|
||||
homepage = "https://blockbench.net/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.ronthecookie ];
|
||||
maintainers = [ maintainers.ckie ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "drawing";
|
||||
version = "0.8.0";
|
||||
version = "0.8.3";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "maoschanz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0";
|
||||
sha256 = "sha256-qDLJ+Mw4z66ro9/zoEIzDJpA+jJLYw0WgsP7mA+56XM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "457";
|
||||
version = "458";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZXBVJc+9dFzi75JYl3U3ic0MKolWMsdR3UkLe5EOzsw=";
|
||||
sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -113,7 +113,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
homepage = "http://www.sane-project.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Scanner Access Now Easy";
|
||||
homepage = "http://www.sane-project.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.sane-project.org/";
|
||||
description = "Graphical scanning frontend for sane";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [peti];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,11 +33,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.2.0";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "1hnpvvval8a9ny5x5zffn5lf5qrwc4hcs3jvhqmd7m4adh2i6y2i";
|
||||
sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.20.2";
|
||||
version = "0.20.9";
|
||||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-jqRxNd6lx1hnOa4F3m3YOr8ZBnSKQBz0XVC5absf9mM=";
|
||||
sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "electron-cash";
|
||||
version = "4.2.4";
|
||||
version = "4.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Electron-Cash";
|
||||
repo = "Electron-Cash";
|
||||
rev = version;
|
||||
sha256 = "sha256-hiOS0cTaPqllb31p+6nU4GYvw/E1Hdn8yd3sppzGkqg=";
|
||||
sha256 = "sha256-ALIrNnhpX46xdQdfJdx/9e/QtdyBEgi5xLrbuOBJR7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
|||
IPSEC.
|
||||
'';
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.peti ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://nostatic.org/grip";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
maintainers = with lib.maintainers; [ marcweber peti ];
|
||||
maintainers = with lib.maintainers; [ marcweber ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,6 +74,5 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://ikiwiki.info/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
let isFullPackage = mediaSupport;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = if isFullPackage then "vifm-full" else "vifm";
|
||||
version = "0.11";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
|
||||
sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh";
|
||||
sha256 = "1h5j4y704nciyzg3aaav8sl3r5h9mpwq8f28cj65nnxk6a7n3a9k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused jq
|
||||
|
||||
set -eu -o pipefail
|
||||
set -x -eu -o pipefail
|
||||
|
||||
cd $(dirname "${BASH_SOURCE[0]}")
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archi
|
|||
SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
|
||||
|
||||
setKV () {
|
||||
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
|
||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
|
||||
}
|
||||
|
||||
setKV version ${VERSION}
|
||||
|
|
@ -24,8 +24,15 @@ setKV vendorSha256 ""
|
|||
|
||||
cd ../../../../../
|
||||
set +e
|
||||
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g')
|
||||
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
|
||||
set -e
|
||||
|
||||
cd - > /dev/null
|
||||
setKV vendorSha256 ${VENDOR_SHA256}
|
||||
|
||||
if [ -n "${VENDOR_SHA256:-}" ]; then
|
||||
setKV vendorSha256 ${VENDOR_SHA256}
|
||||
else
|
||||
echo "Update failed. VENDOR_SHA256 is empty."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused jq
|
||||
|
||||
set -eu -o pipefail
|
||||
set -x -eu -o pipefail
|
||||
|
||||
WORKDIR=$(mktemp -d)
|
||||
trap "rm -rf ${WORKDIR}" EXIT
|
||||
|
|
@ -45,7 +45,7 @@ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
|
|||
"https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")
|
||||
|
||||
setKV () {
|
||||
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
|
||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
|
||||
}
|
||||
|
||||
setKV k3sVersion ${K3S_VERSION}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused jq
|
||||
|
||||
set -eu -o pipefail
|
||||
set -x -eu -o pipefail
|
||||
|
||||
cd $(dirname "$0")
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^edge-//')
|
|||
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz)
|
||||
|
||||
setKV () {
|
||||
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./edge.nix
|
||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./edge.nix
|
||||
}
|
||||
|
||||
setKV version ${VERSION}
|
||||
|
|
@ -25,9 +25,9 @@ cd ../../../../../
|
|||
set +e
|
||||
VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
|
||||
set -e
|
||||
cd - > /dev/null
|
||||
|
||||
if [ -n "${VENDOR_SHA256:-}" ]; then
|
||||
cd - > /dev/null
|
||||
setKV vendorSha256 ${VENDOR_SHA256}
|
||||
else
|
||||
echo "Update failed. VENDOR_SHA256 is empty."
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused jq
|
||||
|
||||
set -eu -o pipefail
|
||||
set -x -eu -o pipefail
|
||||
|
||||
cd $(dirname "$0")
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^stable-//')
|
|||
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz)
|
||||
|
||||
setKV () {
|
||||
sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
|
||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
|
||||
}
|
||||
|
||||
setKV version ${VERSION}
|
||||
|
|
@ -25,11 +25,11 @@ cd ../../../../../
|
|||
set +e
|
||||
VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
|
||||
set -e
|
||||
cd - > /dev/null
|
||||
|
||||
if [ -n "${VENDOR_SHA256:-}" ]; then
|
||||
cd - > /dev/null
|
||||
setKV vendorSha256 ${VENDOR_SHA256}
|
||||
setKV vendorSha256 ${VENDOR_SHA256}
|
||||
else
|
||||
echo "Update failed. VENDOR_SHA256 is empty."
|
||||
exit 1
|
||||
echo "Update failed. VENDOR_SHA256 is empty."
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -195,8 +195,8 @@ rec {
|
|||
};
|
||||
|
||||
terraform_1_0 = mkTerraform {
|
||||
version = "1.0.8";
|
||||
sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil";
|
||||
version = "1.0.9";
|
||||
sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3";
|
||||
vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
|
|
|
|||
|
|
@ -40,15 +40,43 @@ assert builtins.elem (lib.toLower chatType) [
|
|||
|
||||
assert enablePsiMedia -> enablePlugins;
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "psi-plus";
|
||||
version = "1.5.1549";
|
||||
|
||||
# Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi
|
||||
# and “-R” ending is optional revision number.
|
||||
#
|
||||
# The “psi-plus-snapshots” generally provides snapshots of these separate
|
||||
# repositories glued together (there are also dependencies/libraries):
|
||||
#
|
||||
# 1. Psi
|
||||
# 2. Plugins pack for Psi
|
||||
# 3. “psimedia” plugin
|
||||
# 4. Resources for Psi (icons, skins, sounds)
|
||||
#
|
||||
# “X.X.XXXX” is literally a version of Psi.
|
||||
# So often when for instance plugins are updated separately a new snapshot is
|
||||
# created. And that snapshot would also be linked to “X.X.XXXX” version.
|
||||
# So many commits may have the same associated version of the snapshot.
|
||||
# But mind that only one Git tag is created for “X.X.XXXX” version.
|
||||
#
|
||||
# It’s not yet defined in the Psi+ project what value to use as a version for
|
||||
# any further releases that don’t change Psi version.
|
||||
#
|
||||
# Let’s do what Debian does for instance (appends “-R” where “R” is a revision
|
||||
# number).
|
||||
# E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/
|
||||
#
|
||||
# This has been communicated with the Psi+ main devs in this XMPP MUC chat:
|
||||
# psi-dev@conference.jabber.ru
|
||||
#
|
||||
version = "1.5.1556-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = version;
|
||||
sha256 = "0jpv6qzfg6xjwkrnci7fav27nxm174i9l5g4vmsbchqpwfk90z2m";
|
||||
rev = "635879010b6697f7041a7bbea1853a1f4673c7f7";
|
||||
sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -96,7 +124,7 @@ mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://psi-plus.com";
|
||||
description = "XMPP (Jabber) client";
|
||||
description = "XMPP (Jabber) client based on Qt5";
|
||||
maintainers = with maintainers; [ orivej misuzu unclechu ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.7.1";
|
||||
version = "1.7.3";
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
name = "session-desktop-appimage-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6";
|
||||
sha256 = "0s0zvj9ddrngdzsx8hd07pq3150sq8ab1hbpsi9i2ir99sv1p7gn";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "opsdroid";
|
||||
version = "0.23.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opsdroid";
|
||||
repo = "opsdroid";
|
||||
rev = "v${version}";
|
||||
sha256 = "1p1x7jbp0jx8anfwvavyn3x8i1vfhmbzyzrm014n26v5y39gabj1";
|
||||
sha256 = "15l2jvcpb9l8sgdd9zsvxqglf1r3vap0pp9cklpfa9jj0aik6nx9";
|
||||
};
|
||||
|
||||
disabled = !python3Packages.isPy3k;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = base.meta // {
|
||||
description = "A fast incremental file transfer utility";
|
||||
maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ];
|
||||
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation {
|
|||
description = "Convert MS Word documents to plain text or PostScript";
|
||||
license = lib.licenses.gpl2;
|
||||
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
homepage = "http://www.gnucash.org/";
|
||||
|
||||
maintainers = [ lib.maintainers.peti lib.maintainers.domenkozar ];
|
||||
maintainers = [ lib.maintainers.domenkozar ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }:
|
||||
|
||||
let
|
||||
name = "${pname}-${version}";
|
||||
pname = "minetime";
|
||||
version = "1.8.10";
|
||||
appimage = fetchurl {
|
||||
url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage";
|
||||
sha256 = "1a80lgk6v9kv9xb2y3i08gk25jm0pqyl57kfr5p1rbc33prhmcgw";
|
||||
};
|
||||
extracted = appimageTools.extractType2 {
|
||||
inherit name;
|
||||
src = appimage;
|
||||
};
|
||||
patched = runCommand "minetime-patchelf" {} ''
|
||||
cp -av ${extracted} $out
|
||||
|
||||
x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService
|
||||
chmod +w $x
|
||||
|
||||
patchelf \
|
||||
--set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
--replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
|
||||
$x
|
||||
'';
|
||||
in
|
||||
appimageTools.wrapAppImage rec {
|
||||
inherit name;
|
||||
src = patched;
|
||||
|
||||
profile = ''
|
||||
export LC_ALL=C.UTF-8
|
||||
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||
'';
|
||||
|
||||
multiPkgs = null; # no 32bit needed
|
||||
extraPkgs = ps:
|
||||
appimageTools.defaultFhsEnvArgs.multiPkgs ps
|
||||
++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]);
|
||||
extraInstallCommands = "mv $out/bin/{${name},${pname}}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern, intuitive and smart calendar application";
|
||||
homepage = "https://minetime.ai";
|
||||
license = licenses.unfree;
|
||||
# Should be cross-platform, but for now we just grab the appimage
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
|
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Real-time 3D simulation of space";
|
||||
changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ mkDerivation rec {
|
|||
homepage = "http://stellarium.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ peti ma27 ];
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
|
||||
homepage = "http://www.tkgate.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
hydraPlatforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||
install -Dm0755 build/cadical "$out/bin/cadical"
|
||||
install -Dm0755 build/mobical "$out/bin/mobical"
|
||||
install -Dm0644 src/ccadical.h "$dev/include/ccadical.h"
|
||||
install -Dm0644 src/cadical.hpp "$dev/include/cadical.hpp"
|
||||
install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a"
|
||||
mkdir -p "$out/share/doc/${pname}/"
|
||||
install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,31 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, eprover, ocaml, camlp4, perl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leo2";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
|
||||
sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";
|
||||
sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ eprover ocaml perl zlib ];
|
||||
buildInputs = [ eprover ocaml camlp4 perl zlib ];
|
||||
|
||||
sourceRoot = "leo2/src";
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "lib/";
|
||||
sha256 = "sha256:01ln7hi6nvvkqkhn9hciqizizz5qspvqffgksvgmzn9x7kdd9pnh";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = "patchShebangs configure";
|
||||
preConfigure = ''
|
||||
cd src
|
||||
patchShebangs configure
|
||||
substituteInPlace Makefile.pre \
|
||||
--replace '+camlp4' "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4"
|
||||
'';
|
||||
|
||||
buildFlags = [ "opt" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = with maintainers; [ peti ] ++ teams.sage.members;
|
||||
maintainers = with maintainers; teams.sage.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,5 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -113,6 +113,5 @@ stdenv.mkDerivation ({
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
homepage = "https://wxmaxima-developers.github.io/wxmaxima/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
58
pkgs/applications/terminal-emulators/ctx/default.nix
Normal file
58
pkgs/applications/terminal-emulators/ctx/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, babl
|
||||
, curl
|
||||
, libdrm # Not documented
|
||||
, pkg-config
|
||||
, enableFb ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctx";
|
||||
version = "0.pre+date=2021-10-09";
|
||||
|
||||
src = fetchgit {
|
||||
name = "ctx-source"; # because of a dash starting the directory
|
||||
url = "https://ctx.graphics/.git/";
|
||||
rev = "d11d0d1a719a3c77712528e2feed8c0878e0ea64";
|
||||
sha256 = "sha256-Az3POgdvDOVaaRtzLlISDODhAKbefpGx5KgwO3dttqs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
alsa-lib
|
||||
babl
|
||||
curl
|
||||
libdrm
|
||||
];
|
||||
|
||||
configureScript = "./configure.sh";
|
||||
configureFlags = lib.optional enableFb "--enable-fb";
|
||||
dontAddPrefix = true;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
installFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ctx.graphics/";
|
||||
description = "Vector graphics terminal";
|
||||
longDescription= ''
|
||||
ctx is an interactive 2D vector graphics, audio, text- canvas and
|
||||
terminal, with escape sequences that enable a 2D vector drawing API using
|
||||
a vector graphics protocol.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TjBUVP9/hMB8yFnupSxwHDr5bmtiMFwsDi1axsD5ykA=";
|
||||
sha256 = "sha256-70FmFN76azRqnAZ9SLgr/V8moqkWoBbDB6IdSXM7Vmg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZsMzLJ+eHAKNxhVFpQxRyTv/rcWvxA/luKPjXT+Zt4Y=";
|
||||
vendorSha256 = "sha256-004TspNwjCWnrD86HEf5wGpt8OCP5qIrTwlGWSRNUmg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.3.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav";
|
||||
sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -33,16 +33,15 @@ buildPythonApplication rec {
|
|||
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
|
||||
'';
|
||||
|
||||
postInstallCheck = ''
|
||||
git init
|
||||
test "$($out/bin/git-machete version)" = "git-machete version ${version}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
tests = {
|
||||
version = testVersion {
|
||||
package = git-machete;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -367,6 +367,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ primeos peti wmertens globin ];
|
||||
maintainers = with lib.maintainers; [ primeos wmertens globin ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, crystal_1_0
|
||||
, crystal
|
||||
}:
|
||||
|
||||
let
|
||||
crystal = crystal_1_0;
|
||||
|
||||
in crystal.buildCrystalPackage rec {
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "thicket";
|
||||
version = "0.1.5";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "14.3.2",
|
||||
"repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr",
|
||||
"version": "14.3.3",
|
||||
"repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.3.2-ee",
|
||||
"rev": "v14.3.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.3.2",
|
||||
"GITALY_SERVER_VERSION": "14.3.3",
|
||||
"GITLAB_PAGES_VERSION": "1.44.0",
|
||||
"GITLAB_SHELL_VERSION": "13.21.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.3.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.3.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,11 +80,6 @@ let
|
|||
# Fixup "resolved"-entries in yarn.lock to match our offline cache
|
||||
${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
|
||||
|
||||
# fixup_yarn_lock currently doesn't correctly fix the dagre-d3
|
||||
# url, so we have to do it manually
|
||||
${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \
|
||||
'"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock
|
||||
|
||||
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
|
||||
|
||||
patchShebangs node_modules/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
};
|
||||
};
|
||||
};
|
||||
version = "14.3.2";
|
||||
version = "14.3.3";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo=";
|
||||
sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.3.2";
|
||||
version = "14.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -1650,4 +1650,4 @@ DEPENDENCIES
|
|||
yajl-ruby (~> 1.4.1)
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.24
|
||||
2.2.20
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ GEM
|
|||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
marcel (1.0.1)
|
||||
marcel (1.0.2)
|
||||
method_source (1.0.0)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.0.3)
|
||||
|
|
@ -90,12 +90,12 @@ GEM
|
|||
nokogiri (1.11.7)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
parallel (1.20.1)
|
||||
parallel (1.21.0)
|
||||
parser (3.0.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.2.3)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.4.0)
|
||||
puma (5.5.2)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
|
|
@ -120,7 +120,7 @@ GEM
|
|||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.6)
|
||||
actionpack (= 5.2.6)
|
||||
|
|
@ -146,11 +146,11 @@ GEM
|
|||
railties (>= 5.1, < 6.2)
|
||||
roadie (>= 3.1, < 5.0)
|
||||
rotp (6.2.0)
|
||||
rouge (3.26.0)
|
||||
rqrcode (2.0.0)
|
||||
rouge (3.26.1)
|
||||
rqrcode (2.1.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
rqrcode_core (1.1.0)
|
||||
rqrcode_core (1.2.0)
|
||||
rubocop (1.12.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.0.0.0)
|
||||
|
|
@ -160,7 +160,7 @@ GEM
|
|||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.10.0)
|
||||
rubocop-ast (1.12.0)
|
||||
parser (>= 3.0.1.1)
|
||||
rubocop-performance (1.10.2)
|
||||
rubocop (>= 0.90.0, < 2.0)
|
||||
|
|
@ -190,8 +190,8 @@ GEM
|
|||
thread_safe (0.3.6)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (2.0.0)
|
||||
webdrivers (4.6.0)
|
||||
unicode-display_width (2.1.0)
|
||||
webdrivers (4.6.1)
|
||||
nokogiri (~> 1.6)
|
||||
rubyzip (>= 1.3.0)
|
||||
selenium-webdriver (>= 3.0, < 4.0)
|
||||
|
|
@ -245,7 +245,7 @@ DEPENDENCIES
|
|||
yard
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.7.3p183
|
||||
ruby 2.7.4p191
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6";
|
||||
sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -301,10 +301,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3";
|
||||
sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default"];
|
||||
|
|
@ -420,10 +420,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
|
||||
sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
|
|
@ -470,10 +470,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x";
|
||||
sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.4.0";
|
||||
version = "5.5.2";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -545,10 +545,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
|
||||
sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.4.2";
|
||||
};
|
||||
railties = {
|
||||
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
|
||||
|
|
@ -680,10 +680,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
|
||||
sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.26.0";
|
||||
version = "3.26.1";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = ["chunky_png" "rqrcode_core"];
|
||||
|
|
@ -691,20 +691,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02";
|
||||
sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
rqrcode_core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k";
|
||||
sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
|
|
@ -723,10 +723,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw";
|
||||
sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = ["rubocop" "rubocop-ast"];
|
||||
|
|
@ -870,10 +870,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m";
|
||||
sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
};
|
||||
webdrivers = {
|
||||
dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"];
|
||||
|
|
@ -881,10 +881,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hi6pgkfwgz1bzfclyrr449xy9y2f2bcrnnnlb5ghvvrqkgn0dry";
|
||||
sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
};
|
||||
websocket-driver = {
|
||||
dependencies = ["websocket-extensions"];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "verco";
|
||||
version = "6.5.5";
|
||||
version = "6.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vamolessa";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n+GGiu/xGGGC6FQPoASok87bCG0MFVIf6l6nt1lvw8A=";
|
||||
sha256 = "sha256-H8rDaRVU3G3iuBv0Tz/YOuYbL2k8wEoEIIEG7hjU6eM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-lNtR4N+bFFCr3Ct99DJCbtDeKxTzT7ZjvAWixbQm3jg=";
|
||||
cargoSha256 = "sha256-4Ou/stedL3WCY4Awsl++lc5fZ9gxd4uorf4G2/0DiPc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Network A/V plugin for OBS Studio";
|
||||
homepage = "https://github.com/Palakis/obs-ndi";
|
||||
maintainers = with maintainers; [ peti jshcmpbll ];
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,36 +2,36 @@
|
|||
|
||||
let
|
||||
fonts = {
|
||||
aegan = { version = "10.00"; file = "Aegean.zip"; sha256 = "0k47nhzw4vx771ch3xx8mf6xx5vx0hg0cif5jdlmdaz4h2c3rawz"; description = "Aegean"; };
|
||||
aegyptus = { version = "8.00"; file = "Aegyptus.zip"; sha256 = "13h2pi641k9vxgqi9l11mjya10ym9ln54wrkwxx6gxq63zy7y5mj"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
|
||||
akkadian = { version = "7.18"; file = "Akkadian.zip"; sha256 = "1bplcvszbdrk85kqipn9lzhr62647wjibz1p8crzjvsw6f9ymxy3"; description = "Sumero-Akkadian Cuneiform"; };
|
||||
assyrian = { version = "2.00"; file = "AssyrianFont.zip"; sha256 = "0vdvb24vsnmwzd6bw14akqg0hbvsk8avgnbwk9fkybn1f801475k"; description = "Neo-Assyrian in Unicode with OpenType"; };
|
||||
eemusic = { version = "2.00"; file = "EEMusic.zip"; sha256 = "1y9jf105a2b689m7hdjmhhr7z5j0qd2w6dmb3iic9bwaczlrjy7j"; description = "Byzantine Musical Notation in Unicode with OpenType"; };
|
||||
maya = { version = "4.18"; file = "Maya.zip"; sha256 = "08z2ch0z2c43fjfg5m4yp3l1dp0cbk7lv5i7wzsr3cr9kr59wpi9"; description = "Maya Hieroglyphs"; };
|
||||
symbola = { version = "12.00"; file = "Symbola.zip"; sha256 = "1i3xra33xkj32vxs55xs2afrqyc822nk25669x78px5g5qd8gypm"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
|
||||
textfonts = { version = "9.00"; file = "Textfonts.zip"; sha256 = "0wzxz4j4fgk81b88d58715n1wvq2mqmpjpk4g5hi3vk77y2zxc4d"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
|
||||
unidings = { version = "9.19"; file = "Unidings.zip"; sha256 = "1bybzgdqhmq75hb12n3pjrsdcpw1a6sgryx464s68jlq4zi44g78"; description = "Glyphs and Icons for blocks of The Unicode Standard"; };
|
||||
aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "1w4ks341jw12p6zi1fy1hb3kqiqv61yn8i2hr9ybng9n8xdw03li"; description = "Aegean"; };
|
||||
aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "16j8rj3mr2cddag7laxvzpm5w3yk467fwzsk60nq8pnh6ab1v05y"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
|
||||
akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "1f2v9cjk307c5lw0si9hwjcll5wb9nwwy5im0y16kvpgwh2ccshc"; description = "Sumero-Akkadian Cuneiform"; };
|
||||
assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "18nx6ayfk3ba6wg1rp37r9fll5ajrwq2mp5w2l3y1q1kk92frkid"; description = "Neo-Assyrian in Unicode with OpenType"; };
|
||||
eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "1kk5rd3wd7y13z9bqcg1k9idbwad4l3hfmi3lbfk4y1w895vgxk2"; description = "Byzantine Musical Notation in Unicode with OpenType"; };
|
||||
maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "0fzzrlkd4m2dj2phg97nz782w0afmw0f0ykdvlwyp29j1ak7yyp1"; description = "Maya Hieroglyphs"; };
|
||||
symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "04pxh5agvlkyg8mvv2szwshnmzi3n0m7va4xsyq401zbsa147rmi"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
|
||||
textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "1xp8qlfpvcf5n96zgm07zij3ndlzvqjlii8gx9sbj5aa56rxkdgb"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; };
|
||||
unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "0cvnxblk9wsr8mxm5lrdpdm456vi7lln7qh53b67npg4baf0as63"; description = "Glyphs and Icons for blocks of The Unicode Standard"; };
|
||||
};
|
||||
|
||||
mkpkg = name_: {version, file, sha256, description}: fetchzip rec {
|
||||
name = "${name_}-${version}";
|
||||
url = "http://users.teilar.gr/~g1951d/${file}";
|
||||
url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/{fonts,doc}
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.odt \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any
|
||||
rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty
|
||||
'';
|
||||
inherit sha256;
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
# see http://users.teilar.gr/~g1951d/License.pdf
|
||||
# see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
|
||||
# quite draconian: non-commercial, no modifications,
|
||||
# no redistribution, "a single instantiation and no
|
||||
# network installation"
|
||||
license = lib.licenses.unfree;
|
||||
homepage = "http://users.teilar.gr/~g1951d/";
|
||||
homepage = "https://dn-works.com/ufas/";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -219,28 +219,34 @@ let
|
|||
|
||||
in
|
||||
rec {
|
||||
binaryCrystal_0_36 = genericBinary {
|
||||
version = "0.36.1";
|
||||
binaryCrystal_1_0 = genericBinary {
|
||||
version = "1.0.0";
|
||||
sha256s = {
|
||||
x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q";
|
||||
i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1";
|
||||
x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v";
|
||||
x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880";
|
||||
i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch";
|
||||
x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099";
|
||||
};
|
||||
};
|
||||
|
||||
crystal_0_36 = generic {
|
||||
version = "0.36.1";
|
||||
sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk=";
|
||||
binary = binaryCrystal_0_36;
|
||||
};
|
||||
|
||||
crystal_1_0 = generic {
|
||||
version = "1.0.0";
|
||||
sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8=";
|
||||
binary = crystal_0_36;
|
||||
binary = binaryCrystal_1_0;
|
||||
};
|
||||
|
||||
crystal = crystal_1_0;
|
||||
crystal_1_1 = generic {
|
||||
version = "1.1.1";
|
||||
sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ=";
|
||||
binary = crystal_1_0;
|
||||
};
|
||||
|
||||
crystal_1_2 = generic {
|
||||
version = "1.2.0";
|
||||
sha256 = "sha256-38mmsolzmCnv+MFUMc+AEiklDLBHIr/jqXMLzc0nVq4=";
|
||||
binary = crystal_1_1;
|
||||
};
|
||||
|
||||
crystal = crystal_1_2;
|
||||
|
||||
crystal2nix = callPackage ./crystal2nix.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ stdenv.mkDerivation ({
|
|||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with lib.maintainers; [ peti veprbl ];
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ stdenv.mkDerivation ({
|
|||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with lib.maintainers; [ peti veprbl ];
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
|
|
|
|||
|
|
@ -344,8 +344,6 @@ stdenv.mkDerivation ({
|
|||
compiler used in the GNU system including the GNU/Linux variant.
|
||||
'';
|
||||
|
||||
maintainers = with lib.maintainers; [ peti ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
|
|||
declarativity of logic programming.
|
||||
'';
|
||||
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
{ lib, fetchFromGitHub, crystal_1_0, openssl }:
|
||||
{ lib, fetchFromGitHub, crystal, openssl }:
|
||||
|
||||
let
|
||||
crystal = crystal_1_0;
|
||||
|
||||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
version = "0.14.0";
|
||||
pname = "mint";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A ISO-compatible high-performance Prolog compiler";
|
||||
license = lib.licenses.artistic2;
|
||||
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = !stdenv.is64bit; # the linux 32 bit build fails.
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,6 +42,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl2;
|
||||
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ stdenv.mkDerivation {
|
|||
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
|
||||
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
|
||||
++ optionals (versionOlder version "1.73") lib.platforms.riscv;
|
||||
maintainers = with maintainers; [ peti ];
|
||||
};
|
||||
|
||||
preConfigure = optionalString useMpi ''
|
||||
|
|
|
|||
|
|
@ -21,6 +21,5 @@ stdenv.mkDerivation rec {
|
|||
license = "as-is";
|
||||
|
||||
platforms = lib.platforms.unix; # Once had cygwin problems
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,14 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Fix for falling back to GeoIP when WiFi devices are not found
|
||||
# https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494
|
||||
# NOTE: this should be removed when the next version is released
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch";
|
||||
sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII=";
|
||||
})
|
||||
|
||||
# Make the Mozilla API key configurable
|
||||
# https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
|
||||
(fetchpatch {
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@ let self = stdenv.mkDerivation rec {
|
|||
|
||||
platforms = platforms.all;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
maintainers = [ maintainers.peti ];
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ let self = stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.peti maintainers.vrthra ];
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "21.3.4";
|
||||
version = "21.3.5";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr";
|
||||
sha256 = "1wc8qhz1j4z42jmnsr38y15kc0jhfqfx8ssnb5055kmmmvzwk1sh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
HOME=$TMPDIR xvfb-run meson test
|
||||
HOME=$TMPDIR xvfb-run meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -170,7 +170,6 @@ let
|
|||
description = "A cryptographic library that implements the SSL and TLS protocols";
|
||||
license = licenses.openssl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.peti ];
|
||||
} // extraMeta;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
|
|||
license = "as-is";
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.peti ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "phpstan";
|
||||
version = "0.12.90";
|
||||
version = "0.12.99";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
|
||||
sha256 = "0f8858w9b421s3dfz8a56g0mik4zyi1lp88lijw4zs2d94dcdl9s";
|
||||
sha256 = "0rv8xf5yx88wh95myysqmv29n5rr15zgwsvh8a4xb1pmw3h9kb6q";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ buildPythonPackage rec {
|
|||
description = "Bugzilla XMLRPC access module";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pierron peti ];
|
||||
maintainers = with maintainers; [ pierron ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deepdiff";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
# pypi source does not contain all fixtures required for tests
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "seperman";
|
||||
repo = "deepdiff";
|
||||
rev = version;
|
||||
sha256 = "sha256-PQijGub0sAW0aBYI+Ir89SraXaWx7OcQ+txZSqodJ6w=";
|
||||
sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
|||
description = "Django library for Mailman UIs";
|
||||
homepage = "https://gitlab.com/mailman/django-mailman3";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
77
pkgs/development/python-modules/dragonfly/default.nix
Normal file
77
pkgs/development/python-modules/dragonfly/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, decorator
|
||||
, packaging
|
||||
, pynput
|
||||
, regex
|
||||
, lark-parser
|
||||
, enum34
|
||||
, pyperclip
|
||||
, six
|
||||
, requests
|
||||
, psutil
|
||||
, json-rpc
|
||||
, werkzeug
|
||||
, kaldi-active-grammar
|
||||
, sounddevice
|
||||
, webrtcvad
|
||||
, setuptools
|
||||
, xdotool
|
||||
, wmctrl
|
||||
, xorg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dragonfly";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dictation-toolbox";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "BUbIhc8as/DVx8/4VeQS9emOLGcWFujNCxesSEEBqKQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser'
|
||||
substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \
|
||||
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
|
||||
substituteInPlace dragonfly/windows/x11_window.py \
|
||||
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \
|
||||
--replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \
|
||||
--replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
decorator
|
||||
packaging
|
||||
pynput
|
||||
regex
|
||||
lark-parser
|
||||
enum34
|
||||
pyperclip
|
||||
six
|
||||
requests
|
||||
psutil
|
||||
json-rpc
|
||||
werkzeug
|
||||
kaldi-active-grammar # for the Kaldi engine
|
||||
sounddevice
|
||||
webrtcvad
|
||||
setuptools # needs pkg_resources at runtime
|
||||
];
|
||||
|
||||
# Too many tests fail because of the unusual environment or
|
||||
# because of the missing dependencies for some of the engines.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "dragonfly" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speech recognition framework allowing powerful Python-based scripting";
|
||||
homepage = "https://github.com/dictation-toolbox/dragonfly";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41";
|
||||
sha256 = "0x18l8jgbki9yqx994w97dagfaqrbxi3sy2l2101is1dfjr0kib6";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2454e8dd93093fe6f6ec8e6771f8a7dab19f1d02c629dbbe8972e84b5d9c01e0";
|
||||
sha256 = "3804e37865b4d63ac39eac3f8f184225db16bbc69f201b4d54abe6b68f170e60";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "iminuit";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8e22d81a53ce3316f0253bf0b7831bd72ac1122ca78896c2ee2e585178c5c9ae";
|
||||
sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,156 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 66e6d49..78f7b42 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,23 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.13.0)
|
||||
project(kaldi_binaries)
|
||||
|
||||
-include(ExternalProject)
|
||||
-include(ProcessorCount)
|
||||
-
|
||||
-ProcessorCount(NCPU)
|
||||
-if(NOT NCPU EQUAL 0)
|
||||
- set(MAKE_FLAGS -j${NCPU})
|
||||
-endif()
|
||||
-
|
||||
-set(DST ${PROJECT_SOURCE_DIR}/kaldi_active_grammar/exec)
|
||||
-if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- set(DST ${DST}/macos/)
|
||||
-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
- set(DST ${DST}/linux/)
|
||||
-else()
|
||||
- set(DST ${DST}/windows/)
|
||||
-endif()
|
||||
-
|
||||
set(BINARIES
|
||||
tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX}
|
||||
tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX}
|
||||
@@ -29,63 +12,6 @@ set(LIBRARIES
|
||||
src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
)
|
||||
|
||||
-# For MacOS, we handle all the "indirect" shared libraries manually.
|
||||
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- list(APPEND LIBRARIES
|
||||
- tools/openfst/lib/libfst${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- tools/openfst/lib/libfstscript${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-base${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-chain${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-cudamatrix${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-decoder${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-feat${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-fstext${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-gmm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-hmm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-ivector${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-lat${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-lm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-matrix${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-nnet2${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-nnet3${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-online2${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-rnnlm${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-transform${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-tree${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- src/lib/libkaldi-util${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
|
||||
- message(FATAL_ERROR "CMake build not supported on Windows")
|
||||
- # FIXME: copy files?
|
||||
- # https://cmake.org/cmake/help/latest/command/foreach.html
|
||||
- # https://stackoverflow.com/questions/34799916/copy-file-from-source-directory-to-binary-directory-using-cmake
|
||||
-endif()
|
||||
-
|
||||
-find_program(MAKE_EXE NAMES make gmake nmake)
|
||||
-
|
||||
-if(DEFINED ENV{INTEL_MKL_DIR})
|
||||
- # Default: INTEL_MKL_DIR=/opt/intel/mkl/
|
||||
- message("Compiling with MKL in: $ENV{INTEL_MKL_DIR}")
|
||||
- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=MKL --mkl-root=$ENV{INTEL_MKL_DIR})
|
||||
- set(MATHLIB_BUILD_COMMAND true)
|
||||
-else()
|
||||
- message("Compiling with OpenBLAS")
|
||||
- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=OPENBLAS)
|
||||
- set(MATHLIB_BUILD_COMMAND cd tools
|
||||
- && git clone -b v0.3.13 --single-branch https://github.com/xianyi/OpenBLAS
|
||||
- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS DYNAMIC_ARCH=1 TARGET=GENERIC USE_LOCKING=1 USE_THREAD=0 all
|
||||
- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS PREFIX=install install
|
||||
- && cd ..)
|
||||
-endif()
|
||||
-
|
||||
-if(DEFINED ENV{KALDI_BRANCH})
|
||||
- set(KALDI_BRANCH $ENV{KALDI_BRANCH})
|
||||
-else()
|
||||
- message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?")
|
||||
- # set(KALDI_BRANCH "origin/master")
|
||||
-endif()
|
||||
|
||||
message("MAKE_EXE = ${MAKE_EXE}")
|
||||
message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
|
||||
@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}")
|
||||
|
||||
# CXXFLAGS are set and exported in kaldi-configure-wrapper.sh
|
||||
|
||||
-if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
|
||||
- set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip)
|
||||
- set(STRIP_DST_COMMAND find ${DST} | xargs strip)
|
||||
- if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- list(APPEND STRIP_LIBS_COMMAND -x)
|
||||
- list(APPEND STRIP_DST_COMMAND -x)
|
||||
- endif()
|
||||
- ExternalProject_Add(kaldi
|
||||
- GIT_CONFIG advice.detachedHead=false
|
||||
- GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git
|
||||
- GIT_TAG ${KALDI_BRANCH}
|
||||
- GIT_SHALLOW TRUE
|
||||
- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/
|
||||
- BUILD_IN_SOURCE TRUE
|
||||
- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin
|
||||
- LIST_SEPARATOR " "
|
||||
- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST}
|
||||
- )
|
||||
-endif()
|
||||
-
|
||||
-# Fix dynamic libraries loading paths on macOS. The libraries and
|
||||
-# executables are built with RPATH settings embedded in them, pointing
|
||||
-# to the locations in temporary directories used to build the
|
||||
-# binaries. After package installation is done, these directories are
|
||||
-# deleted and the dynamic libraries cannot be loaded. The following
|
||||
-# commands generate a shell script that fixes the paths to the dynamic
|
||||
-# libraries in the built executables and the libraries themselves.
|
||||
-# Also the commands add a custom target to invoke the generated script
|
||||
-# after the external project (kaldi) has been built. An alternative
|
||||
-# would be to change the kaldi engine build system to accept a path to
|
||||
-# where the binaries would be placed and point RPATH to that location.
|
||||
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||
- string (REPLACE ";" " " BINARIES_STR "${BINARIES}")
|
||||
- string (REPLACE ";" " " LIBRARIES_STR "${LIBRARIES}")
|
||||
- file(GENERATE OUTPUT name_fixer
|
||||
- CONTENT
|
||||
- "for a in ${BINARIES_STR} ; do
|
||||
- a_bare=$\{a##*/\}
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare
|
||||
- for b in ${LIBRARIES_STR} ; do
|
||||
- b_bare=$\{b##*/\}
|
||||
- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare
|
||||
- done
|
||||
- done
|
||||
- for a in ${LIBRARIES_STR} ; do
|
||||
- a_bare=$\{a##*/\}
|
||||
- install_name_tool -id \"@loader_path/$a_bare\" ${DST}$a_bare
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare
|
||||
- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare
|
||||
- for b in ${LIBRARIES_STR} ; do
|
||||
- b_bare=$\{b##*/\}
|
||||
- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare
|
||||
- done
|
||||
- done")
|
||||
- add_custom_target(fixer ALL COMMAND /bin/sh name_fixer)
|
||||
- add_dependencies(fixer kaldi)
|
||||
-endif()
|
||||
-
|
||||
install(CODE "MESSAGE(\"Installed kaldi engine binaries.\")")
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py
|
||||
index 0b70c7f..21e1d62 100644
|
||||
--- a/kaldi_active_grammar/utils.py
|
||||
+++ b/kaldi_active_grammar/utils.py
|
||||
@@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux'
|
||||
elif sys.platform.startswith('darwin'): platform = 'macos'
|
||||
else: raise KaldiError("unknown sys.platform")
|
||||
|
||||
-exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform)
|
||||
+exec_dir = '/'
|
||||
library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform]
|
||||
subprocess_seperator = '^&' if platform == 'windows' else ';'
|
||||
|
||||
@@ -89,13 +89,13 @@ class ExternalProcess(object):
|
||||
|
||||
shell = ush.Shell(raise_on_error=True)
|
||||
|
||||
- fstcompile = shell(os.path.join(exec_dir, 'fstcompile'))
|
||||
- fstarcsort = shell(os.path.join(exec_dir, 'fstarcsort'))
|
||||
- fstaddselfloops = shell(os.path.join(exec_dir, 'fstaddselfloops'))
|
||||
- fstinfo = shell(os.path.join(exec_dir, 'fstinfo'))
|
||||
- # compile_graph = shell(os.path.join(exec_dir, 'compile-graph'))
|
||||
- compile_graph_agf = shell(os.path.join(exec_dir, 'compile-graph-agf'))
|
||||
- # compile_graph_agf_debug = shell(os.path.join(exec_dir, 'compile-graph-agf-debug'))
|
||||
+ fstcompile = shell('fstcompile')
|
||||
+ fstarcsort = shell('fstarcsort')
|
||||
+ fstaddselfloops = shell('fstaddselfloops')
|
||||
+ fstinfo = shell('fstinfo')
|
||||
+ # compile_graph = shell('compile-graph')
|
||||
+ compile_graph_agf = shell('compile-graph-agf')
|
||||
+ # compile_graph_agf_debug = shell('compile-graph-agf-debug')
|
||||
|
||||
make_lexicon_fst = shell([sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'kaldi', 'make_lexicon_fst%s.py' % ('_py2' if PY2 else ''))])
|
||||
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/kaldi_active_grammar/ffi.py b/kaldi_active_grammar/ffi.py
|
||||
index 936ed35..1eb2f3d 100644
|
||||
--- a/kaldi_active_grammar/ffi.py
|
||||
+++ b/kaldi_active_grammar/ffi.py
|
||||
@@ -15,7 +15,7 @@ from cffi import FFI
|
||||
from .utils import exec_dir, platform
|
||||
|
||||
_ffi = FFI()
|
||||
-_library_binary_path = os.path.join(exec_dir, dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform])
|
||||
+_library_binary_path = os.path.join('@kaldiFork@', dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform])
|
||||
_c_source_ignore_regex = re.compile(r'(\b(extern|DRAGONFLY_API)\b)|("C")|(//.*$)', re.MULTILINE) # Pattern for extraneous stuff to be removed
|
||||
|
||||
def encode(text):
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ededc78b8..7ee1879a5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -188,6 +188,7 @@ add_subdirectory(src/ivector)
|
||||
add_subdirectory(src/online)
|
||||
add_subdirectory(src/online2)
|
||||
add_subdirectory(src/kws)
|
||||
+add_subdirectory(src/dragonfly)
|
||||
|
||||
add_subdirectory(src/itf)
|
||||
|
||||
@@ -219,6 +220,7 @@ add_subdirectory(src/ivectorbin)
|
||||
add_subdirectory(src/onlinebin)
|
||||
add_subdirectory(src/online2bin)
|
||||
add_subdirectory(src/kwsbin)
|
||||
+add_subdirectory(src/dragonflybin)
|
||||
|
||||
# add all cuda executables
|
||||
if(CUDA_FOUND)
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/configure b/src/configure
|
||||
index 1186c6d12..4ad355e64 100755
|
||||
--- a/src/configure
|
||||
+++ b/src/configure
|
||||
@@ -1045,9 +1045,6 @@ echo "AS = $AS" >> kaldi.mk
|
||||
echo "RANLIB = $RANLIB" >> kaldi.mk
|
||||
echo >> kaldi.mk
|
||||
|
||||
-echo "Checking compiler $CXX ..."
|
||||
-check_compiler $CXX
|
||||
-
|
||||
echo "# Base configuration" >> kaldi.mk
|
||||
echo >> kaldi.mk
|
||||
if $dynamic_kaldi ; then
|
||||
@@ -1066,11 +1063,6 @@ if [ ! -f $FSTROOT/include/fst/fst.h ]; then
|
||||
failure "Could not find file $FSTROOT/include/fst/fst.h:
|
||||
you may not have installed OpenFst. See ../tools/INSTALL"
|
||||
fi
|
||||
-OPENFST_VER=${OPENFST_VER:-$(grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::')}
|
||||
-OPENFST_VER_NUM=$(echo $OPENFST_VER | sed 's/\./ /g' | xargs printf "%d%02d%02d")
|
||||
-if [ $OPENFST_VER_NUM -lt 10600 ]; then
|
||||
- failure "OpenFst-$OPENFST_VER is not supported. You need OpenFst >= 1.6.0.)"
|
||||
-fi
|
||||
echo "OPENFSTINC = $FSTROOT/include" >> kaldi.mk
|
||||
if $static_fst ; then
|
||||
OPENFSTLIBS="$FSTROOT/lib/libfst.a"
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, scikit-build
|
||||
, cmake
|
||||
, ush
|
||||
, requests
|
||||
, numpy
|
||||
, cffi
|
||||
, openfst
|
||||
, substituteAll
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
kaldi = callPackage ./fork.nix { };
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "kaldi-active-grammar";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daanzu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY=";
|
||||
};
|
||||
|
||||
KALDI_BRANCH = "foo";
|
||||
KALDIAG_SETUP_RAW = "1";
|
||||
|
||||
patches = [
|
||||
# Makes sure scikit-build doesn't try to build the dependencies for us
|
||||
./0001-stub.patch
|
||||
# Uses the dependencies' binaries from $PATH instead of a specific directory
|
||||
./0002-exec-path.patch
|
||||
# Makes it dynamically link to the correct Kaldi library
|
||||
(substituteAll {
|
||||
src = ./0003-ffi-path.patch;
|
||||
kaldiFork = "${kaldi}/lib";
|
||||
})
|
||||
];
|
||||
|
||||
# scikit-build puts us in the wrong folder. That is bad.
|
||||
preBuild = ''
|
||||
cd ..
|
||||
'';
|
||||
|
||||
buildInputs = [ openfst kaldi ];
|
||||
nativeBuildInputs = [ scikit-build cmake ];
|
||||
propagatedBuildInputs = [ ush requests numpy cffi ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Kaldi speech recognition";
|
||||
homepage = "https://github.com/daanzu/kaldi-active-grammar";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
# Other platforms are supported upstream.
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, blas
|
||||
, lapack
|
||||
, openfst
|
||||
, icu
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, python3
|
||||
, openblas
|
||||
, zlib
|
||||
, gfortran
|
||||
}:
|
||||
|
||||
let
|
||||
old-openfst = openfst.overrideAttrs (self: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "kkm000";
|
||||
repo = "openfst";
|
||||
rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9";
|
||||
sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx";
|
||||
};
|
||||
buildInputs = [ zlib ];
|
||||
}); in
|
||||
|
||||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kaldi";
|
||||
version = "kag-v2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daanzu";
|
||||
repo = "kaldi-fork-active-grammar";
|
||||
rev = version;
|
||||
sha256 = "+kT2xJRwDj/ECv/v/J1FpsINWOK8XkP9ZvZ9moFRl70=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0004-fork-cmake.patch
|
||||
./0006-fork-configure.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
openblas
|
||||
old-openfst
|
||||
icu
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
gfortran
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"dragonfly"
|
||||
"dragonflybin"
|
||||
"bin"
|
||||
"fstbin"
|
||||
"lmbin"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Replace the shebangs for the various build scripts
|
||||
patchShebangs src
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
./configure --shared --fst-root="${old-openfst}" --use-cuda=no --openblas-root="${openblas}" --mathlib=OPENBLAS
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Fixes "patchelf: wrong ELF type"
|
||||
find . -type f -name "*.o" -print0 | xargs -0 rm -f
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp lib/* $out/lib/
|
||||
patchelf \
|
||||
--set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \
|
||||
$out/lib/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speech Recognition Toolkit";
|
||||
homepage = "https://kaldi-asr.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -21,6 +21,6 @@ buildPythonPackage rec {
|
|||
description = "Mailman archiver plugin for HyperKitty";
|
||||
homepage = "https://gitlab.com/mailman/mailman-hyperkitty";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ globin peti qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ buildPythonPackage rec {
|
|||
description = "REST client for driving Mailman 3";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ peti globin qyliss ];
|
||||
maintainers = with maintainers; [ globin qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.51";
|
||||
version = "2.1.52";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "32c5bf3926c1ac001d57f6b7569fc1fdd7ccfe747190f2e61d6baf610811beb8";
|
||||
sha256 = "6ab60a316892e6e7c6a39cdcbd324d2c3d763b2fe60f381a6fe34b671f24b6e0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.21.3";
|
||||
version = "1.22.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f73f1d477cda12a7b784be73c8a0c06c71e4284ef90cae4883cbc7c524b95fbf";
|
||||
sha256 = "c5172252fc92142ec104cd5e7231be4580a1a0a814403707bafbf7bb8383a29a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.12.34";
|
||||
version = "8.12.35";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2d0f3db2944130f4a842f37a3b252f4a32cc0454a1a2e992c6480c7c17f1b121";
|
||||
sha256 = "f426d419aabf6366c27ef1193918cc55217ef0e8be8f09cbf0667131037ca229";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "progressbar2";
|
||||
version = "3.53.3";
|
||||
version = "3.54.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f4e1c2d48e608850c59f793d6e74ccdebbcbaac7ffe917d45e9646ec0d664d6d";
|
||||
sha256 = "d878893cda2f477c63b5bd0f7f5301f03dd0a81c02554a1f2c5562036369376a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-utils ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue