From 2a9b003ca7941ea85a6912ebba6c402f6bfe755c Mon Sep 17 00:00:00 2001 From: Simon THOBY Date: Wed, 23 Dec 2020 18:23:09 +0100 Subject: [PATCH 1/5] yj: 4.0.0 -> 5.0.0 Necessary to advance https://github.com/cargo2nix/cargo2nix/pull/165 (older versions of yj didn't differenciate between integers and floats, which can break cargo manifests when converting from TOML to JSON and back). --- pkgs/development/tools/yj/default.nix | 27 +++++++++++------------- pkgs/development/tools/yj/deps.nix | 30 --------------------------- 2 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/tools/yj/deps.nix diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 94237abf89b..43771e4b679 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -1,27 +1,24 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "yj"; - version = "4.0.0"; - rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558"; + version = "5.0.0"; - goPackagePath = "github.com/sclevine/yj"; - - src = fetchgit { - inherit rev; - url = "https://github.com/sclevine/yj"; - sha256 = "04irphzs6hp9hvyski29ad29ga1kis3h8bw7jqvmy2c2rkrrsh7x"; + src = fetchFromGitHub { + owner = "sclevine"; + repo = "yj"; + rev = "c4c13b7641389c76ea028b48091f851f3efb6376"; + sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr"; }; - goDeps = ./deps.nix; + vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with stdenv.lib; { description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; - downloadPage = "https://github.com/sclevine/yj"; - updateWalker = true; - inherit version; + homepage = "https://github.com/sclevine/yj"; }; } diff --git a/pkgs/development/tools/yj/deps.nix b/pkgs/development/tools/yj/deps.nix deleted file mode 100644 index 0bfe7f5f5da..00000000000 --- a/pkgs/development/tools/yj/deps.nix +++ /dev/null @@ -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"; - }; - } -] From 1714db88df1e1c43a1a816ef87cc2aa73ccbc656 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 23 Dec 2020 23:58:21 -0500 Subject: [PATCH 2/5] python37Packages.hmmlearn: unbreak tests --- pkgs/development/python-modules/hmmlearn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 909606c25eb..3f601eacc42 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - pytest --doctest-modules --pyargs hmmlearn + pytest --pyargs hmmlearn ''; meta = with lib; { From 5b95e93e1d148cc5d923a639e5f13b60f7700343 Mon Sep 17 00:00:00 2001 From: Miikka Koskinen Date: Thu, 24 Dec 2020 10:11:01 +0200 Subject: [PATCH 3/5] zig: 0.6.0 -> 0.7.1 --- pkgs/development/compilers/zig/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index aaed6d8892f..1a5cba37d47 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: llvmPackages.stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.1"; pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; + sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md"; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ./zig test $src/test/stage1/behavior.zig + ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/stage1/behavior.zig runHook postCheck ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5a25414c..6ef678b3ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16643,7 +16643,7 @@ in libzra = callPackage ../development/libraries/libzra { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_10; + llvmPackages = llvmPackages_11; }; zimlib = callPackage ../development/libraries/zimlib { }; From 7a369982c18e5a7996c4e0dc2059d7c2f8fff2d6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 24 Dec 2020 15:36:19 +0100 Subject: [PATCH 4/5] pythonPackages.fontparts: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/fontparts/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 43fdae8ccaf..c694c15f557 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -1,19 +1,21 @@ { lib, buildPythonPackage, fetchPypi, python , fonttools, lxml, fs, unicodedata2 , defcon, fontpens, fontmath, booleanoperations -, pytest +, pytest, setuptools_scm }: buildPythonPackage rec { pname = "fontParts"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "0q8ilc1ypmasci2x1nq69hnfsnvbi1czaxgsb3zgqd8777bn5v9z"; + sha256 = "183y1y11bqd4ky4anyv40qbvsm6i90gnydqzrjg7syspjsqvfqgy"; extension = "zip"; }; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ booleanoperations fonttools From 12b1d81ab9140f5b56e7d2e3c43a922229837bfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Dec 2020 02:41:52 +0000 Subject: [PATCH 5/5] orca: 3.38.1 -> 3.38.2 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 377f00d1c16..e438fd0762f 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.1"; + version = "3.38.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld"; + sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; }; patches = [