Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f62eaaa779
71 changed files with 455 additions and 254 deletions
|
|
@ -13,18 +13,10 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
services.cage = {
|
||||
enable = true;
|
||||
user = "alice";
|
||||
program = "${pkgs.xterm}/bin/xterm -cm -pc"; # disable color and bold to make OCR easier
|
||||
# Disable color and bold and use a larger font to make OCR easier:
|
||||
program = "${pkgs.xterm}/bin/xterm -cm -pc -fa Monospace -fs 24";
|
||||
};
|
||||
|
||||
# this needs a fairly recent kernel, otherwise:
|
||||
# [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory
|
||||
# [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory
|
||||
# [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory
|
||||
# [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory
|
||||
# [backend/drm/drm.c:618] Failed to initialize renderer on connector 'Virtual-1': initial page-flip failed
|
||||
# [backend/drm/drm.c:701] Failed to initialize renderer for plane
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
virtualisation.memorySize = 1024;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
|
||||
++ optional outputsSupport "--enable-outputs"
|
||||
++ optional visualizerSupport "--enable-visualizer --with-fftw"
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "nano";
|
||||
version = "5.6.1";
|
||||
version = "5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
|
||||
sha256 = "02cbxqizbdlfwnz8dpq4fbzmdi4yk6fv0cragvpa0748w1cp03bn";
|
||||
sha256 = "1ynarilx0ca0a5h6hl5bf276cymyy8s9wr5l24vyy7f15v683cfl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
|
||||
|
|
|
|||
|
|
@ -78,5 +78,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ erictapen ];
|
||||
license = licenses.asl20;
|
||||
mainProgram = "magick";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
77
pkgs/applications/misc/hunter/default.nix
Normal file
77
pkgs/applications/misc/hunter/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ lib, stdenv, pkg-config, rustPlatform, fetchFromGitHub, fetchpatch
|
||||
, makeWrapper, glib, gst_all_1, CoreServices, IOKit, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hunter";
|
||||
version = "2020-05-25-unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rabite0";
|
||||
repo = "hunter";
|
||||
rev = "355d9a3101f6d8dc375807de79e368602f1cb87d";
|
||||
sha256 = "sha256-R2wNkG8bFP7X2pdlebHK6GD15qmD/zD3L0MwVthvzzQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-dependencies-on-rust-nightly";
|
||||
url = "https://github.com/06kellyjac/hunter/commit/a5943578e1ee679c8bc51b0e686c6dddcf74da2a.diff";
|
||||
sha256 = "sha256-eOwBFfW5m8tPnu+whWY/53X9CaqiVj2WRr25G+Yy7qE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-accessing-core-when-moved-with-another-clone";
|
||||
url = "https://github.com/06kellyjac/hunter/commit/2e95cc567c751263f8c318399f3c5bb01d36962a.diff";
|
||||
sha256 = "sha256-yTzIXUw5qEaR2QZHwydg0abyZVXfK6fhJLVHBI7EAro=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-resolve-breaking-changes-from-package-updates";
|
||||
url = "https://github.com/06kellyjac/hunter/commit/2484f0db580bed1972fd5000e1e949a4082d2f01.diff";
|
||||
sha256 = "sha256-K+WUxEr1eE68XejStj/JwQpMHlhkiOw6PmiSr1GO0kc=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
name = "chore-cargo-update";
|
||||
url = "https://github.com/06kellyjac/hunter/commit/b0be49a82191a4420b6900737901a71140433efd.diff";
|
||||
sha256 = "sha256-ctxoDwyIJgEhMbMUfrjCTy2SeMUQqMi971szrqEOJeg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "chore-cargo-upgrade-+-cargo-update";
|
||||
url = "https://github.com/06kellyjac/hunter/commit/1b8de9248312878358afaf1dac569ebbccc4321a.diff";
|
||||
sha256 = "sha256-+4DZ8SaKwKNmr2SEgJJ7KZBIctnYFMQFKgG+yCkbUv0=";
|
||||
})
|
||||
];
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [
|
||||
glib
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gst-plugins-bad
|
||||
]) ++ lib.optionals stdenv.isDarwin [ CoreServices IOKit Security ];
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features=img,video" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/hunter --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-Bd/gilebxC4H+/1A41OSSfWBlHcSczsFcU2b+USnI74=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The fastest file manager in the galaxy!";
|
||||
homepage = "https://github.com/rabite0/hunter";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
# error[E0308]: mismatched types
|
||||
# --> src/files.rs:502:62
|
||||
# expected raw pointer `*const u8`, found raw pointer `*const i8`
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
, pcre
|
||||
, glib
|
||||
, imlib2
|
||||
, gtk2
|
||||
, gtk3
|
||||
, libXinerama
|
||||
, libXrender
|
||||
, libXcomposite
|
||||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tint2";
|
||||
version = "16.7";
|
||||
version = "17.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "o9000";
|
||||
repo = "tint2";
|
||||
rev = version;
|
||||
sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0";
|
||||
sha256 = "1gy5kki7vqrj43yl47cw5jqwmj45f7a8ppabd5q5p1gh91j7klgm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
pcre
|
||||
glib
|
||||
imlib2
|
||||
gtk2
|
||||
gtk3
|
||||
libXinerama
|
||||
libXrender
|
||||
libXcomposite
|
||||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/o9000/tint2";
|
||||
description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "92.0.4484.7",
|
||||
"sha256": "1111b1vj4zqcz57c65pjbxjilvv2ps8cjz2smxxz0vjd432q2fdf",
|
||||
"sha256bin64": "0qb5bngp3vwn7py38bn80k43safm395qda760nd5kzfal6c98fi1",
|
||||
"version": "92.0.4491.6",
|
||||
"sha256": "0dwmcqzr7ysy7555l5amzppz8rxgxbgf6fy8lq4ykn2abx4m8n8a",
|
||||
"sha256bin64": "041j6nm49w03qadwlsav50avdp6pwf1a8asybgvkjaxy4fpck376",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-04-06",
|
||||
|
|
|
|||
|
|
@ -161,5 +161,8 @@ in stdenv.mkDerivation {
|
|||
# will try to merge PRs and respond to issues but I'm not actually using
|
||||
# Google Chrome.
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram =
|
||||
if (channel == "dev") then "google-chrome-unstable"
|
||||
else "google-chrome-${channel}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -402,6 +402,7 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
|
||||
platforms = attrNames srcs;
|
||||
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
|
||||
mainProgram = "tor-browser";
|
||||
hydraPlatforms = [];
|
||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||
# the compound is "libre" in a strict sense (some components place certain
|
||||
|
|
|
|||
|
|
@ -1,40 +1,74 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, packr }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, packr, makeWrapper, installShellFiles, helm, kustomize }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "1.8.6";
|
||||
commit = "28aea3dfdede00443b52cc584814d80e8f896200";
|
||||
version = "2.0.1";
|
||||
commit = "33eaf11e3abd8c761c726e815cbb4b6af7dcb030";
|
||||
tag = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kJ3/1owK5T+FbcvjmK2CO+i/KwmVZRSGzF6fCt8J9E8=";
|
||||
rev = tag;
|
||||
sha256 = "sha256-j/RdiMeaYxlmEvo5CKrGvkp25MrFsSYh+XNYWNcs0PE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rZ/ox180h9scocheYtMmKkoHY2/jH+I++vYX8R0fdlA=";
|
||||
vendorSha256 = "sha256-8j5v99wOHM/SndJwpmGWiCFEyw4K513HEEbkPrD8C90=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ packr ];
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X github.com/argoproj/argo-cd/common.version=${version}
|
||||
-X github.com/argoproj/argo-cd/common.buildDate=unknown
|
||||
-X github.com/argoproj/argo-cd/common.gitCommit=${commit}
|
||||
-X github.com/argoproj/argo-cd/common.gitTreeState=clean
|
||||
'';
|
||||
nativeBuildInputs = [ packr makeWrapper installShellFiles ];
|
||||
|
||||
# run packr to embed assets
|
||||
preBuild = ''
|
||||
packr
|
||||
'';
|
||||
|
||||
buildFlagsArray =
|
||||
let package_url = "github.com/argoproj/argo-cd/v2/common"; in
|
||||
[
|
||||
"-ldflags="
|
||||
"-s -w"
|
||||
"-X ${package_url}.version=${version}"
|
||||
"-X ${package_url}.buildDate=unknown"
|
||||
"-X ${package_url}.gitCommit=${commit}"
|
||||
"-X ${package_url}.gitTag=${tag}"
|
||||
"-X ${package_url}.gitTreeState=clean"
|
||||
];
|
||||
|
||||
# Test is disabled because ksonnet is missing from nixpkgs.
|
||||
# Log: https://gist.github.com/superherointj/79cbdc869dfd44d28a10dc6746ecb3f9
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
helm
|
||||
kustomize
|
||||
#ksonnet
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/argocd version --client | grep ${tag} > /dev/null
|
||||
$out/bin/argocd-util version | grep ${tag} > /dev/null
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 "$GOPATH/bin/cmd" -T $out/bin/argocd
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for appname in argocd-util argocd-server argocd-repo-server argocd-application-controller argocd-dex ; do
|
||||
makeWrapper $out/bin/argocd $out/bin/$appname --set ARGOCD_BINARY_NAME $appname
|
||||
done
|
||||
installShellCompletion --cmd argocd \
|
||||
--bash <($out/bin/argocd completion bash) \
|
||||
--zsh <($out/bin/argocd completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes";
|
||||
homepage = "https://github.com/argoproj/argo";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ shahrukh330 ];
|
||||
maintainers = with maintainers; [ shahrukh330 superherointj ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.53.0";
|
||||
version = "3.53.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
|
||||
sha256 = "sha256-MJXnYN9PVADttNqj3hshLElHk2Dy9FzE67clMMh85CA=";
|
||||
sha256 = "sha256-ZWh08ursVGcscvQepeoUnFAZfFDeXWdIu0HXIr/D93k=";
|
||||
};
|
||||
|
||||
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring,
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring,
|
||||
harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel,
|
||||
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
|
||||
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
|
||||
|
|
@ -21,14 +21,14 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.19.3";
|
||||
version = "0.20.2";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r49bybqy6c0n1lz6yc85py80wb40w757m60f5rszjf200wnyl6s";
|
||||
sha256 = "sha256-FquvC3tL565711OQmq2ddNwpyJQGgn4dhG/TYZdCRU0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -135,7 +135,7 @@ buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/kovidgoyal/kitty";
|
||||
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
changelog = "https://sw.kovidgoyal.net/kitty/changelog.html";
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
maintainers = with maintainers; [ tex rvolosatovs Luflosi ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "river";
|
||||
version = "unstable-2021-04-08";
|
||||
version = "unstable-2021-04-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifreund";
|
||||
repo = "river";
|
||||
rev = "9e3e92050e04320949c6cd995273c30319ebd515";
|
||||
sha256 = "1v8dpbadsb3c7bc84sai09dbqv5s5s5d77vs12kdkd45x0ppmk3j";
|
||||
repo = pname;
|
||||
rev = "0c8e718d95a6a621b9cba0caa9158915e567b076";
|
||||
sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
installPhase = ''
|
||||
zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
|
||||
'';
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ zig wayland scdoc pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-unite";
|
||||
version = "52";
|
||||
version = "53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardpixel";
|
||||
repo = "unite-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zahng79m2gw27fb2sw8zyk2n07qc0hbn02g5mfqzhwk62g97v4y";
|
||||
sha256 = "0fw9wqf362h2yd67fhgbhqx0b2fwcl25wxmb92dqwigxjcj0dnw6";
|
||||
};
|
||||
|
||||
uuid = "unite@hardpixel.eu";
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
|
|||
platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
|
||||
maintainers = with lib.maintainers; [ taku0 ];
|
||||
inherit knownVulnerabilities;
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
}; in result
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ let result = stdenv.mkDerivation rec {
|
|||
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
|
||||
maintainers = with lib.maintainers; [ taku0 ];
|
||||
inherit knownVulnerabilities;
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
}; in result
|
||||
|
|
|
|||
|
|
@ -142,6 +142,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo asbachb ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -153,6 +153,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -262,6 +262,7 @@ let
|
|||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -184,6 +184,7 @@ let result = stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
}; in result
|
||||
|
|
|
|||
|
|
@ -105,5 +105,6 @@ in stdenv.mkDerivation {
|
|||
'';
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,5 +108,6 @@ in stdenv.mkDerivation {
|
|||
'';
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lmdb";
|
||||
version = "0.9.28";
|
||||
version = "0.9.29";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openldap.org/openldap/openldap.git";
|
||||
rev = "LMDB_${version}";
|
||||
sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as";
|
||||
sha256 = "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3";
|
||||
};
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "caqti";
|
||||
version = "1.3.0";
|
||||
version = "1.5.1";
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
|
@ -11,7 +11,7 @@ buildDunePackage rec {
|
|||
owner = "paurkedal";
|
||||
repo = "ocaml-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ksjchfjnh059wvd95my1sv9b0ild0dfaiynbf2xsaz7zg1y4xmw";
|
||||
sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1";
|
||||
};
|
||||
|
||||
buildInputs = [ cppo ];
|
||||
|
|
|
|||
|
|
@ -30,5 +30,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/ashishb/adb-enhanced";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ vtuan10 ];
|
||||
mainProgram = "adbe";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo=";
|
||||
sha256 = "sha256-AtaAVfMCIzStgwwPEt+6tAzjgpSK+KhhMksYK4BH9V0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyvex ];
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8=";
|
||||
sha256 = "sha256-+d1CtouaGv2GussG3QlQMzX0qcmJht9V3QW8RwH6da8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo=";
|
||||
sha256 = "sha256-B/1BO0MnqklMbyXqdBPA2Dfhr4pMjIIrzXmTzr81OdY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo=";
|
||||
sha256 = "sha256-j0Hxao04ctcV8xCjQjzyQEM4Y3VCFRPuEc9NIhDRut0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng=";
|
||||
sha256 = "sha256-UCO6kXI4W/fCFgevXaRrGMjMH3ZhG7dXmFi+pemX9sE=";
|
||||
};
|
||||
|
||||
# Use upstream z3 implementation
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs=";
|
||||
sha256 = "sha256-ubBs55ZIGssAwD+3YsZYzDA7/dwQ+UD9GtWPDGQrO80=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, ffmpeg_3, async-timeout }:
|
||||
, async-timeout }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ha-ffmpeg";
|
||||
|
|
@ -12,17 +12,21 @@ buildPythonPackage rec {
|
|||
sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg_3 ];
|
||||
|
||||
propagatedBuildInputs = [ async-timeout ];
|
||||
|
||||
# only manual tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"haffmpeg.camera"
|
||||
"haffmpeg.sensor"
|
||||
"haffmpeg.tools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pvizeli/ha-ffmpeg";
|
||||
description = "Library for home-assistant to handle ffmpeg";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
maintainers = teams.home-assistant.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,30 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "IMAPClient";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjs";
|
||||
repo = "imapclient";
|
||||
rev = version;
|
||||
sha256 = "1zc8qj8ify2zygbz255b6fcg7jhprswf008ccwjmbrnj08kh9l4x";
|
||||
sha256 = "sha256-q/8LFKHgrY3pQV7Coz+5pZAw696uABMTEkYoli6C2KA=";
|
||||
};
|
||||
|
||||
# fix test failing in python 36
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_imapclient.py \
|
||||
--replace "if sys.version_info >= (3, 7):" "if sys.version_info >= (3, 6, 4):"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ mock ];
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://imapclient.readthedocs.io";
|
||||
description = "Easy-to-use, Pythonic and complete IMAP client library";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.almac ];
|
||||
maintainers = with maintainers; [ almac dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,22 +4,19 @@
|
|||
, pytestCheckHook
|
||||
, cffi
|
||||
, lmdb
|
||||
, ludios_wpull
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lmdb";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac";
|
||||
sha256 = "5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc";
|
||||
};
|
||||
|
||||
buildInputs = [ lmdb ];
|
||||
|
||||
propogatedBuildInputs = [ ludios_wpull ];
|
||||
|
||||
checkInputs = [ cffi pytestCheckHook ];
|
||||
|
||||
LMDB_FORCE_SYSTEM=1;
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTurboJPEG";
|
||||
inherit version;
|
||||
sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg=";
|
||||
sha256 = "sha256-juy8gVqOXKSGGq+gOBO2BuJEL2RHjjCWJDrwRCvrZIE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM=";
|
||||
sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, sphinx
|
||||
, markdown
|
||||
, CommonMark
|
||||
, recommonmark
|
||||
, pydash
|
||||
, pyyaml
|
||||
, unify
|
||||
, yapf
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-markdown-parser";
|
||||
version = "0.2.4";
|
||||
|
||||
# PyPi release does not include requirements.txt
|
||||
src = fetchFromGitHub {
|
||||
owner = "clayrisser";
|
||||
repo = "sphinx-markdown-parser";
|
||||
# Upstream maintainer currently does not tag releases
|
||||
# https://github.com/clayrisser/sphinx-markdown-parser/issues/35
|
||||
rev = "2fd54373770882d1fb544dc6524c581c82eedc9e";
|
||||
sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx markdown CommonMark pydash pyyaml unify yapf recommonmark ];
|
||||
|
||||
# Avoids running broken tests in test_markdown.py
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest -v tests/test_basic.py tests/test_sphinx.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sphinx_markdown_parser" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Write markdown inside of docutils & sphinx projects";
|
||||
homepage = "https://github.com/clayrisser/sphinx-markdown-parser";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ FlorianFranzen ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,7 +11,8 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'requests~=2.24' 'requests~=2.25'
|
||||
--replace 'requests~=2.24.0' 'requests~=2.25' \
|
||||
--replace 'dnspython~=2.0.0' 'dnspython~=2.1'
|
||||
'';
|
||||
|
||||
# tests make dns requests and fails
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "a76f1f15e6ec39d886f8bf07d5bdfaf70cdc62d8";
|
||||
version = "2021-04-06";
|
||||
rev = "e5a5442acf36f047a75b397d7349e6fe6835ef24";
|
||||
version = "2021-04-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "0zmhn8nvzrbw047g5z4q2slp0wdg6pvfh2pqnpwcq1hscf7dvz8f";
|
||||
sha256 = "0g7wyh0lhhdch7d6p118lwywy1lcdr1z631q891qhv624jnb1477";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
pname = "visualvm";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "sha256-HoDV8Z024+WnECw1ZVwA3dEfbKtuTd4he40UwQnpiGQ=";
|
||||
sha256 = "sha256-IbiyrP3rIj3VToav1bhKnje0scEPSyLwsyclpW7nB+U=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
@ -27,9 +27,6 @@ stdenv.mkDerivation rec {
|
|||
--replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \
|
||||
--replace "/path/to/jdk" "${jdk.home}" \
|
||||
|
||||
substituteInPlace platform/lib/nbexec \
|
||||
--replace /usr/bin/\''${awk} ${gawk}/bin/awk
|
||||
|
||||
cp -r . $out
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/g62LSlaIK67oY6dI8S3Lni85eBBI6piqP2Fsq3HXWQ=";
|
||||
sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo=";
|
||||
};
|
||||
vendorSha256 = "sha256-U0jVdyY4SifPWkOkq3ohY/LvfGcYm4rI+tW1QEm39oo=";
|
||||
vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg=";
|
||||
|
||||
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, symlinkJoin
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, sconsPackages
|
||||
, zlib
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -28,20 +31,34 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
|
||||
buildInputs = [ zlib ];
|
||||
buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
CPPPATH = symlinkJoin {
|
||||
name = "nsis-includes";
|
||||
paths = [ zlib.dev ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
};
|
||||
|
||||
LIBPATH = symlinkJoin {
|
||||
name = "nsis-libs";
|
||||
paths = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
};
|
||||
|
||||
sconsFlags = [
|
||||
"SKIPSTUBS=all"
|
||||
"SKIPPLUGINS=all"
|
||||
"SKIPUTILS=all"
|
||||
"SKIPMISC=all"
|
||||
"APPEND_CPPPATH=${zlib.dev}/include"
|
||||
"APPEND_LIBPATH=${zlib}/lib"
|
||||
"NSIS_CONFIG_CONST_DATA=no"
|
||||
];
|
||||
] ++ lib.optional stdenv.isDarwin "APPEND_LINKFLAGS=-liconv";
|
||||
|
||||
preBuild = ''
|
||||
sconsFlagsArray+=("PATH=$PATH")
|
||||
sconsFlagsArray+=(
|
||||
"PATH=$PATH"
|
||||
"CC=$CC"
|
||||
"CXX=$CXX"
|
||||
"APPEND_CPPPATH=$CPPPATH/include"
|
||||
"APPEND_LIBPATH=$LIBPATH/lib"
|
||||
)
|
||||
'';
|
||||
|
||||
prefixKey = "PREFIX=";
|
||||
|
|
@ -51,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
|
||||
homepage = "https://nsis.sourceforge.io/";
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pombeirp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cdogs";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "cdogs-sdl";
|
||||
owner = "cxong";
|
||||
rev = version;
|
||||
sha256 = "sha256-zWwlcEM2KsYiB48cmRTjou0C86SqeoOLrbacCR0SfIA=";
|
||||
sha256 = "sha256-POioDqmbWj+lYATp/3v14FoKZfR9GjLQyHq3nwDOywA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
homepage = "https://pcsx2.net";
|
||||
maintainers = with maintainers; [ hrdinka govanify ];
|
||||
mainProgram = "PCSX2";
|
||||
|
||||
# PCSX2's source code is released under LGPLv3+. It However ships
|
||||
# additional data files and code that are licensed differently.
|
||||
|
|
|
|||
|
|
@ -151,5 +151,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||
license = with lib.licenses; [ lgpl21Plus ];
|
||||
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
|
||||
maintainers = with lib.maintainers; [ avnik raskin bendlas ];
|
||||
mainProgram = "wine";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -389,12 +389,12 @@ let
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-04-28";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "270e3e1d85d400409247aa6c11445ec2e72f44ee";
|
||||
sha256 = "1i1y72v95660szv5jdcrawqqh7l493v3a1n9zigagzwz9a3sff44";
|
||||
rev = "23c8aacf13be02b985455ef027fbd28896dd1ef8";
|
||||
sha256 = "1bwaxs8rgyr1w81rqygia9ab7l10vcvad0d3xx89x17z6szakj3x";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -533,12 +533,12 @@ let
|
|||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc-nvim";
|
||||
version = "2021-04-26";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "35dcebf8ba0f0b405578d3d919bc54ae2a651138";
|
||||
sha256 = "1lbnic4r0k0xxr5shmgz60b93lk462fnnl10iccns1d4363dz80a";
|
||||
rev = "473668eabee0592e817f9c692b0509c2743fb1c3";
|
||||
sha256 = "1r6wx6bpzfbhb8a95jw1gi2xkvx4h8i4rima2ylkrdbx86hgicjz";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
|
|
@ -1485,6 +1485,18 @@ let
|
|||
meta.homepage = "https://github.com/megaannum/forms/";
|
||||
};
|
||||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2021-04-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "ee28380b2300b374251b89d73e7e5b23c573e2bc";
|
||||
sha256 = "1ap2nf84gbrqlykw1l8zx01m9hm92vw57wkkzv2cqkjcbm3whqyg";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
||||
fruzzy = buildVimPluginFrom2Nix {
|
||||
pname = "fruzzy";
|
||||
version = "2020-08-31";
|
||||
|
|
@ -3048,12 +3060,12 @@ let
|
|||
|
||||
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
|
||||
pname = "nvcode-color-schemes-vim";
|
||||
version = "2021-04-09";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ChristianChiarulli";
|
||||
repo = "nvcode-color-schemes.vim";
|
||||
rev = "90ee71d66da58d57f0cb4a59103874bb519c79d4";
|
||||
sha256 = "0sabb0iyrmfwfld57d1mf44k69bf8pk0c1ilfi3vz2hz04imxgab";
|
||||
rev = "940f2eb232091f970e45232e9c96e5aac7d670de";
|
||||
sha256 = "1sxi0dhbqg6fg23n8m069z6issyng18hbq9v7rxnzw90mqp0y5zb";
|
||||
};
|
||||
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
|
||||
};
|
||||
|
|
@ -3312,12 +3324,12 @@ let
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2021-04-28";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "c6e3e48352711ed6115e86901783efbce193a08f";
|
||||
sha256 = "0zi2ar2sr1v8lp4zim52hihm7qlzz4ijfgy5a6xyhns6csg3a9vf";
|
||||
rev = "58f5ba925b51cfd7edf73e1135588403151bc719";
|
||||
sha256 = "0033r4w4lh59a0ghvpk5r7ww4s46airfgi4idgizsc6w8xkrj2yy";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
|
@ -5390,6 +5402,18 @@ let
|
|||
meta.homepage = "https://github.com/alvan/vim-closetag/";
|
||||
};
|
||||
|
||||
vim-code-dark = buildVimPluginFrom2Nix {
|
||||
pname = "vim-code-dark";
|
||||
version = "2021-04-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomasiser";
|
||||
repo = "vim-code-dark";
|
||||
rev = "670fed53a2ae67542a78ef7b642f4aca6b6326dc";
|
||||
sha256 = "0zdhhv3h8lzba8dpv0amc5abpkzayp6gbjw6qv712p638zyr99vw";
|
||||
};
|
||||
meta.homepage = "https://github.com/tomasiser/vim-code-dark/";
|
||||
};
|
||||
|
||||
vim-codefmt = buildVimPluginFrom2Nix {
|
||||
pname = "vim-codefmt";
|
||||
version = "2021-04-15";
|
||||
|
|
@ -6702,12 +6726,12 @@ let
|
|||
|
||||
vim-kitty-navigator = buildVimPluginFrom2Nix {
|
||||
pname = "vim-kitty-navigator";
|
||||
version = "2021-03-31";
|
||||
version = "2021-04-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "knubie";
|
||||
repo = "vim-kitty-navigator";
|
||||
rev = "f09007be7e477a491a478444b302d079104af23d";
|
||||
sha256 = "06m9rf0c9nxmyz9qnri1lmyb7cljv3vz2njxvh3fz8q7hjghh6cd";
|
||||
rev = "50b87c4287c791addc7364dfa377605d0837d326";
|
||||
sha256 = "0z3hmgflpiv0czdrkvpc845ms7bjy9rs2a6mp7gyzlqyqrjvqzzy";
|
||||
};
|
||||
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
|
||||
};
|
||||
|
|
@ -6870,12 +6894,12 @@ let
|
|||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2021-04-27";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "80f4b269b51eae778a3f3093c144ffe8b2c943a1";
|
||||
sha256 = "15zbdgns2llzjwxzwn4b8bxyjkjjlnxrjrsbdbmkz7rkvkw4bkjd";
|
||||
rev = "b6898841c771df0a5231f74145e0813533d44def";
|
||||
sha256 = "0r5hg2hjcmwm6mkm7s41wij6hdlfq2g5xjvgg0bn8nhyn4048mgd";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
|
|
@ -8059,12 +8083,12 @@ let
|
|||
|
||||
vim-speeddating = buildVimPluginFrom2Nix {
|
||||
pname = "vim-speeddating";
|
||||
version = "2019-11-12";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-speeddating";
|
||||
rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e";
|
||||
sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k";
|
||||
rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b";
|
||||
sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-speeddating/";
|
||||
};
|
||||
|
|
@ -8852,12 +8876,12 @@ let
|
|||
|
||||
vimspector = buildVimPluginFrom2Nix {
|
||||
pname = "vimspector";
|
||||
version = "2021-04-22";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "puremourning";
|
||||
repo = "vimspector";
|
||||
rev = "a47d0b921c42be740e57d75a73ae15a8ee0141d4";
|
||||
sha256 = "05nhav31i3d16d1qdcgbkr8dfgwi53123sv3xd9pr8j7j3rdd0ix";
|
||||
rev = "0c88cc8badeeee74f9cafbf461b72769b06a15d5";
|
||||
sha256 = "1f9k0mhcaaddjdd3619m95syy4rbh5fgacya9fr1580z16vcir8p";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/puremourning/vimspector/";
|
||||
|
|
@ -8959,6 +8983,18 @@ let
|
|||
meta.homepage = "https://github.com/mattn/webapi-vim/";
|
||||
};
|
||||
|
||||
which-key-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "which-key-nvim";
|
||||
version = "2021-04-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "which-key.nvim";
|
||||
rev = "6cf68b49d48f2e07b82aee18ad01c4115d9ce0e5";
|
||||
sha256 = "06r5hlwm1i1gim12k3i5kxrwnhjbq2xfxic5z0iax9m86szb4ja3";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/which-key.nvim/";
|
||||
};
|
||||
|
||||
wildfire-vim = buildVimPluginFrom2Nix {
|
||||
pname = "wildfire-vim";
|
||||
version = "2014-11-16";
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ fisadev/vim-isort
|
|||
flazz/vim-colorschemes
|
||||
floobits/floobits-neovim
|
||||
folke/lsp-colors.nvim@main
|
||||
folke/which-key.nvim
|
||||
folke/which-key.nvim@main
|
||||
freitass/todo.txt-vim
|
||||
frigoeu/psc-ide-vim
|
||||
fruit-in/brainfuck-vim
|
||||
|
|
@ -505,6 +505,7 @@ qpkorr/vim-bufkill
|
|||
Quramy/tsuquyomi
|
||||
racer-rust/vim-racer
|
||||
radenling/vim-dispatch-neovim
|
||||
rafamadriz/friendly-snippets@main
|
||||
rafaqz/ranger.vim
|
||||
rafi/awesome-vim-colorschemes
|
||||
raghur/fruzzy
|
||||
|
|
@ -620,6 +621,7 @@ tmhedberg/SimpylFold
|
|||
tmsvg/pear-tree
|
||||
tmux-plugins/vim-tmux
|
||||
tmux-plugins/vim-tmux-focus-events
|
||||
tomasiser/vim-code-dark
|
||||
tomasr/molokai
|
||||
tomlion/vim-solidity
|
||||
tommcdo/vim-exchange
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
mktplcRef = {
|
||||
name = "terraform";
|
||||
publisher = "hashicorp";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
};
|
||||
|
||||
vsix = fetchurl {
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
||||
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
|
||||
sha256 = "1xhypy4vvrzxj3qwkzpfx8b48hddf72mxmh0hgz7iry6bch6sh5f";
|
||||
sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq";
|
||||
};
|
||||
|
||||
patches = [ ./fix-terraform-ls.patch ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/out/extension.js b/out/extension.js
|
||||
index e44cef2..fba0899 100644
|
||||
index e815393..aeade0e 100644
|
||||
--- a/out/extension.js
|
||||
+++ b/out/extension.js
|
||||
@@ -141,24 +141,6 @@ function updateLanguageServer() {
|
||||
@@ -141,25 +141,6 @@ function updateLanguageServer() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const delay = 1000 * 60 * 24;
|
||||
setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs
|
||||
|
|
@ -16,6 +16,7 @@ index e44cef2..fba0899 100644
|
|||
- yield installer.install();
|
||||
- }
|
||||
- catch (err) {
|
||||
- console.log(err); // for test failure reporting
|
||||
- reporter.sendTelemetryException(err);
|
||||
- throw err;
|
||||
- }
|
||||
|
|
@ -27,7 +28,7 @@ index e44cef2..fba0899 100644
|
|||
return startClients(); // on repeat runs with no install, this will be a no-op
|
||||
});
|
||||
}
|
||||
@@ -256,7 +238,7 @@ function pathToBinary() {
|
||||
@@ -257,7 +238,7 @@ function pathToBinary() {
|
||||
reporter.sendTelemetryEvent('usePathToBinary');
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ lgpl21Plus gpl2Plus ];
|
||||
maintainers = with maintainers; [ pengmeiyu ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "sensors";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ aske ];
|
||||
mainProgram = "strangle";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,9 +152,9 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
|||
argcomplete
|
||||
];
|
||||
|
||||
# TODO: make shell completion actually work
|
||||
# uses argcomplete, so completion needs PYTHONPATH to work
|
||||
postInstall = ''
|
||||
substituteInPlace az.completion.sh \
|
||||
--replace register-python-argcomplete ${py.pkgs.argcomplete}/bin/register-python-argcomplete
|
||||
installShellCompletion --bash --name az.bash az.completion.sh
|
||||
installShellCompletion --zsh --name _az az.completion.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
mainProgram = "7z";
|
||||
# RAR code is under non-free UnRAR license, but we remove it
|
||||
license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.14";
|
||||
version = "2.7.0";
|
||||
pname = "dar";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-1uzKj+q2klIdANhLzy6TStJzeQndeUvdT0Dzwijad+U=";
|
||||
sha256 = "sha256-aJqNi2jZJgQmq0IObbAXZcmK2vvWePvHEUtw8O2nBwo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "svtplay-dl";
|
||||
version = "3.3";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "00pz5vv39qjsw67fdlj6942371lyvv368lc82z17nnh723ck54yy";
|
||||
sha256 = "1hnbpj4k08356k2rmsairbfnxwfxs5lv59nxcj6hy5wf162h2hzb";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
|
|
|||
|
|
@ -2,22 +2,27 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trash-cli";
|
||||
version = "0.20.12.26";
|
||||
version = "0.21.4.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreafrancia";
|
||||
repo = "trash-cli";
|
||||
rev = version;
|
||||
sha256 = "15iivl9xln1bw1zr2x5zvqyb6aj7mc8hfqi6dniq6xkp5m046ib7";
|
||||
sha256 = "16xmg2d9rfmm5l1dxj3dydijpv3kwswrqsbj1sihyyka4s915g61";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
nose
|
||||
mock
|
||||
pytest
|
||||
];
|
||||
checkPhase = "nosetests";
|
||||
|
||||
# Run tests, skipping `test_user_specified` since its result depends on the
|
||||
# mount path.
|
||||
checkPhase = ''
|
||||
pytest -k 'not test_user_specified'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/andreafrancia/trash-cli";
|
||||
|
|
@ -25,5 +30,6 @@ python3Packages.buildPythonApplication rec {
|
|||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
mainProgram = "trash";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
--- a/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100
|
||||
+++ a/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100
|
||||
@@ -12,7 +12,7 @@ def mount_points_from_getmnt():
|
||||
|
||||
def mount_points_from_df():
|
||||
import subprocess
|
||||
- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout
|
||||
+ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout
|
||||
return list(_mount_points_from_df_output(df_output))
|
||||
|
||||
def _mount_points_from_df_output(df_output):
|
||||
@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() :
|
||||
("mnt_freq", c_int), # Dump frequency (in days).
|
||||
("mnt_passno", c_int)] # Pass number for `fsck'.
|
||||
|
||||
- if sys.platform == "cygwin":
|
||||
- libc_name = "cygwin1.dll"
|
||||
- else:
|
||||
- libc_name = find_library("c")
|
||||
-
|
||||
- if libc_name == None :
|
||||
- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0
|
||||
+ libc_name = "@libc@"
|
||||
|
||||
libc = cdll.LoadLibrary(libc_name)
|
||||
libc.getmntent.restype = POINTER(mntent_struct)
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.1.0";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-teH4Y6PrUSE7Rxw0WV7Ka+CB44nwYXy9q09wOAhC8Bc=";
|
||||
sha256 = "sha256-MiTc8uT4FUHqEgE37kZ0pc7y1aK6u+4LqYQ8l1j2jA4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HPUvL22BrVH9/j41VFaystZWs0LO6KNIf2cNYqKxWnY=";
|
||||
vendorSha256 = "sha256-UGFFzpbBeL4YS3VSjCa31E2fiqND8j3E4FjRflg1NFc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,27 +3,38 @@
|
|||
, cmake
|
||||
, gflags
|
||||
, libsodium
|
||||
, openssl
|
||||
, protobuf
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eternal-terminal";
|
||||
version = "6.0.13";
|
||||
version = "6.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MisterTea";
|
||||
repo = "EternalTerminal";
|
||||
rev = "et-v${version}";
|
||||
sha256 = "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r";
|
||||
sha256 = "0jpm1ilr1qfz55y4mqp75v4q433qla5jhi1b8nsmx48srs7f0j2q";
|
||||
};
|
||||
|
||||
cmakeFlags= [
|
||||
"-DDISABLE_VCPKG=TRUE"
|
||||
"-DDISABLE_SENTRY=TRUE"
|
||||
"-DDISABLE_CRASH_LOG=TRUE"
|
||||
];
|
||||
|
||||
CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17";
|
||||
LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ gflags libsodium protobuf ];
|
||||
buildInputs = [ gflags openssl zlib libsodium protobuf ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Remote shell that automatically reconnects without interrupting the session";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://mistertea.github.io/EternalTerminal/";
|
||||
homepage = "https://eternalterminal.dev/";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ dezgeg pingiun ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "innernet";
|
||||
|
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
|||
clang
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,18 +12,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kea";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-MkoG9IhkW+5YfkmkXUkbUl9TQXxWshnxyzdGH979nZE=";
|
||||
sha256 = "sha256-sEFE5OfYt1mcAnGZCWqYFzIepzKNZZcd2rVhdxv/3sw=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-create-var.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
|
||||
substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@(sysconfdir)@' "$out/etc"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
diff --git src/libdnf/config.h src/libdnf/config.h
|
||||
index 16121f6f..737d0bc4 100644
|
||||
--- src/libdnf/config.h
|
||||
+++ src/libdnf/config.h
|
||||
@@ -18,7 +18,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
+
|
||||
+#ifdef __APPLE__
|
||||
+#include <stdint.h>
|
||||
+#else
|
||||
#include <bits/wordsize.h>
|
||||
+#endif
|
||||
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "config-32.h"
|
||||
diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp
|
||||
index 497c560d..5de077fa 100644
|
||||
--- src/libdnf/hy-iutil.cpp
|
||||
+++ src/libdnf/hy-iutil.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <errno.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
-#include <linux/limits.h>
|
||||
+#include <limits.h>
|
||||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp
|
||||
index 295fdc1b..9d584b8a 100644
|
||||
--- src/libdnf/hy-util.cpp
|
||||
+++ src/libdnf/hy-util.cpp
|
||||
@@ -24,7 +24,20 @@
|
||||
#include <ctype.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <sys/auxv.h>
|
||||
+
|
||||
+// Darwin compatibility hacks
|
||||
+typedef int auxv_t;
|
||||
+#ifndef AT_HWCAP2
|
||||
+#define AT_HWCAP2 26
|
||||
+#endif
|
||||
+#ifndef AT_HWCAP
|
||||
+#define AT_HWCAP 16
|
||||
+#endif
|
||||
+static unsigned long getauxval(unsigned long type)
|
||||
+{
|
||||
+ unsigned long ret = 0;
|
||||
+ return ret;
|
||||
+}
|
||||
|
||||
// hawkey
|
||||
#include "dnf-types.h"
|
||||
|
|
@ -3,17 +3,15 @@
|
|||
|
||||
gcc9Stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.60.0";
|
||||
version = "0.61.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s=";
|
||||
sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext
|
||||
|
|
|
|||
41
pkgs/tools/security/plasma-pass/default.nix
Normal file
41
pkgs/tools/security/plasma-pass/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules
|
||||
, ki18n
|
||||
, kitemmodels
|
||||
, oathToolkit
|
||||
, qgpgme
|
||||
, plasma-framework
|
||||
, qt5 }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "plasma-pass";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "plasma";
|
||||
repo = "plasma-pass";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w2mzxyrh17x7da62b6sg1n85vnh1q77wlrfxwfb1pk77y59rlf1";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ki18n
|
||||
kitemmodels
|
||||
oathToolkit
|
||||
qgpgme
|
||||
plasma-framework
|
||||
qt5.qtbase
|
||||
qt5.qtdeclarative
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Plasma applet to access passwords from pass, the standard UNIX password manager";
|
||||
homepage = "https://invent.kde.org/plasma/plasma-pass";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prs";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "timvisee";
|
||||
repo = "prs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9qaRhTfdppU72w8jDwD1e8ABuGG+9GyrRIUVsry4Vos=";
|
||||
sha256 = "sha256-czGyBdy4emw7bUV6Nn+k+fJm+JqR6o0TEEUuIbEsml4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-j+kyllMcYj7/Ig5ho548L1wW+TtuQOc/zkxT6SNNN6w=";
|
||||
cargoSha256 = "sha256-jnBYuk7uvnbvT2OQ35DJk6WIUSqJiZCvsmpSIxw9X1U=";
|
||||
|
||||
postPatch = ''
|
||||
# The GPGME backend is recommended
|
||||
|
|
|
|||
|
|
@ -14994,6 +14994,10 @@ in
|
|||
|
||||
hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
|
||||
|
||||
hunter = callPackage ../applications/misc/hunter {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices IOKit Security;
|
||||
};
|
||||
|
||||
hwloc = callPackage ../development/libraries/hwloc {};
|
||||
|
||||
inherit (callPackage ../development/tools/misc/hydra { })
|
||||
|
|
@ -28614,6 +28618,8 @@ in
|
|||
|
||||
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
|
||||
|
||||
plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { };
|
||||
|
||||
inherit (callPackages ../applications/misc/redshift {
|
||||
inherit (python3Packages) python pygobject3 pyxdg wrapPython;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
|
||||
|
|
|
|||
|
|
@ -7635,6 +7635,8 @@ in {
|
|||
|
||||
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
|
||||
|
||||
sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { };
|
||||
|
||||
sphinx-material = callPackage ../development/python-modules/sphinx-material { };
|
||||
|
||||
sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue