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

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2020-12-25 06:20:28 +00:00 committed by GitHub
parent 8194c0475b 8dc49eba0a
commit fe6f5a0d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/orca/default.nix
View File

@ -35,13 +35,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "orca"; pname = "orca";
version = "3.38.1"; version = "3.38.2";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld"; sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw=";
}; };
patches = [ patches = [

6
pkgs/development/compilers/zig/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }:
llvmPackages.stdenv.mkDerivation rec { llvmPackages.stdenv.mkDerivation rec {
version = "0.6.0"; version = "0.7.1";
pname = "zig"; pname = "zig";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ziglang"; owner = "ziglang";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
./zig test $src/test/stage1/behavior.zig ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/stage1/behavior.zig
runHook postCheck runHook postCheck
''; '';

8
pkgs/development/python-modules/fontparts/default.nix
View File

@ -1,19 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, python { lib, buildPythonPackage, fetchPypi, python
, fonttools, lxml, fs, unicodedata2 , fonttools, lxml, fs, unicodedata2
, defcon, fontpens, fontmath, booleanoperations , defcon, fontpens, fontmath, booleanoperations
, pytest , pytest, setuptools_scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "fontParts"; pname = "fontParts";
version = "0.9.6"; version = "0.9.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0q8ilc1ypmasci2x1nq69hnfsnvbi1czaxgsb3zgqd8777bn5v9z"; sha256 = "183y1y11bqd4ky4anyv40qbvsm6i90gnydqzrjg7syspjsqvfqgy";
extension = "zip"; extension = "zip";
}; };
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ propagatedBuildInputs = [
booleanoperations booleanoperations
fonttools fonttools

2
pkgs/development/python-modules/hmmlearn/default.nix
View File

@ -14,7 +14,7 @@ buildPythonPackage rec {
checkInputs = [ pytest ]; checkInputs = [ pytest ];
checkPhase = '' checkPhase = ''
pytest --doctest-modules --pyargs hmmlearn pytest --pyargs hmmlearn
''; '';
meta = with lib; { meta = with lib; {

27
pkgs/development/tools/yj/default.nix
View File

@ -1,27 +1,24 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 { stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec { buildGoModule rec {
pname = "yj"; pname = "yj";
version = "4.0.0"; version = "5.0.0";
rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558";
goPackagePath = "github.com/sclevine/yj"; src = fetchFromGitHub {
owner = "sclevine";
src = fetchgit { repo = "yj";
inherit rev; rev = "c4c13b7641389c76ea028b48091f851f3efb6376";
url = "https://github.com/sclevine/yj"; sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr";
sha256 = "04irphzs6hp9hvyski29ad29ga1kis3h8bw7jqvmy2c2rkrrsh7x";
}; };
goDeps = ./deps.nix; vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv";
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; description = ''Convert YAML <=> TOML <=> JSON <=> HCL'';
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch ]; maintainers = with maintainers; [ Profpatsch ];
downloadPage = "https://github.com/sclevine/yj"; homepage = "https://github.com/sclevine/yj";
updateWalker = true;
inherit version;
}; };
} }

30
pkgs/development/tools/yj/deps.nix generated
View File

@ -1,30 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "cf7d376da96d9cecec7c7483cec2735efe54a410";
sha256 = "0i1zhgpyvvgwkz74k8wd3sygsap1saqv37rw0j5vdpaazmpr1qkb";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]

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

@ -16711,7 +16711,7 @@ in
libzra = callPackage ../development/libraries/libzra { }; libzra = callPackage ../development/libraries/libzra { };
zig = callPackage ../development/compilers/zig { zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_10; llvmPackages = llvmPackages_11;
}; };
zimlib = callPackage ../development/libraries/zimlib { }; zimlib = callPackage ../development/libraries/zimlib { };