Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-30 07:13:26 +00:00 committed by GitHub
commit c33da551bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 310 additions and 135 deletions

View file

@ -8801,6 +8801,12 @@
githubId = 506953;
name = "Ruud van Asseldonk";
};
rvarago = {
email = "rafael.varago@gmail.com";
github = "rvarago";
githubId = 7365864;
name = "Rafael Varago";
};
rvl = {
email = "dev+nix@rodney.id.au";
github = "rvl";

View file

@ -27,16 +27,16 @@ let
in stdenv.mkDerivation rec {
inherit pname;
version = if isStereo
then "2.76" # stereo
else "2.75"; # normal
then "2.77" # stereo
else "2.76"; # normal
src = fetchurl {
url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip";
sha256 = if isStereo
then "12cz3780x5k047jqdv69n6rjgbfiwv67z850kfl4i37lxja432l7" # stereo
else "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"; # normal
then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo
else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal
};
sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src";
sourceRoot = "src";
nativeBuildInputs = [ copyDesktopItems unzip imagemagick ];
buildInputs = [ SDL ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "GxPlugins.lv2";
version = "0.8";
version = "0.9";
src = fetchFromGitHub {
owner = "brummer10";
repo = pname;
rev = "v${version}";
sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal";
sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877";
fetchSubmodules = true;
};
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/brummer10/GxPlugins.lv2";
description = "A set of extra lv2 plugins from the guitarix project";
maintainers = [ maintainers.magnetophon ];
license = licenses.gpl3;
license = licenses.gpl3Plus;
};
}

View file

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "pika-backup";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
sha256 = "0cr3axfp15nzwmsqyz6j781qhr2gsn9p69m0jfzy89pl83d6vcz0";
sha256 = "sha256-dKVyvB4s1MZHri0dFJDBUXQKsi2KgP30ZhsJ486M+og=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1z0cbrkhxyzwf7vjjsvdppb7zhflpkw4m5cy90a2315nbll3hpbp";
sha256 = "1vsh8vqgmfady82d7wfxkknmrp7mq7nizpif2zwg3kqbl964mp3y";
};
patches = [

View file

@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E=";
};
# https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5
# obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo
# build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0
# https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes
RUSTC_BOOTSTRAP = 1;
patches = [
# Post install tries to generate an icon cache & update the
# desktop database. The gtk setup hook drop-icon-theme-cache.sh

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script
, python3, git, gnupg, less
}:
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.14.5";
version = "2.15.3";
src = fetchFromGitHub {
owner = "android";
@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";
};
patches = [ ./import-ssl-module.patch ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 ];
@ -25,8 +23,12 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp repo $out/bin/repo
runHook postInstall
'';
# Important runtime dependencies
@ -35,6 +37,12 @@ stdenv.mkDerivation rec {
"${lib.makeBinPath [ git gnupg less ]}"
'';
passthru = {
updateScript = nix-update-script {
attrPath = "gitRepo";
};
};
meta = with lib; {
description = "Android's repo management tool";
longDescription = ''
@ -45,7 +53,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://android.googlesource.com/tools/repo";
license = licenses.asl20;
maintainers = [ ];
maintainers = with maintainers; [ otavio ];
platforms = platforms.unix;
};
}

View file

@ -1,12 +0,0 @@
diff --git a/repo b/repo
index 8b05def..f394b3e 100755
--- a/repo
+++ b/repo
@@ -236,6 +236,7 @@ import optparse
import re
import shutil
import stat
+import ssl
if sys.version_info[0] == 3:
import urllib.request

View file

