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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
sternenseemann 2021-11-14 17:04:19 +01:00
commit 987dd38788
12 changed files with 582 additions and 882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/graphics/tesseract/tesseract4.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config
, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }:
stdenv.mkDerivation rec {
pname = "tesseract";
@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn";
};
patches = [
# https://github.com/tesseract-ocr/tesseract/issues/3447
(fetchpatch {
url = "https://github.com/tesseract-ocr/tesseract/commit/dbc79b09d195490dfa3f7d338eadac07ad6683f7.patch";
sha256 = "sha256-lGlg0etuU4RXfdq1QH2bYObdeGrFHKf9O8zMUAbfNIQ=";
})
(fetchpatch {
url = "https://github.com/tesseract-ocr/tesseract/commit/6dc4b184b1ebf2e68461f6b63f63a033bc7245f7.patch";
sha256 = "sha256-DwIX3r5NmeajI6WgIVHDbkhLH/ygJIjPO5XrbzWQhSw=";
})
];
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];

22
pkgs/data/icons/moka-icon-theme/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }:
{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
pname = "moka-icon-theme";
version = "5.4.0";
version = "unstable-2019-05-29";
src = fetchFromGitHub {
owner = "snwh";
repo = pname;
rev = "v${version}";
sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd";
rev = "c0355ea31e5cfdb6b44d8108f602d66817546a09";
sha256 = "0m4kfarkl94wdhsds2q1l9x5hfa9l3117l8j6j7qm7sf7yzr90c8";
};
nativeBuildInputs = [
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
ninja
gtk3
python3
jdupes
];
propagatedBuildInputs = [
@ -25,14 +26,23 @@ stdenv.mkDerivation rec {
dontDropIconThemeCache = true;
# These fixup steps are slow and unnecessary for this package
dontPatchELF = true;
dontRewriteSymlinks = true;
postPatch = ''
patchShebangs meson/post_install.py
'';
postInstall = ''
# replace duplicate files with symlinks
jdupes -l -r $out/share/icons
'';
meta = with lib; {
description = "An icon theme designed with a minimal flat style using simple geometry and bright colours";
description = "Icon theme designed with a minimal flat style using simple geometry and bright colours";
homepage = "https://snwh.org/moka";
license = with licenses; [ cc-by-sa-40 gpl3 ];
license = with licenses; [ cc-by-sa-40 gpl3Only ];
# darwin cannot deal with file names differing only in case
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];

13
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1497,14 +1497,13 @@ self: super: {
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [
unmarkBroken
(overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; }))
# See hercules-ci-optparse-applicative in non-hackage-packages.nix.
addBuildDepend
super.hercules-ci-optparse-applicative
(overrideCabal
(drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })
(unmarkBroken super.hercules-ci-cli))
);
(addBuildDepend super.hercules-ci-optparse-applicative)
(generateOptparseApplicativeCompletion "hci")
];
# Readline uses Distribution.Simple from Cabal 2, in a way that is not
# compatible with Cabal 3. No upstream repository found so far

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -938,9 +938,9 @@ self: super: builtins.intersectAttrs super {
cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; });
hercules-ci-agent = appendConfigureFlag (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
hercules-ci-cnix-expr = appendConfigureFlag (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
hercules-ci-cnix-store = appendConfigureFlag (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }) "-fnix-2_4";
hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; });
hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; });
hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; });
# Enable extra optimisations which increase build time, but also
# later compiler performance, so we should do this for user's benefit.

1
pkgs/development/node-packages/node-packages.json
View File

@ -72,6 +72,7 @@
, "coc-tslint"
, "coc-tslint-plugin"
, "coc-tsserver"
, "coc-ultisnips"
, "coc-vetur"
, "coc-vimlsp"
, "coc-vimtex"

1335
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

43
pkgs/development/python-modules/aiohttp-remotes/default.nix
View File

@ -1,27 +1,50 @@
{ lib, buildPythonPackage, fetchPypi
, aiohttp, pytest, pytest-cov, pytest-aiohttp
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "aiohttp_remotes";
pname = "aiohttp-remotes";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
pname = "aiohttp_remotes";
inherit version;
sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174";
};
propagatedBuildInputs = [ aiohttp ];
propagatedBuildInputs = [
aiohttp
] ++ lib.optionals (pythonOlder "3.7") [
typing-extensions
];
checkInputs = [ pytest pytest-cov pytest-aiohttp ];
checkPhase = ''
python -m pytest
checkInputs = [
pytest-aiohttp
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace " --no-cov-on-fail --cov-branch --cov=aiohttp_remotes --cov-report=term --cov-report=html" ""
'';
pythonImportsCheck = [
"aiohttp_remotes"
];
meta = with lib; {
homepage = "https://github.com/wikibusiness/aiohttp-remotes";
description = "A set of useful tools for aiohttp.web server";
homepage = "https://github.com/wikibusiness/aiohttp-remotes";
license = licenses.mit;
maintainers = [ maintainers.qyliss ];
maintainers = with maintainers; [ qyliss ];
};
}

4
pkgs/development/python-modules/bracex/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bracex";
version = "2.2";
version = "2.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "8230f3a03f1f76c192a7844377124300fbaec83870a728b629dfabd9be9e83d0";
sha256 = "1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21";
};
checkInputs = [ pytestCheckHook ];

4
pkgs/development/python-modules/flux-led/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux_led";
version = "0.24.17";
version = "0.24.21";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-NAmODGk60Lt9OiTppYV40vvGL6g28spKRC7NxVFubxE=";
sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/hangups/default.nix
View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "hangups";
version = "0.4.14";
version = "0.4.15";
disabled = pythonOlder "3.6";
@ -26,12 +26,12 @@ buildPythonPackage rec {
owner = "tdryer";
repo = "hangups";
rev = "v${version}";
sha256 = "14njagpdp13zlaqnwl2mh7fkpnsaqr6wkr4lwh608v06pkwwcwcm";
sha256 = "sha256-47OvfFK92AtX6KiYnvro2B17RfQWyzgsgvOfl5T3Kag=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "protobuf>=3.1.0,<3.16" "protobuf" \
--replace "protobuf>=3.1.0,<3.17" "protobuf" \
--replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"
'';

15
pkgs/development/python-modules/minidump/default.nix
View File

@ -1,25 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "minidump";
version = "0.0.20";
version = "0.0.21";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1rr91nnlzv7gnbcvv8qhbyx1kh2s4jdv7nv0qka5jya32rzjaigm";
sha256 = "sha256-g9YSr7bFdyfr84rKQztVD4P5+MfDtlYq0quXBx/YXzo=";
};
# Upstream doesn't have tests
doCheck = false;
pythonImportsCheck = [ "minidump" ];
pythonImportsCheck = [
"minidump"
];
meta = with lib; {
description = "Python library to parse and read Microsoft minidump file format";
homepage = "https://github.com/skelsec/minidump";
license = with licenses; [ mit ];
maintainers = [ maintainers.fab ];
maintainers = with maintainers; [ fab ];
};
}

1
pkgs/misc/vim-plugins/overrides.nix
View File

@ -1037,6 +1037,7 @@ self: super: {
"coc-tslint"
"coc-tslint-plugin"
"coc-tsserver"
"coc-ultisnips"
"coc-vetur"
"coc-vimlsp"
"coc-vimtex"