3
0
Fork 0
forked from mirrors/nixpkgs

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-01-04 00:02:03 +00:00 committed by GitHub
commit bfc5fca342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 11 deletions

View file

@ -95,6 +95,12 @@
githubId = 7414843;
name = "Nicholas von Klitzing";
};
_13r0ck = {
name = "Brock Szuszczewicz";
email = "bnr@tuta.io";
github = "13r0ck";
githubId = 58987761;
};
_3noch = {
email = "eacameron@gmail.com";
github = "3noch";

View file

@ -81,7 +81,7 @@ let
in stdenv.mkDerivation rec {
pname = "mpv";
version = "0.34.0";
version = "0.34.1";
outputs = [ "out" "dev" "man" ];
@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8=";
sha256 = "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk";
};
postPatch = ''

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flux-led";
version = "0.27.28";
version = "0.27.32";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "flux_led";
rev = version;
sha256 = "sha256-lm560jTafxMVNH4tXx7xov1bQMEYp3FFzJEK5K+ung0=";
sha256 = "sha256-7EBZN4Nb3iVieTZvYlbN+CwgVxOwFatle0e6gFwcdwM=";
};
propagatedBuildInputs = [

View file

@ -6,20 +6,26 @@
buildPythonPackage rec {
pname = "sarge";
version = "0.1.7";
version = "0.1.7.post1";
format = "setuptools";
src = fetchFromGitHub {
owner = "vsajip";
repo = pname;
rev = version;
sha256 = "sha256-E1alSDXj0oeyB6dN5PAtN62FPpMsCKb4R9DpfWdFtn0=";
sha256 = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4=";
};
checkInputs = [
pytestCheckHook
];
disabledTests = [
# Aarch64-linux times out for these tests, so they need to be disabled.
"test_timeout"
"test_feeder"
];
pythonImportsCheck = [
"sarge"
];

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "assh";
version = "2.12.0";
version = "2.12.1";
src = fetchFromGitHub {
repo = "advanced-ssh-config";
owner = "moul";
rev = "v${version}";
sha256 = "sha256-FqxxNTsZVmCsIGNHRWusFP2gba2+geqBubw+6PeR75c=";
sha256 = "1r3fny4k1crpjasgsp09qf0p3l9vg8c0ddbb8jd6qnqnwwprqfxd";
};
vendorSha256 = "sha256-AYBwuRSeam5i2gex9PSG9Qk+FHdEhIpY250CJo01cFE=";
vendorSha256 = "14x7m900mxiwgbbxs56pdqsmx56c4qir5j4dz57bwr10rmh25fy4";
doCheck = false;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "5.5";
version = "5.6";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
sha256 = "sha256-v9p+G1aSzrvuoJLfRqWQXGVJ+2vysxdTgrD+ZUt6Yg4=";
sha256 = "sha256-HsRAu8exGXCGF0P7wZaDtuAKRDmNjMF9P2hFliZ1RXo=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];