From 6797b92f8d0f357702da4f13cf69bcd43e006240 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 18 Jul 2021 19:09:38 +0200 Subject: [PATCH 01/11] flake.nix: Only add `_file`-key if position of `args.modules` is actually known to the evaluator This happens if the evaluator "loses" the position of an attr-declaration[1] because of e.g. too many nested function-calls to build the final attr-set. While the actual issue should be fixed in Nix itself, this is IMHO a fair workaround to unblock affected users[2]. [1] https://github.com/NixOS/nixpkgs/commit/e14c24593420bb9057e7f38b40d17137eaeff9dd#commitcomment-53645936 [2] It seems as everyone using `divnix/digga` or `flake-utils-plus` are affected: * https://github.com/divnix/digga/issues/87 --- flake.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 92c0d97c4a2..ececd26c153 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,18 @@ })).config; moduleDeclarationFile = - (builtins.unsafeGetAttrPos "modules" args).file; + let + # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't + # mean that the evaluator always keeps track of its position. If there + # are too many levels of indirection, the position gets lost at some point. + intermediatePos = builtins.unsafeGetAttrPos "modules" args; + in + if intermediatePos == null then null else intermediatePos.file; # Add the invoking file as error message location for modules # that don't have their own locations; presumably inline modules. addModuleDeclarationFile = - m: { + m: if moduleDeclarationFile == null then m else { _file = moduleDeclarationFile; imports = [ m ]; }; From e3e72254d4505468a46280e33d6857d8b7a905d8 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 18 Jul 2021 16:28:01 -0700 Subject: [PATCH 02/11] diffoscope: 177 -> 178 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index e57caa8cc7f..a4b2b888fae 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "177"; + version = "178"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-yTOaDhAKtMhQYxolALnuc7FuXoMUOhjmsabtS1FeW/Q="; + sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM="; }; outputs = [ "out" "man" ]; From edcce0c077133119445143345b2b409410267eae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 04:07:07 +0000 Subject: [PATCH 03/11] evince: 40.2 -> 40.4 --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index f5652d8c64a..11cd3735e1d 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "40.2"; + version = "40.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "D/fseTdqipesTNJ00y6ATH4jbvLS1dP2Rt5uuIKmPHc="; + sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs="; }; postPatch = '' From 530be5f4593a293c339b4175e7a0d30c7ecee101 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 16 Jul 2021 14:44:33 +0300 Subject: [PATCH 04/11] pythonPackages.hcloud: 1.12.0 -> 1.13.0 This release drops support for Python 2.7. --- pkgs/development/python-modules/hcloud/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 1bae0d633e3..8f359d39e2d 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -8,15 +8,17 @@ , isort , mock , pytest +, isPy27 }: buildPythonPackage rec { pname = "hcloud"; - version = "1.12.0"; + version = "1.13.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1fka4m3kbz52pksrjw3v42k611x5kl06dxrc7p5rb64jg6gayjfl"; + sha256 = "0f84nwr3ddzivlnswwmhvm3lgq9fy3n7nryy93xqpk5nxcd1ybpn"; }; propagatedBuildInputs = [ future requests python-dateutil ]; From 80bd1454bce550c50f7d7602e80a19bf7fca713a Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Mon, 19 Jul 2021 09:27:53 +0200 Subject: [PATCH 05/11] ocamlPackages.ringo: init at 0.5 (#130256) ocamlPackages.ringo-lwt: init at 0.5 --- .../ocaml-modules/ringo/default.nix | 28 +++++++++++++++++++ pkgs/development/ocaml-modules/ringo/lwt.nix | 17 +++++++++++ pkgs/top-level/ocaml-packages.nix | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ringo/default.nix create mode 100644 pkgs/development/ocaml-modules/ringo/lwt.nix diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix new file mode 100644 index 00000000000..7bfd38b869d --- /dev/null +++ b/pkgs/development/ocaml-modules/ringo/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitLab, buildDunePackage }: + +buildDunePackage rec { + pname = "ringo"; + version = "0.5"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "ringo"; + rev = "v${version}"; + sha256 = "1zwha0ycv3rm3qnw7nkg2m08ibx39yxnx5fan4lnn82b0pdasjag"; + }; + + minimalOCamlVersion = "4.05"; + + useDune2 = true; + + doCheck = true; + + # If we just run the test as is it will try to test ringo-lwt + checkPhase = "dune build @test/runtest"; + + meta = { + description = "Caches (bounded-size key-value stores) and other bounded-size stores"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ringo/lwt.nix b/pkgs/development/ocaml-modules/ringo/lwt.nix new file mode 100644 index 00000000000..be9f5bbf2b2 --- /dev/null +++ b/pkgs/development/ocaml-modules/ringo/lwt.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, ringo, lwt }: + +buildDunePackage { + pname = "ringo-lwt"; + inherit (ringo) version src doCheck useDune2; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + ringo + lwt + ]; + + meta = ringo.meta // { + description = "Lwt-wrappers for Ringo caches"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ebe7465fae5..d124d388ef9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1179,6 +1179,9 @@ let resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { }; resto-json = callPackage ../development/ocaml-modules/resto/json.nix { }; + ringo = callPackage ../development/ocaml-modules/ringo { }; + ringo-lwt = callPackage ../development/ocaml-modules/ringo/lwt.nix { }; + rope = callPackage ../development/ocaml-modules/rope { }; routes = callPackage ../development/ocaml-modules/routes { }; From 7e2e486bbf84f6ec694bb30085f8faa5ce2a805f Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Sun, 18 Jul 2021 00:28:02 +0200 Subject: [PATCH 06/11] nix-prefetch: 0.4.0 -> 0.4.1 --- .../package-management/nix-prefetch/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index b9ae0b5b4b0..662be6a0978 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,33 +1,25 @@ { lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk -, gnugrep, gnused, jq, nix, fetchpatch }: +, gnugrep, gnused, jq, nix }: let binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n"; + sha256 = "0bwv6x651gyq703pywrhb7lfby6xwnd1iwnrzzjihipn7x3v2hz9"; # the stat call has to be in a subshell or we get the current date extraPostFetch = '' echo $(stat -c %Y $out) > $out/.timestamp ''; }; - patches = [ - # Fix input_type regex for macOS systems: https://github.com/msteen/nix-prefetch/pull/24 - (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/08282891bdb108e886eaf39be2030ba1feda1cb1.patch"; - sha256 = "1v6ask54ind6f3784pbncv0dfg6draaaicg0q46jfvp0lafms70x"; - }) - ]; - postPatch = '' lib=$out/lib/${pname} @@ -78,5 +70,6 @@ in stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ msteen ]; inherit (src.meta) homepage; + platforms = platforms.all; }; } From 55d50f19bffde046cd74acb7d6d4bf3a9349edc3 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Mon, 19 Jul 2021 12:01:44 +0200 Subject: [PATCH 07/11] ocamlPackages.hacl-star: init at 0.3.2 (#130277) ocamlPackages.hacl-star-raw: init at 0.3.2 --- .../ocaml-modules/hacl-star/default.nix | 18 +++++++ .../ocaml-modules/hacl-star/raw.nix | 51 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 3 ++ 3 files changed, 72 insertions(+) create mode 100644 pkgs/development/ocaml-modules/hacl-star/default.nix create mode 100644 pkgs/development/ocaml-modules/hacl-star/raw.nix diff --git a/pkgs/development/ocaml-modules/hacl-star/default.nix b/pkgs/development/ocaml-modules/hacl-star/default.nix new file mode 100644 index 00000000000..8a29439c7a5 --- /dev/null +++ b/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, hacl-star-raw, zarith, cppo }: + +buildDunePackage { + pname = "hacl-star"; + + inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion; + + useDune2 = true; + + propagatedBuildInputs = [ + hacl-star-raw + zarith + ]; + + buildInputs = [ + cppo + ]; +} diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix new file mode 100644 index 00000000000..cd1217b9710 --- /dev/null +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -0,0 +1,51 @@ +{ lib, which, stdenv, fetchzip, ocaml, findlib, hacl-star, ctypes, cppo }: + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-hacl-star-raw"; + version = "0.3.2"; + + src = fetchzip { + url = "https://github.com/project-everest/hacl-star/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz"; + sha256 = "1wp27vf0g43ggs7cv85hpa62jjvzkwzzg5rfznbwac6j6yr17zc7"; + stripRoot = false; + }; + + sourceRoot = "./source/raw"; + + minimalOCamlVersion = "4.05"; + + postPatch = '' + patchShebangs ./ + ''; + + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; + + installTargets = "install-hacl-star-raw"; + + dontAddPrefix = true; + + buildInputs = [ + which + ocaml + findlib + ]; + + propagatedBuildInputs = [ + ctypes + ]; + + checkInputs = [ + cppo + ]; + + doCheck = true; + + meta = { + description = "Auto-generated low-level OCaml bindings for EverCrypt/HACL*"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ulrikstrid ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d124d388ef9..28f8436ea99 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -417,6 +417,9 @@ let hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; + hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; + hacl-star-raw = callPackage ../development/ocaml-modules/hacl-star/raw.nix { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; hidapi = callPackage ../development/ocaml-modules/hidapi { }; From 4ab88273a7b370b8c7eda11681474c4d5c90ed67 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 19 Jul 2021 17:33:42 +0700 Subject: [PATCH 08/11] trealla: 1.8.74 -> 1.9.37 --- pkgs/development/interpreters/trealla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 4321130044c..f72c8b69eb1 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.8.74"; + version = "1.9.37"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-pg9SfEFUTuyAnhP+Q1vR/QImZuLuRb8NpaOiCEcTFj8="; + sha256 = "sha256-0cj4FGaYKIKCgWwRyLUw1DcvNnioQPOtqZhSvWSaojU="; }; postPatch = '' From ca0a54d8e18170ba977e5b8a4ac2ce6c7056089c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 09:37:33 +0000 Subject: [PATCH 09/11] gnome.gnome-initial-setup: 40.2 -> 40.3 --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 0a7b60b7bca..f507ef0e4bb 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "O9cUg/YMDY9yQ5E7kmJe8Vx3iS/uP5MifqXw+XsMWqs="; + sha256 = "5QP9HUiFL112qr9iLR7ymWs4TYjaMf0WoQ1RPwmpDdc="; }; patches = [ From 3b11fad3b70aee63f00d921566c750aefae3afb2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 18:58:16 +0200 Subject: [PATCH 10/11] foot: 1.8.1 -> 1.8.2 --- pkgs/applications/terminal-emulators/foot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 46d3c6c97c7..f069338ae8a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.8.1"; + version = "1.8.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; + sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; }; depsBuildBuild = [ From 0f1b1f4803436c928f4f775c2388cadac88e6c8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 07:21:09 +0000 Subject: [PATCH 11/11] gnome.gnome-shell-extensions: 40.2 -> 40.3 --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 9ccaf8bd637..8013e101913 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "qFGN1Mg6eE+o05pe1gC/gdY3oY7r5ZDjticYPgv5FPg="; + sha256 = "nfh/qVNSAf68o9UI/b97rQFxz3ony2ZN1OPB+WxO0Es="; }; patches = [