From 898dc17bedeb23f60c59d786c933bbb63807ad86 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 23:56:20 +0000 Subject: [PATCH 01/10] clevis: 15 -> 16 --- pkgs/tools/security/clevis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 36b5ab47304..7f26dcabb7d 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "15"; + version = "16"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz"; + sha256 = "sha256-DWrxk+Nb2ptF5nCaXYvRY8hAFa/n+6OGdKWO+Sq61yk="; }; nativeBuildInputs = [ meson ninja pkg-config asciidoc ]; From 444ed9d8e9b8d61d7d34455d9c09fb3e22de20fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 03:49:45 +0000 Subject: [PATCH 02/10] python37Packages.datadog: 0.39.0 -> 0.40.0 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index a8917c3965f..b9c018a1d8f 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.39.0"; + version = "0.40.0"; src = fetchPypi { inherit pname version; - sha256 = "b0ef69a27aad0e4412c1ac3e6894fa1b5741db735515c34dfe1606d8cf30e4e5"; + sha256 = "4bbd66a02bbcf9cd03ba05194d605a64c9efb7aed90d5e69c6ec42655c3c01a4"; }; postPatch = '' From a1260ad61b3ccb77de87267269cbb79a9bac2256 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 10 Apr 2021 04:20:00 +0000 Subject: [PATCH 03/10] watchexec: 1.14.1 -> 1.15.0 https://github.com/watchexec/watchexec/releases/tag/1.15.0 --- pkgs/tools/misc/watchexec/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 5f80dad854e..5a264db2d4d 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0m4hipjgg64572lzqy9hz4iq9c4awc93c9rmnpap5iyi855x7idj"; + sha256 = "1b0ds04q4g8xcgwkziwb5hsi7v73w9y0prvhxz880zzh930652n2"; }; - cargoSha256 = "0035pqr61mdx699hd4f8hnxknvsdg67l6ys7gxym3fzd9dcmqqff"; + cargoSha256 = "0jpfgyz5l4fdb5cnqmadzjzrvc6dwgray4b0mx80pghpjw8a8qfb"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; postInstall = '' installManPage doc/watchexec.1 @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/watchexec/watchexec"; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; - platforms = platforms.linux ++ platforms.darwin; }; } From 764448055551a4c664a1b0e2cecfc61731b32c5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 11 Apr 2021 08:18:59 +0200 Subject: [PATCH 04/10] python3Packages.snitun: disable failing test on darwin (#119009) The upstream advertises this package as "OS independent", but from issues it is clear they cannot test it on MacOS. So we simply disable this test. ``` ______________________ test_peer_listener_timeout[pyloop] ______________________ raise_timeout = None peer_manager = peer_listener = test_client_peer = Client(reader=>>, close=) async def test_peer_listener_timeout( raise_timeout, peer_manager, peer_listener, test_client_peer ): """Run a full flow of with a peer.""" valid = datetime.utcnow() + timedelta(days=1) aes_key = os.urandom(32) aes_iv = os.urandom(16) hostname = "localhost" fernet_token = create_peer_config(valid.timestamp(), hostname, aes_key, aes_iv) crypto = CryptoTransport(aes_key, aes_iv) test_client_peer.writer.write(fernet_token) await test_client_peer.writer.drain() with pytest.raises(asyncio.IncompleteReadError): > token = await test_client_peer.reader.readexactly(32) tests/server/test_listener_peer.py:110: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ /nix/store/dpa7p7v00xvr26dv2myh3k5p1zkagqsm-python3-3.8.5/lib/python3.8/asyncio/streams.py:723: in readexactly await self._wait_for_data('readexactly') /nix/store/dpa7p7v00xvr26dv2myh3k5p1zkagqsm-python3-3.8.5/lib/python3.8/asyncio/streams.py:517: in _wait_for_data await self._waiter _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ self = <_SelectorSocketTransport closed fd=19> def _read_ready__data_received(self): if self._conn_lost: return try: > data = self._sock.recv(self.max_size) E ConnectionResetError: [Errno 54] Connection reset by peer ``` --- pkgs/development/python-modules/snitun/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 901987fbff6..10eada9f095 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { # port binding conflicts "test_snitun_single_runner_timeout" "test_snitun_single_runner_throttling" + # ConnectionResetError: [Errno 54] Connection reset by peer + "test_peer_listener_timeout" ]; meta = with lib; { From 0062afc0506491c2989a17eadf7239b5a7b38338 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Apr 2021 09:22:40 +0200 Subject: [PATCH 05/10] =?UTF-8?q?ocamlPackages.printbox:=200.4=20=E2=86=92?= =?UTF-8?q?=200.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/printbox/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index f2bbfdcec18..04361de7222 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, uucp, uutf }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }: buildDunePackage rec { pname = "printbox"; - version = "0.4"; + version = "0.5"; - minimumOCamlVersion = "4.05"; + useDune2 = true; + + minimumOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = version; - sha256 = "0bq2v37v144i00h1zwyqhkfycxailr245n97yff0f7qnidxprix0"; + sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2"; }; - checkInputs = lib.optionals doCheck [ uucp uutf ]; + checkInputs = [ uucp uutf mdx.bin ]; - doCheck = true; + # mdx is not available for OCaml < 4.07 + doCheck = lib.versionAtLeast ocaml.version "4.07"; meta = { homepage = "https://github.com/c-cube/printbox/"; From 5d775bb2b0130ee099065a1cfcf8494ec4c89f14 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 11 Apr 2021 10:43:29 +0200 Subject: [PATCH 06/10] chromiumBeta: Fix the build (#119087) --- .../networking/browsers/chromium/browser.nix | 2 +- .../networking/browsers/chromium/common.nix | 4 ++- .../fix-missing-atspi2-dependency.patch | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 1fecadc2ec0..f37666b0033 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec { then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - broken = elem channel [ "beta" "dev" ]; + broken = elem channel [ "dev" ]; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f043ec60f4e..07634c337af 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -159,7 +159,9 @@ let ) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch { url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch"; sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny"; - }); + }) ++ optional (chromiumVersionAtLeast "90") + ./fix-missing-atspi2-dependency.patch + ; postPatch = '' # remove unused third-party diff --git a/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch b/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch new file mode 100644 index 00000000000..9417b30159d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch @@ -0,0 +1,26 @@ +From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Sat, 10 Apr 2021 13:53:50 +0200 +Subject: [PATCH] Fix a missing atspi2 dependency + +See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for +more details. +--- + content/public/browser/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn +index 7e7c436d90c7..20ef832f1d8c 100644 +--- a/content/public/browser/BUILD.gn ++++ b/content/public/browser/BUILD.gn +@@ -535,6 +535,7 @@ source_set("browser_sources") { + + if (use_atk) { + sources += [ "ax_inspect_factory_auralinux.cc" ] ++ configs += [ "//build/config/linux/atspi2" ] + } + + if (is_linux || is_chromeos) { +-- +2.20.1 + From 441f0c894aae2846190724828054e4bad9284579 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 19 Dec 2020 15:13:56 +0000 Subject: [PATCH 07/10] mdevd: init at 0.1.3.0 --- pkgs/os-specific/linux/mdevd/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/mdevd/default.nix diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/os-specific/linux/mdevd/default.nix new file mode 100644 index 00000000000..b88e3ad1e6f --- /dev/null +++ b/pkgs/os-specific/linux/mdevd/default.nix @@ -0,0 +1,28 @@ +{ lib, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "mdevd"; + version = "0.1.3.0"; + sha256 = "0spvw27xxd0m6j8bl8xysmgsx18fl769smr6dsh25s2d5h3sp2dy"; + + description = "mdev-compatible Linux hotplug manager daemon"; + platforms = lib.platforms.linux; + + outputs = [ "bin" "out" "dev" "doc" ]; + + configureFlags = [ + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + ]; + + postInstall = '' + # remove all mdevd executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + + mv doc $doc/share/doc/mdevd/html + mv examples $doc/share/doc/mdevd/examples + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c6eb4ee80..06742aa4a1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17270,6 +17270,7 @@ in s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; s6-rc = callPackage ../tools/system/s6-rc { }; + mdevd = callPackage ../os-specific/linux/mdevd { }; nsss = callPackage ../development/libraries/nsss { }; utmps = callPackage ../development/libraries/utmps { }; sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; @@ -20263,6 +20264,8 @@ in mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; + inherit (skawarePackages) mdevd; + metastore = callPackage ../os-specific/linux/metastore { }; mingetty = callPackage ../os-specific/linux/mingetty { }; From 2140791f9b2be837880a4e8cd03378f835cc94be Mon Sep 17 00:00:00 2001 From: sterni <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 11 Apr 2021 12:26:10 +0200 Subject: [PATCH 08/10] ocamlPackages.janeStreet{,_0_9_0}: join the ocamlPackages fix point, allowing overriding to work as expected (#113696) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.janeStreet_0_9_0: join the ocamlPackages fix point Internal dependencies in the janeStreet sets were always taken from the own rec attribute set. While this is pretty simple and convenient, it has the disadvantage that it doesn't play nice with overriding: If you'd override an attribute in a janeStreet set previously, it would be changed when referenced directly, but the other packages in that janeStreet set still would use the original, non-overridden version of the derivation. This is easily fixed by passing janeStreet_0_9_0 itself from the fix point of ocamlPackages and using it to reference the dependencies. Example showing it now works as expected: test-overlay.nix: self: super: { ocamlPackages = super.ocamlPackages.overrideScope (old: _: { janeStreet_0_9_0 = old.janeStreet_0_9_0 // { base = old.janeStreet_0_9_0.base.overrideAttrs (_: { meta.broken = true; }); }; }); } nix-repl> (import ./. { overlays = [ (import ./test-overlay.nix) ]; }).ocamlPackages.janeStreet_0_9_0.stdio error: Package ‘ocaml4.10.0-base-0.9.4’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix:6 is marked as broken, refusing to evaluate. a) To temporarily allow broken packages, you can use an environment variable for a single invocation of the nix tools. $ export NIXPKGS_ALLOW_BROKEN=1 b) For `nixos-rebuild` you can set { nixpkgs.config.allowBroken = true; } in configuration.nix to override this. c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allowBroken = true; } to ~/.config/nixpkgs/config.nix. * ocamlPackages.janeStreet: take part in fixpoint for OCaml >= 4.08 This change makes overrides to the janeStreet set work as expected by making the janeStreet set take part in the ocamlPackages fixpoint for janeStreet 0.14, i. e. OCaml >= 4.08 * ocamlPackages.janeStreet: take part in fixpoint for OCaml == 4.07 This change makes overrides to the janeStreet set work as expected by making the janeStreet set take part in the ocamlPackages fixpoint for janeStreet 0.12, i. e. OCaml == 4.07 * ocamlPackages.janeStreet: take part in fixpoint for OCaml < 4.07 This change makes overrides to the janeStreet set work as expected by making the janeStreet set take part in the ocamlPackages fixpoint for janeStreet 0.11, i. e. OCaml < 4.07 * ocamlPackages.janeStreet: remove self - super distinction Previously, we inherited non-janestreet ocaml dependencies from super and janestreet dependencies from self which always was super.janeStreet. This behavior is however not really what we want due to liftJaneStreet: Users and other packages will use ocamlPackages.base etc. instead of ocamlPackages.janeStreet.base and the like. Consequently they also would override the top-level attributes which would mean that other janestreet packages would not pick up on it however. As a consequence however, overriding ocamlPackages.janeStreet.base doesn't work. Since this was never possible, I don't think this is an issue. It is probably a good idea to deprecate that set anyways and printing a warning when it is used via trace. janeStreet_0_9_0 is unchanged as the disticniton between self and super makes sense for it. Below is an example showing how overriding would work from an user's perspective: test-overlay.nix: self: super: { ocamlPackages = super.ocamlPackages.overrideScope (old: _: { base = old.base.overrideAttrs (_: { meta.broken = true; }); }); } nix-repl> (import ./. { overlays = [ (import ./test-overlay.nix) ]; }).ocamlPackages. stdio error: Package ‘ocaml4.10.0-base-0.14.0’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix:12 is marked as broken, refusing to evaluate. a) To temporarily allow broken packages, you can use an environment variable for a single invocation of the nix tools. $ export NIXPKGS_ALLOW_BROKEN=1 b) For `nixos-rebuild` you can set { nixpkgs.config.allowBroken = true; } in configuration.nix to override this. c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allowBroken = true; } to ~/.config/nixpkgs/config.nix. --- .../ocaml-modules/janestreet/0.12.nix | 11 +++---- .../ocaml-modules/janestreet/0.14.nix | 27 +++------------- .../ocaml-modules/janestreet/default.nix | 10 +++--- .../ocaml-modules/janestreet/old.nix | 32 ++++++++++++++++--- pkgs/top-level/ocaml-packages.nix | 29 ++++++++--------- 5 files changed, 55 insertions(+), 54 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix index 295960764dc..10d8886d994 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -1,13 +1,10 @@ -{ janePackage -, ctypes -, num -, octavius -, ppxlib -, re +{ self , openssl }: -rec { +with self; + +{ ocaml-compiler-libs = janePackage { pname = "ocaml-compiler-libs"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 738828e8308..eb429b2bb6d 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,30 +1,11 @@ -{ janePackage -, alcotest -, angstrom -, angstrom-async -, base64 -, cryptokit -, ctypes -, dune-configurator -, faraday -, inotify -, js_of_ocaml -, js_of_ocaml-ppx -, lambdasoup -, magic-mime -, num -, octavius -, ppxlib -, re -, tyxml -, uri-sexp -, zarith +{ self , openssl -, ounit , zstd }: -rec { +with self; + +{ accessor = janePackage { pname = "accessor"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a4c026ffb8b..679ef4a58e4 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,10 +1,10 @@ -{ janePackage, ocamlbuild, angstrom, cryptokit, ctypes, - magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, - num, openssl -, ppxlib +{ self +, openssl }: -rec { +with self; + +{ ocaml-compiler-libs = janePackage { pname = "ocaml-compiler-libs"; diff --git a/pkgs/development/ocaml-modules/janestreet/old.nix b/pkgs/development/ocaml-modules/janestreet/old.nix index 447a9cdf71f..8b4a6ed5296 100644 --- a/pkgs/development/ocaml-modules/janestreet/old.nix +++ b/pkgs/development/ocaml-modules/janestreet/old.nix @@ -1,8 +1,32 @@ -{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime, - ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, - openssl }: +{ self +, super +, lib +, stdenv +, openssl +}: -rec { +let + inherit (super) + janePackage + ocaml + ocamlbuild + cryptokit + ctypes + magic-mime + ocaml-migrate-parsetree + octavius + ounit + ppx_deriving + re + zarith + num + ; + +in + +with self; + +{ # Jane Street packages, up to ppx_core diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87d4d52d388..790f9c465f9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1255,32 +1255,31 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { - inherit alcotest angstrom angstrom-async base64 cryptokit ctypes - dune-configurator faraday inotify janePackage js_of_ocaml - js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit - ppxlib re tyxml uri-sexp zarith; + inherit self; inherit (pkgs) openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { - inherit ctypes janePackage num octavius re; + self = self // { + ppxlib = ppxlib.override { version = "0.8.1"; }; + }; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.8.1"; }; } else import ../development/ocaml-modules/janestreet { - inherit janePackage ocamlbuild angstrom ctypes cryptokit; - inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re; + self = self // { + ppxlib = ppxlib.override { version = "0.8.1"; }; + }; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.8.1"; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; }; - inherit lib ocaml ocamlbuild ctypes cryptokit; - inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re zarith; - inherit (pkgs) stdenv openssl; + self = self.janeStreet_0_9_0; + super = self // { + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { + defaultVersion = "0.9.0"; + }; + }; + inherit (pkgs) stdenv lib openssl; }; js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; From 1dee5f4388280a6e71f7d442a93d737c80c915c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Apr 2021 10:00:26 +0200 Subject: [PATCH 09/10] python3Packages.transformers: fix build --- pkgs/development/python-modules/transformers/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 19dcc708651..c5bd0ad1114 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -8,6 +8,7 @@ , regex , requests , numpy +, packaging , protobuf , sacremoses , tokenizers @@ -25,6 +26,8 @@ buildPythonPackage rec { hash = "sha256-kl1Z2FBo+yqVXUqLaUtet6IycmdcAtfydNTI4MNNrkc="; }; + nativeBuildInputs = [ packaging ]; + propagatedBuildInputs = [ cookiecutter filelock From 9e9527b1b4bc632f89039be243fdd285a153cb21 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 10 Apr 2021 16:46:30 -0700 Subject: [PATCH 10/10] python3Packages.poetry: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 1519187d174..95e45020d46 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs"; + sha256 = "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf"; }; postPatch = ''