Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-07-19 12:01:44 +00:00 committed by GitHub
commit 4f8f447c0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 148 additions and 27 deletions

View file

@ -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 ];
};

View file

@ -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 = [

View file

@ -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 = ''

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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 = ''

View file

@ -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
];
}

View file

@ -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;
};
}

View file

@ -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 ];
};
}

View file

@ -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";
};
}

View file

@ -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 ];

View file

@ -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" ];

View file

@ -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;
};
}

View file

@ -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 { };
@ -1179,6 +1182,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 { };