Merge staging-next into staging
github-actions[bot]
GitHub
commit
1e189fbb9e
|
|
@ -92,10 +92,12 @@ in rec {
|
|||
|
||||
checkUnitConfig = group: checks: attrs: let
|
||||
# We're applied at the top-level type (attrsOf unitOption), so the actual
|
||||
# unit options might contain attributes from mkOverride that we need to
|
||||
# unit options might contain attributes from mkOverride and mkIf that we need to
|
||||
# convert into single values before checking them.
|
||||
defs = mapAttrs (const (v:
|
||||
if v._type or "" == "override" then v.content else v
|
||||
if v._type or "" == "override" then v.content
|
||||
else if v._type or "" == "if" then v.content
|
||||
else v
|
||||
)) attrs;
|
||||
errors = concatMap (c: c group defs) checks;
|
||||
in if errors == [] then true
|
||||
|
|
|
|||
|
|
@ -0,0 +1,115 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, itstool
|
||||
, python3
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
, gst_all_1
|
||||
, pulseaudio
|
||||
, gtk3
|
||||
, glib
|
||||
, glibmm
|
||||
, gtkmm3
|
||||
, lilv
|
||||
, lv2
|
||||
, serd
|
||||
, sord
|
||||
, sratom
|
||||
, libbs2b
|
||||
, libsamplerate
|
||||
, libsndfile
|
||||
, libebur128
|
||||
, rnnoise
|
||||
, boost
|
||||
, dbus
|
||||
, fftwFloat
|
||||
, calf
|
||||
, zita-convolver
|
||||
, zam-plugins
|
||||
, rubberband
|
||||
, lsp-plugins
|
||||
}:
|
||||
|
||||
let
|
||||
lv2Plugins = [
|
||||
calf # limiter, compressor exciter, bass enhancer and others
|
||||
lsp-plugins # delay
|
||||
];
|
||||
ladspaPlugins = [
|
||||
rubberband # pitch shifting
|
||||
zam-plugins # maximizer
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pulseeffects";
|
||||
version = "4.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "pulseeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
libxml2
|
||||
itstool
|
||||
python3
|
||||
desktop-file-utils
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pulseaudio
|
||||
glib
|
||||
glibmm
|
||||
gtk3
|
||||
gtkmm3
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base # gst-fft
|
||||
gst_all_1.gst-plugins-good # pulsesrc
|
||||
gst_all_1.gst-plugins-bad
|
||||
lilv lv2 serd sord sratom
|
||||
libbs2b
|
||||
libebur128
|
||||
libsamplerate
|
||||
libsndfile
|
||||
rnnoise
|
||||
boost
|
||||
dbus
|
||||
fftwFloat
|
||||
zita-convolver
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}"
|
||||
--set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}"
|
||||
)
|
||||
'';
|
||||
|
||||
# Meson is no longer able to pick up Boost automatically.
|
||||
# https://github.com/NixOS/nixpkgs/issues/86131
|
||||
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
|
||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
|
||||
homepage = "https://github.com/wwmm/pulseeffects";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
, gst_all_1
|
||||
, pulseaudio
|
||||
, pipewire
|
||||
, gtk3
|
||||
, glib
|
||||
, glibmm
|
||||
|
|
@ -45,13 +45,13 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pulseeffects";
|
||||
version = "4.8.4";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "pulseeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "19sndxvszafbd1l2033g2irpx2jrwi5bpbx8r35047wi0z7djiag";
|
||||
sha256 = "1zs13bivxlgcb24lz1pgmgy2chcjxnmn4lz7g1n0ygiaaj4c30xj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -66,14 +66,14 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
pulseaudio
|
||||
pipewire
|
||||
glib
|
||||
glibmm
|
||||
gtk3
|
||||
gtkmm3
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base # gst-fft
|
||||
gst_all_1.gst-plugins-good # pulsesrc
|
||||
gst_all_1.gst-plugins-good # spectrum plugin
|
||||
gst_all_1.gst-plugins-bad
|
||||
lilv lv2 serd sord sratom
|
||||
libbs2b
|
||||
|
|
@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
|
||||
homepage = "https://github.com/wwmm/pulseeffects";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "0.8.28";
|
||||
version = "0.8.28-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t6ULiTY+4jRfkdSN52A8c3YWznqbI2YVicKwfWJ/dGA=";
|
||||
sha256 = "sha256-a+w/909PZuHsgIQEtO2IWQijsERfAKJUZ8K30+PhD3k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ag+Xvo1i1WR4oCtGsFIRtUGgd5AIBFsIKblY6TAsUV0=";
|
||||
cargoSha256 = "sha256-Zz844XDx5qj2hQlf99uvHV6e5wmDAlYh3zBvcpdoiIo=";
|
||||
|
||||
nativeBuildInputs = [ clang ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,18 +24,12 @@ python3Packages.buildPythonApplication rec {
|
|||
ranger/data/scope.sh
|
||||
''}
|
||||
|
||||
substituteInPlace ranger/data/scope.sh \
|
||||
--replace "/bin/echo" "echo"
|
||||
|
||||
substituteInPlace ranger/__init__.py \
|
||||
--replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'"
|
||||
|
||||
for i in ranger/config/rc.conf doc/config/rc.conf ; do
|
||||
substituteInPlace $i --replace /usr/share $out/share
|
||||
done
|
||||
|
||||
# give file previews out of the box
|
||||
substituteInPlace ranger/config/rc.conf \
|
||||
--replace /usr/share $out/share \
|
||||
--replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
|
||||
'' + lib.optionalString imagePreviewSupport ''
|
||||
substituteInPlace ranger/ext/img_display.py \
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tickrs";
|
||||
version = "0.9.0";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarkah";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FCELPt7aBKD+mf5w9HuJqKPw64qBLgdbLIfGZEB19OI=";
|
||||
sha256 = "sha256-kX5Vp+yNlzBj1ewm7zNtpmbk5B2OQi0nrUNV7l6XUH0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GsK0T9BfIqr0N4wxIhvvTmNEC6I2j3XPeAJMJjRiZKU=";
|
||||
cargoSha256 = "sha256-X7ULfb2+9l8ik12SwWCTdUfki6xbk8pCnFaiEvCwYGw=";
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
sha256 = "sha256-lZr5CHHFLnWZmPfCX6GFdhnSOPqf0BbqirkHu2+yqfM=";
|
||||
sha256 = "sha256-GfQjgtjFynYa8SfQyoGjsyXEv0XuaK8ZbTcMhQGkcTg=";
|
||||
};
|
||||
vendorSha256 = "sha256-+0lsWpQr74GwYfO7UKqTwOoxifGWpAe/FhlZBVQmGog=";
|
||||
vendorSha256 = "sha256-Xj9nC9ijLVmrSvgKq33yUyMO+RmeDkf7FKKCehP4GFE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ in {
|
|||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
version = "0.0.118";
|
||||
version = "0.0.119";
|
||||
src = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "1ar4d6mgn248h6pqcw5ra787padsxyzfkgf9yf62ypn1zrxa9sxq";
|
||||
sha256 = "0bzrilag7mjfhr84l956xisbaz8mmkmqizg22f9gabgcv85vwzsi";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.24.2";
|
||||
version = "2.25.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "sha256-O+bA7vP7Y9AbFA+nEjE6O1i0DcAWVLO2Guw0ntq55s4=";
|
||||
sha256 = "sha256-+vJDTahP4htRbVeBd2eSD97fwZ69wB2cro1tMxT36Jc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
# tests try to access /proc/ which does not exist on darwin
|
||||
# Cannot locate IVL modules : couldn't get command path from OS.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
installCheckInputs = [ perl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "MAVProxy";
|
||||
version = "1.8.31";
|
||||
version = "1.8.32";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51d4a21372fcac615a0191cb29c444889ecfede402e95c847346842400a86273";
|
||||
sha256 = "f89ba880fe7351a13c68ba3f4c56acd6e246790b103f3ec79d9a527b5767b8f0";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlkit";
|
||||
version = "4.5.6";
|
||||
version = "4.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melsman";
|
||||
repo = "mlkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc=";
|
||||
sha256 = "sha256-Wq+Os7nzRA5Pxz6Ba7DudcDQs3KA0eYVLy1nO/A16EE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook mlton ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,19 @@
|
|||
{ lib, stdenv, fetchFromGitLab, coreutils, which }:
|
||||
{ lib, stdenv, fetchFromGitLab, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "owl-lisp";
|
||||
version = "0.1.23";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "owl-lisp";
|
||||
repo = "owl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i";
|
||||
sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace /usr $out
|
||||
'';
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ];
|
||||
|
||||
# tests are run as part of the compilation process
|
||||
doCheck = false;
|
||||
|
|
@ -26,6 +23,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://gitlab.com/owl-lisp/owl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,5 +103,12 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ shell thoughtpolice emily ];
|
||||
#In file included from kernel/driver.cc:20:
|
||||
#./kernel/yosys.h:42:10: fatal error: 'map' file not found
|
||||
##include <map>
|
||||
|
||||
#https://github.com/YosysHQ/yosys/issues/681
|
||||
#https://github.com/YosysHQ/yosys/issues/2011
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,8 +46,7 @@ in
|
|||
b=$(basename $f)
|
||||
if [ "$b" = mix ]; then continue; fi
|
||||
wrapProgram $f \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \
|
||||
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
|
||||
--prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}"
|
||||
done
|
||||
|
||||
substituteInPlace $out/bin/mix \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27, aspell, aspellDicts, python }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aspell-python";
|
||||
version = "1.15";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "aspell-python-py3";
|
||||
extension = "tar.bz2";
|
||||
sha256 = "13dk3jrvqmfvf2w9b8afj37d8bh32kcx295lyn3z7r8qch792hi0";
|
||||
};
|
||||
|
||||
buildInputs = [ aspell ];
|
||||
|
||||
checkPhase = ''
|
||||
export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
|
||||
export HOME=$(mktemp -d)
|
||||
${python.interpreter} test/unittests.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aspell" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for aspell (C extension and python version)";
|
||||
homepage = "https://github.com/WojciechMula/aspell-python";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
|
||||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cocotb";
|
||||
|
|
@ -25,9 +25,6 @@ buildPythonPackage rec {
|
|||
do
|
||||
substituteInPlace $f --replace 'shell which' 'shell command -v'
|
||||
done
|
||||
|
||||
# This can perhaps be removed in the next update after 1.3.2?
|
||||
substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
checkInputs = [ swig verilog ];
|
||||
|
|
@ -36,8 +33,7 @@ buildPythonPackage rec {
|
|||
# test expected failures actually pass because of a fix in our icarus version
|
||||
# https://github.com/cocotb/cocotb/issues/1952
|
||||
substituteInPlace tests/test_cases/test_discovery/test_discovery.py \
|
||||
--replace 'def access_single_bit' $'def foo(x): pass\ndef foo' \
|
||||
--replace 'def access_single_bit_assignment' $'def foo(x): pass\ndef foo'
|
||||
--replace 'def access_single_bit' $'def foo(x): pass\ndef foo'
|
||||
|
||||
export PATH=$out/bin:$PATH
|
||||
make test
|
||||
|
|
@ -48,5 +44,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/cocotb/cocotb";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ matthuszagh ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
{ lib, buildPythonApplication, fetchPypi, pytest, chardet }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, pytestCheckHook, pytest-cov, pytest-dependency, aspell-python, aspellDicts, chardet }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "codespell";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "dd9983e096b9f7ba89dd2d2466d1fc37231d060f19066331b9571341363c77b8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "codespell-project";
|
||||
repo = "codespell";
|
||||
rev = "v${version}";
|
||||
sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln";
|
||||
};
|
||||
|
||||
# no tests in pypi tarball
|
||||
doCheck = false;
|
||||
checkInputs = [ pytest chardet ];
|
||||
checkPhase = ''
|
||||
# We don't want to be affected by the presence of these
|
||||
rm -r codespell_lib setup.cfg
|
||||
# test_command assumes too much about the execution environment
|
||||
pytest --pyargs codespell_lib.tests -k "not test_command"
|
||||
checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ];
|
||||
|
||||
preCheck = ''
|
||||
export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
|
||||
'';
|
||||
|
||||
# tries to run not rully installed script
|
||||
disabledTests = [ "test_command" ];
|
||||
|
||||
pythonImportsCheck = [ "codespell_lib" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Fix common misspellings in source code";
|
||||
homepage = "https://github.com/codespell-project/codespell";
|
||||
license = with lib.licenses; [ gpl2 cc-by-sa-30 ];
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
platforms = lib.platforms.all;
|
||||
license = with licenses; [ gpl2Only cc-by-sa-30 ];
|
||||
maintainers = with maintainers; [ johnazoidberg SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ buildPythonPackage rec {
|
|||
pillow
|
||||
];
|
||||
|
||||
# no tests exectuted
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert images to PDF via direct JPEG inclusion";
|
||||
homepage = "https://gitlab.mister-muffin.de/josch/img2pdf";
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = "jc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rYH4m7h2SPB1Io83ZUsqZ+Ll4XEi4Feuj4QYvaOJ2lY=";
|
||||
sha256 = "sha256-6ofw74onFECJYYSuZlOVcNVAVuJaJKV4pkaJ4cTrvPk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailmanclient";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g";
|
||||
sha256 = "4082ac0c66d7f7bee15751fe2564098b971177c0013e66d0c8ceee1ebdcb5592";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six httplib2 requests ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fly";
|
||||
version = "6.7.4";
|
||||
version = "6.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EFcgS+ZrmdrIwHAzwSuQFe7UgeWsTRjm2sDv5COdi/k=";
|
||||
sha256 = "sha256-pL8h/hsaiVveZ32ee0bUepzcS7igJGVtGuHocrC21pY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xeptlcJLj+R1BdC8Rdi3hsJVxdrmvfeTMsrhMNGrXi8=";
|
||||
vendorSha256 = "sha256-IcIUYFmiVuRrZQisjWX5grOZPqovibgF5NmbG96FISI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightspark";
|
||||
version = "0.8.4";
|
||||
version = "0.8.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightspark";
|
||||
repo = "lightspark";
|
||||
rev = version;
|
||||
sha256 = "sha256-Z1wJIoHb/+pSPN8sOfSbrl1CQk3BtK22zqTjJnOVe9Y=";
|
||||
sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -71,5 +71,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.eelco ];
|
||||
# imager.c:70:2: error: unknown type name 'loff_t'; did you mean 'off_t'?
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,25 +5,24 @@ stdenv.mkDerivation rec {
|
|||
pname = "smenu";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p-gen";
|
||||
repo = "smenu";
|
||||
rev = "v${version}";
|
||||
owner = "p-gen";
|
||||
repo = "smenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/p-gen/smenu";
|
||||
description = "Terminal selection utility";
|
||||
homepage = "https://github.com/p-gen/smenu";
|
||||
description = "Terminal selection utility";
|
||||
longDescription = ''
|
||||
Terminal utility that allows you to use words coming from the standard
|
||||
input to create a nice selection window just below the cursor. Once done,
|
||||
your selection will be sent to standard output.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ matthiasbeyer SuperSandro2000 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchFromGitHub, buildPythonApplication
|
||||
, colorama, decorator, psutil, pyte, six
|
||||
, pytest, pytest-mock
|
||||
, go, mock, pytestCheckHook, pytest-mock
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
|
|
@ -16,22 +16,12 @@ buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = [ colorama decorator psutil pyte six ];
|
||||
|
||||
checkInputs = [ pytest pytest-mock ];
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
export LANG=en_US.UTF-8
|
||||
export XDG_CACHE_HOME=$TMPDIR/cache
|
||||
export XDG_CONFIG_HOME=$TMPDIR/config
|
||||
py.test
|
||||
'';
|
||||
|
||||
doCheck = false; # The above is only enough for tests to pass outside the sandbox.
|
||||
checkInputs = [ go mock pytestCheckHook pytest-mock ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nvbn/thefuck";
|
||||
description = "Magnificent app which corrects your previous console command";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
maintainers = with maintainers; [ ma27 SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ht-rust";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ducaale";
|
||||
repo = "ht";
|
||||
rev = "v${version}";
|
||||
sha256 = "cr/iavCRdFYwVR6Iemm1hLKqd0OFG1iDmxpQ9fiwOmU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "uB23/9AjPwCwf9ljE8ai7zJQZqE0SoBPzRqqBOXa9QA=";
|
||||
|
||||
buildInputs = [ ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# Symlink to avoid conflict with pre-existing ht package
|
||||
postInstall = ''
|
||||
ln -s $out/bin/ht $out/bin/ht-rust
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
$out/bin/ht-rust --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet another HTTPie clone in Rust";
|
||||
homepage = "https://github.com/ducaale/ht";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.payas ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xh";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ducaale";
|
||||
repo = "xh";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx";
|
||||
};
|
||||
|
||||
cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
checkFlagsArray = [ "--skip=basic_options" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
$out/bin/xh --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet another HTTPie clone in Rust";
|
||||
homepage = "https://github.com/ducaale/xh";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ payas SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,13 +8,13 @@ let
|
|||
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "bitwarden_rs";
|
||||
version = "1.17.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p";
|
||||
sha256 = "1iww8fhh4indmgw1j35whqyakd4bppmiyjpcdf2qrzg52x5binh0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
|
|||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
cargoSha256 = "0hv3k5l85nz4syzamranhi237fiwkjnda8v5ssnm2nsmcm7ih9k8";
|
||||
cargoSha256 = "0ga7ahlszja8ilng8xsrwdy7zy6bbci4mf00lknladjhlw16wibf";
|
||||
cargoBuildFlags = [ featuresFlag ];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Unofficial Bitwarden compatible server written in Rust";
|
||||
homepage = "https://github.com/dani-garcia/bitwarden_rs";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ msteen ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atomicparsley";
|
||||
version = "20210114.184825.1dbe1be";
|
||||
version = "20210124.204813.840499f";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dyrfr3bsRzEWaAr9K+7SchFVl63cZawyIjmstOI9e5I=";
|
||||
sha256 = "sha256-/bkfgIWlQobaiad2WD7DUUrTwfYurP7YAINaLTwBEcE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -271,6 +271,7 @@ mapAliases ({
|
|||
hepmc = hepmc2; # added 2019-08-05
|
||||
hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11
|
||||
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
|
||||
ht-rust = xh; # added 2021-02-13
|
||||
htmlTidy = html-tidy; # added 2014-12-06
|
||||
iana_etc = iana-etc; # added 2017-03-08
|
||||
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
|
|
@ -535,6 +536,7 @@ mapAliases ({
|
|||
pyo3-pack = maturin;
|
||||
pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10
|
||||
pulseaudioLight = pulseaudio; # added 2018-04-25
|
||||
pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and pulseeffects-pw if you use PipeWire."; # added 2021-02-13, move back once we default to PipeWire audio server.
|
||||
phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
|
||||
phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
|
||||
phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
|
||||
|
|
|
|||
|
|
@ -18112,7 +18112,11 @@ in
|
|||
|
||||
libpulseaudio = libpulseaudio-vanilla;
|
||||
|
||||
pulseeffects = callPackage ../applications/audio/pulseeffects {
|
||||
pulseeffects-pw = callPackage ../applications/audio/pulseeffects {
|
||||
boost = boost172;
|
||||
};
|
||||
|
||||
pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy {
|
||||
boost = boost172;
|
||||
};
|
||||
|
||||
|
|
@ -22715,7 +22719,7 @@ in
|
|||
|
||||
ht = callPackage ../applications/editors/ht { };
|
||||
|
||||
ht-rust = callPackage ../tools/networking/ht-rust {
|
||||
xh = callPackage ../tools/networking/xh {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -461,6 +461,8 @@ in {
|
|||
|
||||
asn1crypto = callPackage ../development/python-modules/asn1crypto { };
|
||||
|
||||
aspell-python = callPackage ../development/python-modules/aspell-python { };
|
||||
|
||||
aspy-yaml = callPackage ../development/python-modules/aspy.yaml { };
|
||||
|
||||
asteval = callPackage ../development/python-modules/asteval { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue