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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-09 06:17:35 +00:00 committed by GitHub
commit dd7cbca2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 174 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/math/gmsh/default.nix
View File

@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "gmsh";
version = "4.7.1";
version = "4.8.0";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "0shwi41van3k0z6rnpl3sz5nh46xbyyljwfpcp8pwxbc26aw5169";
sha256 = "sha256-JYd4PEsClj+divtxfJlUyu+kY+ouChLhZZMH5qDX6ms=";
};
buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL

4
pkgs/development/interpreters/jruby/default.nix
View File

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.15.0";
version = "9.2.16.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "sha256-no5dc8QtHa2KeVptw5vYfoj8iGP3bgZeQJnDLQhSBbA=";
sha256 = "sha256-WuJ/FJ9z8/6k80NZy7dzwl2dmH5yte3snouTlXmX6zA=";
};
nativeBuildInputs = [ makeWrapper ];

51
pkgs/development/python-modules/fakeredis/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, aioredis
, async_generator
, buildPythonPackage
, fetchPypi
, hypothesis
, lupa
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
, redis
, six
, sortedcontainers
}:
buildPythonPackage rec {
pname = "fakeredis";
version = "1.4.5";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "0slb23zxn47a4z8b7jq7gq40g4zsn52y9h29zdqs29b85394gjq1";
};
propagatedBuildInputs = [
aioredis
lupa
redis
six
sortedcontainers
];
checkInputs = [
async_generator
hypothesis
pytest-asyncio
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "fakeredis" ];
meta = with lib; {
description = "Fake implementation of Redis API";
homepage = "https://github.com/jamesls/fakeredis";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "humanfriendly";
version = "8.2";
version = "9.1";
src = fetchPypi {
inherit pname version;
sha256 = "bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12";
sha256 = "sha256-BmVilWY5qyH/JnbR/aC1mH6YXFNPx2cAoZvVS8uBEh0=";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic;

26
pkgs/development/python-modules/lupa/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, cython
, fetchPypi
}:
buildPythonPackage rec {
pname = "lupa";
version = "1.9";
src = fetchPypi {
inherit pname version;
sha256 = "13ifv0nxbf70xg69sp49j484m8cnid7rgh8f94pgfb50dj01vqd3";
};
nativeBuildInputs = [ cython ];
pythonImportsCheck = [ "lupa" ];
meta = with lib; {
description = "Lua in Python";
homepage = "https://github.com/scoder/lupa";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pykmtronic";
version = "0.0.2";
version = "0.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "1p0i7g4k8ggmzargdi3ch55id04j5qjlhv8hap2162gc77b16d59";
sha256 = "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=";
};
propagatedBuildInputs = [ aiohttp lxml ];

8
pkgs/development/tools/build-managers/shards/default.nix
View File

@ -43,11 +43,11 @@ rec {
crystal = crystal_0_34;
};
shards_0_13 = generic {
version = "0.12.0";
sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c";
shards_0_14 = generic {
version = "0.14.0";
sha256 = "sha256-HEyGXoGkQvLrk672/ekmBxnR1eRM//GwRPd/19LM8Wo=";
crystal = crystal_0_36;
};
shards = shards_0_13;
shards = shards_0_14;
}

4
pkgs/development/tools/build-managers/shards/shards.nix
View File

@ -2,7 +2,7 @@
molinillo = {
owner = "crystal-lang";
repo = "crystal-molinillo";
rev = "v0.1.0";
sha256 = "0rs0w59m6ccsgkdxfy3xv6alxsziy9sy9smz71cz0dnyvlzlnaxj";
rev = "v0.2.0";
sha256 = "0pzi8pbrjn03zgk3kbha2kqqq0crmr8gy98dr05kisafvbghzwnh";
};
}

4
pkgs/development/tools/dapper/default.nix
View File

@ -5,7 +5,7 @@
buildGoPackage rec {
pname = "dapper";
version = "0.5.5";
version = "0.5.6";
goPackagePath = "github.com/rancher/dapper";
@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "rancher";
repo = "dapper";
rev = "v${version}";
sha256 = "sha256-QzPW1uC/WuYM/lLqyKodIozGTz5Qn1haoDvgNgjhrRA=";
sha256 = "sha256-o64r4TBDpICnVZMIX2jKQjoJkA/jAviJkvI/xJ4ToM8=";
};
patchPhase = ''
substituteInPlace main.go --replace 0.0.0 ${version}

8
pkgs/development/tools/dive/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dive";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "wagoodman";
repo = pname;
rev = "v${version}";
sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22";
sha256 = "sha256-1pmw8pUlek5FlI1oAuvLSqDow7hw5rw86DRDZ7pFAmA=";
};
vendorSha256 = "0219q9zjc0i6fbdngqh0wjpmq8wj5bjiz5dls0c1aam0lh4vwkhc";
vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";
doCheck = false;
@ -25,6 +25,6 @@ buildGoModule rec {
description = "A tool for exploring each layer in a docker image";
homepage = "https://github.com/wagoodman/dive";
license = licenses.mit;
maintainers = with maintainers; [ marsam spacekookie ];
maintainers = with maintainers; [ marsam spacekookie SuperSandro2000 ];
};
}