@ -1,60 +1,38 @@
{ lib, stdenv, fetchurl, makeWrapper, python27Packages, git
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy
, breezy ? null, cvs ? null, darcs ? null, fossil ? null
, mercurial ? null, monotone ? null, rcs ? null
, subversion ? null, cvs_fast_export ? null }:
{ lib, stdenv, fetchurl, makeWrapper, buildGoModule, git
, asciidoctor, ruby
}:
with stdenv; with lib;
let
inherit (python27Packages) python;
in mkDerivation rec {
name = "reposurgeon-${meta.version}";
meta = {
description = "A tool for editing version-control repository history";
version = "3.44";
license = licenses.bsd3;
homepage = "http://www.catb.org/esr/reposurgeon/";
maintainers = with maintainers; [ dfoxfranke ];
platforms = platforms.all;
};
buildGoModule rec {
pname = "reposurgeon";
version = "4.26";
src = fetchurl {
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.44.tar.xz";
sha256 = "0il6hwrsm2qgg0vp5fcjh478y2x4zyw3mx2apcwc7svfj86pf7pn";
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${version}.tar.xz";
sha256 = "sha256-FuL5pvIM468hEm6rUBKGW6+WlYv4DPHNnpwpRGzMwlY=";
};
# install fails because the files README.md, NEWS, and TODO were not included in the source distribution
patches = [ ./fix-makefile.patch ];
vendorSha256 = "sha256-KpdXI2Znhe0iCp0DjSZXzUYDZIz2KBRv1/SpaRTFMAc=";
buildInputs =
[ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper pypy ];
subPackages = [ "." ];
preBuild = ''
makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
prefix="$out"
pyinclude="-I${python}/include/python2.7"
pylib="-L${python}/lib -lpython2.7"
)
runVend = true;
nativeBuildInputs = [ asciidoctor ruby ];
postBuild = ''
patchShebangs .
make all HTMLFILES=
'';
postInstall =
let
binpath = makeBinPath (
filter (x: x != null)
[ out git breezy cvs darcs fossil mercurial
monotone rcs src subversion cvs_fast_export ]
);
pythonpath = makeSearchPathOutput "lib" python.sitePackages (
filter (x: x != null)
[ python27Packages.readline or null python27Packages.hglib or null ]
);
in ''
for prog in reposurgeon repodiffer repotool; do
wrapProgram $out/bin/$prog \
--prefix PATH : "${binpath}" \
--prefix PYTHONPATH : "${pythonpath}"
done
''
;
postInstall = ''
make install prefix=$out HTMLFILES=
'';
meta = {
description = "A tool for editing version-control repository history";
license = lib.licenses.bsd3;
homepage = "http://www.catb.org/esr/reposurgeon/";
maintainers = with lib.maintainers; [ dfoxfranke ];
platforms = lib.platforms.all;
};
}

View file

