Merge master into staging-next
This commit is contained in:
commit
74783b72bc
|
@ -108,7 +108,7 @@ in stdenv.mkDerivation rec {
|
|||
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 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
|
|
|
@ -4,11 +4,11 @@ let
|
|||
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cinny";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
|
||||
sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU=";
|
||||
sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -4,19 +4,19 @@
|
|||
, glib
|
||||
, gettext
|
||||
, sassc
|
||||
, unstableGitUpdater
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-dash-to-dock";
|
||||
version = "71+date=2022-02-23";
|
||||
version = "72";
|
||||
|
||||
# Temporarily switched to commit hash because stable version is buggy.
|
||||
src = fetchFromGitHub {
|
||||
owner = "micheleg";
|
||||
repo = "dash-to-dock";
|
||||
rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f";
|
||||
sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100=";
|
||||
rev = "extensions.gnome.org-v${version}";
|
||||
sha256 = "Cds5Fc+rnvoy01GTZBS7qPh8UC9ekrNBOs+IEkDNkJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
|
|||
extensionUuid = "dash-to-dock@micxgx.gmail.com";
|
||||
extensionPortalSlug = "dash-to-dock";
|
||||
|
||||
updateScript = unstableGitUpdater {
|
||||
stableVersion = true;
|
||||
tagPrefix = "extensions.gnome.org-v";
|
||||
updateScript = gitUpdater {
|
||||
pname = "gnomeExtensions.dash-to-dock";
|
||||
inherit version;
|
||||
rev-prefix = "extensions.gnome.org-v";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, libxslt
|
||||
, docbook_xsl
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, dbus
|
||||
, glib
|
||||
|
@ -10,17 +13,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-dbus-proxy";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s=";
|
||||
sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
libxslt
|
||||
docbook_xsl
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
];
|
||||
|
||||
|
@ -32,10 +37,6 @@ stdenv.mkDerivation rec {
|
|||
dbus
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-man"
|
||||
];
|
||||
|
||||
# dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cachelib";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pallets";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1msDiNYxaETJfVBTaMuNJbSxhOpyRdHkb5CQ+1+ZbbQ=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-/378xNkBZHoTJ9Qs8RTYi+QosLs7GBgMOkIDYOaSH1Y=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphtage";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ZazqtrrCsoeJK7acj7Unpl+ZI2JL/khMN2aOSHdCHl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "herepy";
|
||||
version = "3.5.7";
|
||||
version = "3.5.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
@ -17,8 +17,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "abdullahselek";
|
||||
repo = "HerePy";
|
||||
rev = version;
|
||||
hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BwuH3GxEXiIFFM0na8Jhgp7J5TPW41/u89LWf+EprG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.23.0";
|
||||
version = "4.26.0";
|
||||
pname = "mt-940";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7";
|
||||
sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optional (!isPy3k) enum34;
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "numpy-stl";
|
||||
version = "2.16.3";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "95890627001efb2cb8d17418730cdc1bdd64b8dbb9862b01a8e0359d79fe863e";
|
||||
sha256 = "sha256-G42ak4w4OAbE2RTe3STN03A43/rZqJBbB8rBm0TlOWU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -59,16 +59,6 @@ buildPythonPackage rec {
|
|||
# https://github.com/NixOS/nixpkgs/issues/39687
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
|
||||
|
||||
# For OSX, we need to add a dependency on libcxx, which provides
|
||||
# `complex.h` and other libraries that pandas depends on to build.
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
cpp_sdk="${lib.getDev libcxx}/include/c++/v1";
|
||||
echo "Adding $cpp_sdk to the setup.py common_include variable"
|
||||
substituteInPlace setup.py \
|
||||
--replace "['pandas/src/klib', 'pandas/src']" \
|
||||
"['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isAarch32 && !stdenv.isAarch64; # upstream doesn't test this architecture
|
||||
|
||||
# don't max out build cores, it breaks tests
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-dynamic-versioning";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "mtkennerly";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dLtZSm10OYWLRK4eRo83RczW0zBVAUF0HQXLQbeDJCk=";
|
||||
hash = "sha256-u4rqkwy5C1+OrHJUsc/9Sy3YyxWlsTv8cbB1bBKh2K4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrfxtrx";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyRFXtrx";
|
||||
rev = version;
|
||||
hash = "sha256-Ty+yIA8amKyV3z++7n1m/YRH0gEoVIVTdX8xiZYp/eM=";
|
||||
hash = "sha256-0tdT7UIT9F2z9+ufnzaACVxRybWxFjZObYQCd3hcXTk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, fetchurl
|
||||
, pkg-config
|
||||
, python3
|
||||
, flex
|
||||
, sqlite
|
||||
, libedit
|
||||
, runCommand
|
||||
|
@ -13,18 +14,19 @@ let
|
|||
|
||||
link-grammar = stdenv.mkDerivation rec {
|
||||
pname = "link-grammar";
|
||||
version = "5.10.2";
|
||||
version = "5.10.4";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-KM7HUuqg44l66WEzO2knRZ+Laf7+aMKqUnKYPX24abY=";
|
||||
sha256 = "sha256-Pd4tEsre7aGTlEoereSElisCGXXhwgZDTMt4UEZIf4E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
flex
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -987,6 +987,8 @@ with pkgs;
|
|||
|
||||
adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { };
|
||||
|
||||
addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { };
|
||||
|
||||
addlicense = callPackage ../tools/misc/addlicense { };
|
||||
|
||||
adlplug = callPackage ../applications/audio/adlplug {
|
||||
|
|
|
@ -195,8 +195,6 @@ in {
|
|||
|
||||
addict = callPackage ../development/python-modules/addict { };
|
||||
|
||||
addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
|
||||
|
||||
adext = callPackage ../development/python-modules/adext { };
|
||||
|
||||
adguardhome = callPackage ../development/python-modules/adguardhome { };
|
||||
|
|
Loading…
Reference in a new issue