12
pkgs/misc/vim-plugins/generated.nix
View File

@ -2974,6 +2974,18 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2021-02-25";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "4a424267e110e9637b84096a7080aa280c56be31";
sha256 = "034x827nka73znvnbm5slnypw1az9s7xlrpkv5ia6hi7pcapjyfn";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf";
};
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-03-05";

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -264,6 +264,7 @@ kchmck/vim-coffee-script
KeitaNakamura/neodark.vim
keith/investigate.vim
keith/swift.vim
kevinhwang91/nvim-bqf@main
kevinhwang91/nvim-hlslens@main
kien/rainbow_parentheses.vim
knubie/vim-kitty-navigator

6
pkgs/servers/http/gitlab-pages/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "1.34.0";
version = "1.35.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-bJ9BQbAe35z5cIw0HhFjM6arWf1Tdy4gRipAHywxZZk=";
sha256 = "sha256-5AkzbOutBXy59XvMwfyH6A8ETwjP2QokG/Rz31/nCpk=";
};
vendorSha256 = "sha256-amPL0gzvqsacj7+UNJeZOQbeiBESUttbtPHxLpDykRI=";
vendorSha256 = "sha256-g8FDWpZmbZSkJAzoEiI8/JZLTTgG7uJ4sS35axaEXLY=";
subPackages = [ "." ];
doCheck = false; # Broken

4
pkgs/servers/jackett/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.17.606";
version = "0.17.617";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-SWZMS5O1hp9RsFlivfegqoiCLLd9PZthxbrn6IL+FzI=";
sha256 = "sha256-rNCtoiv48fzKH5CAzTZJjAjv6Z37BfVVNqsfpRVfY1M=";
};
nativeBuildInputs = [ makeWrapper ];

47
pkgs/tools/misc/ytfzf/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, curl
, dmenu
, fzf
, jq
, mpv
, youtube-dl
}:
stdenv.mkDerivation rec {
pname = "ytfzf";
version = "1.0.0";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
sha256 = "09znixn8mpkxipv2x3nrfxr2i8g7y58v25qssqf092j9lh85sf9h";
};
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
dontBuild = true;
# remove after next update
preInstall = ''
mkdir -p "$out/bin"
'';
postInstall = ''
wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
curl dmenu fzf jq mpv youtube-dl
]}
'';
meta = with lib; {
description = "A posix script to find and watch youtube videos from the terminal";
homepage = "https://github.com/pystardust/ytfzf";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/tools/networking/haproxy/default.nix
View File

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.3.5";
version = "2.3.6";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-eSRTlTC79VWCnH9Yhr4Lf8+NnI/+CGe3AQvrZwq/vks=";
sha256 = "sha256-bUYg5dodk+118ikBEhbbgdUJe2i/F14wny+rKJC7oDY=";
};
buildInputs = [ openssl zlib ]

4
pkgs/tools/system/daemon/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "daemon";
version = "0.7.1";
version = "0.8";
src = fetchurl {
url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz";
sha256 = "sha256-uh9tyHUyyFK/uPQ2F5zWYcNFj/iY9ndnxBQSMZhibf0=";
sha256 = "sha256-dPEubUs8hWMkib0IQx09mXvBcmS/V7cgI4Ty6AnP9ZY=";
};
makeFlags = [

4
pkgs/top-level/all-packages.nix
View File

@ -9361,6 +9361,8 @@ in
yeshup = callPackage ../tools/system/yeshup { };
ytfzf = callPackage ../tools/misc/ytfzf { };
ytree = callPackage ../tools/misc/ytree { };
yggdrasil = callPackage ../tools/networking/yggdrasil { };
@ -12972,7 +12974,7 @@ in
inherit (callPackage ../development/tools/build-managers/shards { })
shards_0_11
shards_0_13
shards_0_14
shards;
shellcheck = callPackage ../development/tools/shellcheck {};

6
pkgs/top-level/python-packages.nix
View File

@ -2215,9 +2215,11 @@ in {
fake_factory = callPackage ../development/python-modules/fake_factory { };
fake-useragent = callPackage ../development/python-modules/fake-useragent { };
faker = callPackage ../development/python-modules/faker { };
fake-useragent = callPackage ../development/python-modules/fake-useragent { };
fakeredis = callPackage ../development/python-modules/fakeredis { };
falcon = callPackage ../development/python-modules/falcon { };
@ -3929,6 +3931,8 @@ in {
luftdaten = callPackage ../development/python-modules/luftdaten { };
lupa = callPackage ../development/python-modules/lupa { };
lxc = callPackage ../development/python-modules/lxc { };
lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; };