@ -1,17 +1,17 @@
{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib
, gobject-introspection, gst_all_1, gtk3, libhandy, librsvg, meson, ninja
, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja
, pkg-config, python3, wrapGAppsHook }:
python3.pkgs.buildPythonApplication rec {
pname = "kooha";
version = "1.1.3";
version = "1.2.1";
format = "other";
src = fetchFromGitHub {
owner = "SeaDve";
repo = "Kooha";
rev = "v${version}";
sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36";
sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w";
};
buildInputs = [
@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec {
gobject-introspection
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gtk3
libhandy
gtk4
libadwaita
librsvg
];
@ -48,6 +48,10 @@ python3.pkgs.buildPythonApplication rec {
patchShebangs build-aux/meson/postinstall.py
'';
installCheckPhase = ''
$out/bin/kooha --help
'';
meta = with lib; {
description = "Simple screen recorder";
homepage = "https://github.com/SeaDve/Kooha";

View file

@ -4,10 +4,10 @@
, v4l-utils }:
mkDerivation rec {
pname = "webcamoid";
version = "8.7.1";
version = "8.8.0";
src = fetchFromGitHub {
sha256 = "1d8g7mq0wf0ycds87xpdhr3zkljgjmb94n3ak9kkxj2fqp9242d2";
sha256 = "0a8M9GQ6Ea9jBCyfbORVyB6HC/O6jdcIZruQZj9Aai4=";
rev = version;
repo = "webcamoid";
owner = "webcamoid";

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }:
stdenv.mkDerivation rec {
version = "20200910";
pname = "numix-solarized-gtk-theme";
version = "20210522";
src = fetchFromGitHub {
owner = "Ferdi265";
repo = "numix-solarized-gtk-theme";
repo = pname;
rev = version;
sha256 = "05h1563sy6sfz76jadxsf730mav6bbjsk9xnadv49r16b8n8p9a9";
sha256 = "0hin73fmfir4w1z0j87k5hahhf2blhcq4r7gf89gz4slnl18cvjh";
};
nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ];
@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
buildPhase = "true";
installPhase = ''
HOME="$NIX_BUILD_ROOT" # shut up inkscape's warnings
runHook preInstall
for theme in *.colors; do
make THEME="''${theme/.colors/}" install
done
runHook postInstall
'';
meta = with lib; {
@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/Ferdi265/numix-solarized-gtk-theme";
downloadPage = "https://github.com/Ferdi265/numix-solarized-gtk-theme/releases";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = [ maintainers.offline ];
};

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "babashka";
version = "0.4.1";
version = "0.4.3";
reflectionJson = fetchurl {
name = "reflection.json";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-tKMxi0umMmM99NusSSE9tT95TBcfXm1lfo95fQRUBrs=";
sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ=";
};
dontUnpack = true;
@ -110,9 +110,15 @@ stdenv.mkDerivation rec {
- Batteries included (tools.cli, cheshire, ...)
- Library support via popular tools like the clojure CLI
'';
homepage = "https://github.com/borkdude/babashka";
homepage = "https://github.com/babashka/babashka";
license = licenses.epl10;
platforms = graalvm11-ce.meta.platforms;
maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ];
maintainers = with maintainers; [
bandresen
bhougland
DerGuteMoritz
jlesquembre
thiagokokada
];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libtool }:
{ lib, stdenv, fetchurl, fetchpatch, libtool }:
stdenv.mkDerivation rec {
pname = "getdata";
version = "0.10.0";
@ -7,6 +7,13 @@ stdenv.mkDerivation rec {
sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
};
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch";
sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm";
})
];
buildInputs = [ libtool ];
meta = with lib; {

View file

@ -1,27 +1,30 @@
{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor
, libXinerama, libXrandr, libXrender, libpulseaudio ? null
, libXi ? null, libXext, libXfixes, freetype, openssl
, alsaLib, libGLU, zlib, yasm ? null }:
{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11
, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio
, libXi, libXext, libXfixes, freetype, openssl
, alsaLib, libGLU, zlib, yasm
, withUdev ? true
}:
let
options = {
touch = libXi != null;
pulseaudio = false;
udev = withUdev;
};
in stdenv.mkDerivation rec {
pname = "godot";
version = "3.2.3";
version = "3.3.2";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "${version}-stable";
sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v";
sha256 = "0rfm6sbbwzvsn76a8aqagd7cqdzmk8qxphgl89k7y982l9a5sz50";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
scons libX11 libXcursor libXinerama libXrandr libXrender
scons udev libX11 libXcursor libXinerama libXrandr libXrender
libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
libGLU zlib yasm
];

View file

@ -1,18 +1,19 @@
diff --git a/SConstruct b/SConstruct
index b3d033dc90..04b8dcc832 100644
index d138c7b250..c925bf908e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -62,10 +62,9 @@ elif platform_arg == "javascript":
custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
@@ -65,10 +65,10 @@ elif platform_arg == "javascript":
# want to have to pull in manually.
# Then we prepend PATH to make it take precedence, while preserving SCons' own entries.
env_base = Environment(tools=custom_tools)
-if "TERM" in os.environ:
-env_base.PrependENVPath("PATH", os.getenv("PATH"))
-env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
-if "TERM" in os.environ: # Used for colored output.
- env_base["ENV"]["TERM"] = os.environ["TERM"]
-env_base.AppendENVPath("PATH", os.getenv("PATH"))
-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
+ if (k in os.environ):
+ env_base["ENV"][k] = os.environ[k]
+
env_base.disabled_modules = []
env_base.use_ptrcall = False
env_base.module_version_string = ""

View file

@ -1,11 +1,11 @@
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 5674e78350..7051d8e73c 100644
index 91652aad55..d12389f9f2 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -201,6 +201,11 @@ def configure(env):
@@ -218,6 +218,11 @@ def configure(env):
env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs")
+ env.ParseConfig("pkg-config xext --cflags --libs")
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
+ env.ParseConfig("pkg-config glu --cflags --libs")
@ -13,13 +13,20 @@ index 5674e78350..7051d8e73c 100644
+
if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
@@ -299,7 +304,7 @@ def configure(env):
@@ -323,6 +328,7 @@ def configure(env):
print("Enabling ALSA")
env["alsa"] = True
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
# Don't parse --cflags, we don't need to add /usr/include/alsa to include path
- env.ParseConfig("pkg-config alsa --libs")
+ env.ParseConfig("pkg-config alsa --cflags --libs")
else:
print("ALSA libraries not found, disabling driver")
@@ -340,6 +346,7 @@ def configure(env):
if os.system("pkg-config --exists libudev") == 0: # 0 means found
print("Enabling udev support")
env.Append(CPPDEFINES=["UDEV_ENABLED"])
+ env.ParseConfig("pkg-config libudev --cflags --libs")
else:
print("libudev development libraries not found, disabling udev support")
else:

View file

@ -0,0 +1,26 @@
{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }:
rustPlatform.buildRustPackage rec {
pname = "cargo-bitbake";
version = "0.3.15";
src = fetchFromGitHub {
owner = "meta-rust";
repo = pname;
rev = "v${version}";
sha256 = "1ffjkwaqvmyz374azrv6gna19z2fcg82is2k2n2gm50isbxw2aa5";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
cargoSha256 = "0mm6059wjh5p8923dwz55dpwi55gq2bcmpx7kn40pq5ppkiqjiw9";
meta = with lib; {
description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust";
homepage = "https://github.com/meta-rust/cargo-bitbake";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ rvarago ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "caverym";
repo = pname;
rev = "version";
rev = version;
sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z";
};

View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.7";
version = "6.9";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ=";
sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@ -65,13 +65,17 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M=";
sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
#rev = "v${version}";
# FIXME: replace with line above with 6.10 release
# Fix https://bugs.winehq.org/show_bug.cgi?id=51172
rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7";
# Just keep list empty, if current release haven't broken patchsets
disabledPatchsets = [ ];
# Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies
# see FIXME above
disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ];
};
winetricks = fetchFromGitHub rec {

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "heisenbridge";
version = "unstable-2021-05-23";
version = "unstable-2021-05-29";
src = fetchFromGitHub {
owner = "hifi";
repo = "heisenbridge";
rev = "1f8df49b7e89aaeb2cbb5fee68bd29cf3eda079a";
sha256 = "sha256-ta6n9hXRdIjfxsLy9jrzZkz6TS50/TYpFOb/BLrRWK4=";
rev = "980755226b0cb46ad9c7f40e0e940f354212a8b7";
sha256 = "sha256-jO1Dqtv3IbV4FLI3C82pxssgrCf43hAEcPLYszX2GNI=";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, substituteAll
, meson
, ninja
@ -79,6 +80,13 @@ in stdenv.mkDerivation rec {
)'';
patches = [
# Fix for wine 6.8+ (remove patch in next release):
(fetchpatch {
url = "https://github.com/robbert-vdh/yabridge/commit/5577c4bfd842c60a8ae8ce2889bbfeb53a51c62b.patch";
sha256 = "sha256-bTT08iWwDBVqi2PZPa7oal7/MqVu8t2Bh1gpjFMqLvQ=";
excludes = [ "CHANGELOG.md" ];
})
# Hard code wine path so wine version is correct in logs
(substituteAll {
src = ./hardcode-wine.patch;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, slop, ffmpeg_3, fetchFromGitHub, makeWrapper}:
{ lib, stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
stdenv.mkDerivation {
pname = "capture-unstable";
@ -18,7 +18,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin/capture
wrapProgram $out/bin/capture \
--prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}'
--prefix PATH : '${lib.makeBinPath [ slop ffmpeg ]}'
'';
meta = with lib; {

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "sacad";
version = "2.3.4";
version = "2.4.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r";
sha256 = "sha256-KLVkyiXjpqskM67W9uPl9aPKc3pYMu0nAfwI0OpOniE=";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -0,0 +1,65 @@
{ lib, stdenv, fetchurl
, flex, installShellFiles, ncurses, which
}:
stdenv.mkDerivation rec {
pname = "xjobs";
version = "20200726";
src = fetchurl {
url = "mirror://sourceforge//xjobs/files/${pname}-${version}.tgz";
sha256 = "0ay6gn43pnm7r1jamwgpycl67bjg5n87ncl27jb01w2x6x70z0i3";
};
nativeBuildInputs = [
flex
installShellFiles
which
];
buildInputs = [
ncurses
];
checkPhase = ''
runHook preCheck
./${pname} -V
runHook postCheck
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,etc}
install -m755 ${pname} $out/bin/${pname}
install -m644 ${pname}.rc $out/etc/${pname}.rc
installManPage ${pname}.1
runHook postInstall
'';
meta = with lib; {
description = "A program which reads job descriptions line by line and executes them in parallel";
homepage = "https://www.maier-komor.de/xjobs.html";
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = [ maintainers.siriobalmelli ];
longDescription = ''
xjobs reads job descriptions line by line and executes them in parallel.
It limits the number of parallel executing jobs and starts new jobs when jobs finish.
Therefore, it combines the arguments from every input line with the utility
and arguments given on the command line.
If no utility is given as an argument to xjobs,
then the first argument on every job line will be used as utility.
To execute utility xjobs searches the directories given in the PATH environment variable
and uses the first file found in these directories.
xjobs is most useful on multi-processor/core machines when one needs to execute
several time consuming command several that could possibly be run in parallel.
With xjobs this can be achieved easily, and it is possible to limit the load
of the machine to a useful value.
It works similar to xargs, but starts several processes simultaneously
and gives only one line of arguments to each utility call.
'';
};
}

View file

@ -0,0 +1,26 @@
{ lib, stdenv, rustPlatform, python3, perl, openssl, Security, fetchFromGitHub, pkg-config }:
rustPlatform.buildRustPackage rec {
pname = "s3rs";
version = "0.4.8";
src = fetchFromGitHub {
owner = "yanganto";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lYIE5yR7UNUjpqfwT6R0C0ninNvVZdatYd/n+yyGsms=";
};
cargoSha256 = "sha256-vCTJ7TClvuIP9IoqXwNFH7/u9jXt/Ue/Dhefx5rCgmA=";
nativeBuildInputs = [ python3 perl pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "A s3 cli client with multi configs with diffent provider";
homepage = "https://github.com/yanganto/s3rs";
license = licenses.mit;
maintainers = with maintainers; [ yanganto ];
};
}

View file

@ -0,0 +1,20 @@
{ lib, fetchFromGitHub }:
let
version = "3.7.6";
in
fetchFromGitHub {
name = "stevenblack-blocklist-${version}";
owner = "StevenBlack";
repo = "hosts";
rev = version;
sha256 = "sha256-zjUdHzsjv16PHXfxTuVC6aNKfh+73dH1AABvq1MArXI=";
meta = with lib; {
description = "Unified hosts file with base extensions";
homepage = "https://github.com/StevenBlack/hosts";
license = licenses.mit;
maintainers = with maintainers; [ fortuneteller2k ];
};
}

View file

@ -2,11 +2,11 @@
, autoPatchelfHook
, dpkg
, fetchurl
, lib
, libsecret
, makeDesktopItem
, makeWrapper
, stdenv
, lib
, udev
, wrapGAppsHook
}:
@ -17,11 +17,11 @@ let
pname = "bitwarden";
version = {
x86_64-linux = "1.24.6";
x86_64-linux = "1.26.4";
}.${system} or "";
sha256 = {
x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA=";
x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg=";
}.${system} or "";
meta = with lib; {

View file

@ -994,6 +994,8 @@ in
tilix = callPackage ../applications/terminal-emulators/tilix { };
twine = with python3Packages; toPythonApplication twine;
wayst = callPackage ../applications/terminal-emulators/wayst { };
wezterm = callPackage ../applications/terminal-emulators/wezterm {
@ -4324,6 +4326,8 @@ in
xkcdpass = with python3Packages; toPythonApplication xkcdpass;
xjobs = callPackage ../tools/misc/xjobs { };
xob = callPackage ../tools/X11/xob { };
z-lua = callPackage ../tools/misc/z-lua { };
@ -8347,6 +8351,10 @@ in
s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { };
s3rs = callPackage ../tools/networking/s3rs {
inherit (darwin.apple_sdk.frameworks) Security;
};
s4cmd = callPackage ../tools/networking/s4cmd { };
s5cmd = callPackage ../tools/networking/s5cmd { };
@ -8827,6 +8835,8 @@ in
staticjinja = with python3.pkgs; toPythonApplication staticjinja;
stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { };
stress = callPackage ../tools/system/stress { };
stress-ng = callPackage ../tools/system/stress-ng { };
@ -11690,6 +11700,7 @@ in
cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { };
cargo-c = callPackage ../development/tools/rust/cargo-c {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};