public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://github.com/nixos/nixpkgs

Browse Source
This commit is contained in:
legendofmiracles
2021-05-01 22:19:02 +02:00
parent 38033cd971 510fc9cd8f
commit 4ee084bb41
476 changed files with 8709 additions and 4495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/broot/default.nix
+3 -6
View File
@@ -4,7 +4,6 @@
, fetchCrate
, installShellFiles
, makeWrapper
, coreutils
, libiconv
, zlib
, Security
@@ -12,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.2.9";
version = "1.3.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-5tM8ywLBPPjCKEfXIfUZ5aF4t9YpYA3tzERxC1NEsso=";
sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk=";
};
cargoHash = "sha256-P5ukwtRUpIJIqJjwTXIB2xRnpyLkzMeBMHmUz4Ery3s=";
cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE=";
nativeBuildInputs = [
makeWrapper
@@ -33,8 +32,6 @@ rustPlatform.buildRustPackage rec {
];
postPatch = ''
substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/'
# Fill the version stub in the man page. We can't fill the date
# stub reproducibly.
substitute man/page man/broot.1 \
pkgs/tools/misc/diffoscope/default.nix
+2 -2
View File
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "171";
version = "172";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-8PUFKwSWf84ics4w9yrCWMYgzzNF5z1kNn7LnksfCtA=";
sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x";
};
outputs = [ "out" "man" ];
pkgs/tools/misc/ethminer/default.nix
+14 -8
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
clangStdenv,
fetchFromGitHub,
opencl-headers,
@@ -8,6 +9,7 @@
boost,
makeWrapper,
cudatoolkit,
cudaSupport,
mesa,
ethash,
opencl-info,
@@ -15,22 +17,22 @@
openssl,
pkg-config,
cli11
}:
}@args:
# Note that this requires clang < 9.0 to build, and currently
# clangStdenv provides clang 7.1 which satisfies the requirement.
let stdenv = clangStdenv;
let stdenv = if cudaSupport then clangStdenv else args.stdenv;
in stdenv.mkDerivation rec {
pname = "ethminer";
version = "0.18.0";
version = "0.19.0";
src =
fetchFromGitHub {
owner = "ethereum-mining";
repo = "ethminer";
rev = "v${version}";
sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707";
sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646";
fetchSubmodules = true;
};
@@ -41,6 +43,8 @@ in stdenv.mkDerivation rec {
"-DAPICORE=ON"
"-DETHDBUS=OFF"
"-DCMAKE_BUILD_TYPE=Release"
] ++ lib.optionals (!cudaSupport) [
"-DETHASHCUDA=OFF" # on by default
];
nativeBuildInputs = [
@@ -54,12 +58,13 @@ in stdenv.mkDerivation rec {
boost
opencl-headers
mesa
cudatoolkit
ethash
opencl-info
ocl-icd
openssl
jsoncpp
] ++ lib.optionals cudaSupport [
cudatoolkit
];
preConfigure = ''
@@ -71,10 +76,11 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Ethereum miner with OpenCL, CUDA and stratum support";
description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support";
homepage = "https://github.com/ethereum-mining/ethminer";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2;
maintainers = with maintainers; [ nand0p atemu ];
license = licenses.gpl3Only;
broken = cudaSupport;
};
}
pkgs/tools/misc/ffsend/default.nix
+3 -2
View File
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl
, darwin, installShellFiles
, installShellFiles
, CoreFoundation, CoreServices, Security, AppKit, libiconv
, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD
, xclip ? null, xsel ? null
@@ -29,7 +30,7 @@ buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs =
if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
if stdenv.isDarwin then [ libiconv CoreFoundation CoreServices Security AppKit ]
else [ openssl ];
preBuild = lib.optionalString (x11Support && usesX11) (
pkgs/tools/misc/fluent-bit/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "1.7.3";
version = "1.7.4";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "sha256-a3AVem+VbYKUsxAzGNu/VPqDiqG99bmj9p1/iiG1ZFw=";
sha256 = "sha256-xOrEPZ+AUihVVaxrqCCeO6n3XFkVahCzHOuX947LRFs=";
};
nativeBuildInputs = [ cmake flex bison ];
pkgs/tools/misc/macchina/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
version = "0.6.9";
version = "0.7.2";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
sha256 = "sha256-y23gpYDnYoiTJcNyWKslVenPTXcCrOvxq+0N9PjQN3g=";
sha256 = "sha256-ICiU0emo5lEs6996TwkauuBWb2+Yy6lL+/x7zQgO470=";
};
cargoSha256 = "sha256-jfLj8kLBG6AeeYo421JCl1bMqWwOGiwQgv7AEomtFcY=";
cargoSha256 = "sha256-OfOh0YXeLT/kBuR9SOV7pHa8Z4b6+JvtVwqqwd1hCJY=";
nativeBuildInputs = [ installShellFiles ];
pkgs/tools/misc/svtplay-dl/default.nix
+2 -2
View File
@@ -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 ];
pkgs/tools/misc/togglesg-download/default.nix
-46
View File
@@ -1,46 +0,0 @@
{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
pythonPackages.buildPythonApplication {
pname = "togglesg-download-git";
version = "2017-12-07";
src = fetchFromGitHub {
owner = "0x776b7364";
repo = "toggle.sg-download";
rev = "e64959f99ac48920249987a644eefceee923282f";
sha256 = "0j317wmyzpwfcixjkybbq2vkg52vij21bs40zg3n1bs61rgmzrn8";
};
nativeBuildInputs = [ makeWrapper ];
doCheck = false;
dontBuild = true;
dontStrip = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/doc/togglesg-download}
substitute $src/download_toggle_video2.py $out/bin/download_toggle_video2.py \
--replace "ffmpeg_download_cmd = 'ffmpeg" "ffmpeg_download_cmd = '${lib.getBin ffmpeg_3}/bin/ffmpeg"
chmod 0755 $out/bin/download_toggle_video2.py
cp LICENSE README.md $out/share/doc/togglesg-download
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/0x776b7364/toggle.sg-download";
description = "Command-line tool to download videos from toggle.sg written in Python";
longDescription = ''
toggle.sg requires SilverLight in order to view videos. This tool will
allow you to download the video files for viewing in your media player and
on your OS of choice.
'';
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}
pkgs/tools/misc/trash-cli/default.nix
+10 -4
View File
@@ -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";
};
}
pkgs/tools/misc/trash-cli/nix-paths.patch
-26
View File
@@ -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)
pkgs/tools/misc/vector/default.nix
+3 -3
View File
@@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "vector";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Sur5QfPIoJXkcYdyNlIHOvmV2yBedhNm7UinmaFEc2E=";
sha256 = "sha256-ige0138alZ0KAmPakPVmDVydz5qco6m0xK7AEzScyXc=";
};
cargoSha256 = "sha256-1Xm1X1pfx9J0tBck2WA+zt2OxtQsqustcWPazsPyKPY=";
cargoSha256 = "sha256-oK4M6zTfI0QVW9kQTgpP/vSxFt2VlRABmKvQ4aAqC74=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
pkgs/tools/misc/zellij/default.nix
+8 -5
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zellij";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "zellij-org";
repo = pname;
rev = "v${version}";
sha256 = "102zw4napzx05rpmx6scl6il55syf3lw1gzmy1y66cg1f70sij4d";
sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk=";
};
cargoSha256 = "121fsch0an6d2hqaq0ws9cm7g5ppzfrycmmhajfacfg6wbiax1m5";
cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1";
nativeBuildInputs = [ installShellFiles ];
@@ -22,13 +22,16 @@ rustPlatform.buildRustPackage rec {
'';
postInstall = ''
installShellCompletion assets/completions/zellij.{bash,fish} --zsh assets/completions/_zellij
installShellCompletion --cmd $pname \
--bash <($out/bin/zellij generate-completion bash) \
--fish <($out/bin/zellij generate-completion fish) \
--zsh <($out/bin/zellij generate-completion zsh)
'';
meta = with lib; {
description = "A terminal workspace with batteries included";
homepage = "https://zellij.dev/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ therealansh ];
maintainers = with maintainers; [ therealansh _0x4A6F ];
};
}