From 97a1a0d0621d27960ffcccbcb3619ab36d9b0a55 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 11 Dec 2022 08:31:12 -0800 Subject: [PATCH 1/8] github-runner: make ldd and ldconfig paths absolute on Linux --- .../continuous-integration/github-runner/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 84c9c9268496..8c129d5ff18a 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , fetchurl , git +, glibc , icu , libkrb5 , lib @@ -259,7 +260,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib' substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \ --replace 'source ./env.sh' $out/bin/env.sh - + '' + lib.optionalString stdenv.isLinux '' + # Make binary paths absolute + substituteInPlace $out/lib/config.sh \ + --replace 'ldd' '${glibc.bin}/bin/ldd' \ + --replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig' + '' + '' # Remove uneeded copy for run-helper template substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' ' substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/' From dcc51ef54ebb7c578f68881922a0a5c9b2bde5c1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 6 Dec 2022 12:06:22 +0100 Subject: [PATCH 2/8] =?UTF-8?q?ocamlPackages.merlin:=204.6=20=E2=86=92=204?= =?UTF-8?q?.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cc77c9b9bdbe8213c54eaed147c3bc895aa0609e) --- pkgs/development/tools/ocaml/merlin/4.x.nix | 22 ++++++++++--------- .../tools/ocaml/merlin/dot-merlin-reader.nix | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index e917a5a76da6..296675664547 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -2,7 +2,7 @@ , substituteAll , fetchurl , ocaml -, dune_2 +, dune_3 , buildDunePackage , yojson , csexp @@ -15,16 +15,17 @@ }: let - merlinVersion = "4.6"; + merlinVersion = "4.7"; hashes = { - "4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c="; - "4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4="; - "4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84="; + "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; + "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; + "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; + "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; }; - ocamlVersionShorthand = lib.concatStrings - (lib.take 2 (lib.splitVersion ocaml.version)); + ocamlVersionShorthand = lib.substring 0 3 + (lib.concatStrings (lib.splitVersion ocaml.version)); version = "${merlinVersion}-${ocamlVersionShorthand}"; in @@ -36,6 +37,7 @@ else buildDunePackage { pname = "merlin"; inherit version; + duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; @@ -46,7 +48,7 @@ buildDunePackage { (substituteAll { src = ./fix-paths.patch; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; - dune = "${dune_2}/bin/dune"; + dune = "${dune_3}/bin/dune"; }) ]; @@ -59,14 +61,14 @@ buildDunePackage { buildInputs = [ dot-merlin-reader yojson - (if lib.versionAtLeast version "4.6-414" + (if lib.versionAtLeast version "4.7-414" then merlin-lib else csexp) menhirSdk menhirLib ]; - doCheck = true; + doCheck = false; checkPhase = '' runHook preCheck patchShebangs tests/merlin-wrapper diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index e3fef3f4cc40..90c0aee0ff3f 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -7,7 +7,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.06"; - buildInputs = if lib.versionAtLeast version "4.6-414" + buildInputs = if lib.versionAtLeast version "4.7-414" then [ merlin-lib ] else [ yojson csexp ]; From 4a5a576f9c8bdb9eda956602638f3e9281ab5c8b Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Mon, 12 Dec 2022 16:03:53 +0100 Subject: [PATCH 3/8] sgx-sdk: pin to openssl_1_1 Currently, the sgx-sdk.runTestsHW attribute fails to build due to linking errors. It looks like OpenSSL versions are mixed up. And indeed sgx-sdk pulls in OpenSSL 3 while ipp-crypto pulls in OpenSSL 1.1. Fix by pinning the OpenSSL version for the SGX SDK to OpenSSL 1.1 as well. (cherry picked from commit 2c8407089b399e0796678d440289eee829298f42) --- pkgs/os-specific/linux/sgx/sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 977139406fe9..5213dc1e4fda 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -16,7 +16,7 @@ , nasm , ocaml , ocamlPackages -, openssl +, openssl_1_1 , perl , python3 , texinfo @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool - openssl + openssl_1_1 ]; BINUTILS_DIR = "${binutils}/bin"; From b90a8320bf7df087bd3dd209fcec05c8276995ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 22 Oct 2022 10:28:41 +0200 Subject: [PATCH 4/8] =?UTF-8?q?ocamlPackages.stdcompat:=2018=20=E2=86=92?= =?UTF-8?q?=2019?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/thierry-martinez/stdcompat/releases/tag/v19 (cherry picked from commit 75ef7c1f8ea7cf5a4efc59dd279f8f25edf289f0) --- .../ocaml-modules/stdcompat/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index 3630be368e55..b8dcc81bfe7e 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -1,29 +1,25 @@ -{ stdenv, lib, fetchurl -, ocaml, findlib +{ buildDunePackage +, lib +, fetchurl }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-stdcompat"; - version = "18"; +buildDunePackage rec { + pname = "stdcompat"; + version = "19"; src = fetchurl { url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; + sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; }; - nativeBuildInputs = [ ocaml findlib ]; - strictDeps = true; - # build fails otherwise - enableParallelBuilding = false; - - configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ]; + # Otherwise ./configure script will run and create files conflicting with dune. + dontConfigure = true; meta = { homepage = "https://github.com/thierry-martinez/stdcompat"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } From 8d6da33644bbd082b8a13f73ea2c7338190d7429 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 22 Oct 2022 10:26:42 +0200 Subject: [PATCH 5/8] =?UTF-8?q?ocamlPackages.pyml:=2020220615=20=E2=86=92?= =?UTF-8?q?=2020220905?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/thierry-martinez/pyml/releases/tag/20220905 Aldo switch to dune, which has been available since 2021-09-24. And remove unneeded dependencies: - ncurses was needed for Python in the past - ocaml and findlib are implied by dune (cherry picked from commit a028e1dc9634ce1385229cada97af27d524ff3b3) --- .../ocaml-modules/pyml/default.nix | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 97fcf1d5caa4..9eba3ab3185b 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -1,23 +1,37 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, utop, python3, stdcompat, ncurses }: +{ buildDunePackage +, lib +, fetchFromGitHub +, fetchpatch +, utop +, python3 +, stdcompat +}: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "pyml"; - version = "20220615"; + version = "20220905"; src = fetchFromGitHub { - owner = "thierry-martinez"; - repo = pname; - rev = version; - sha256 = "sha256-my/xn9vrYTcHyjXGBNamgqpBz2/6bTyQHuE9ViVGLjw="; + owner = "thierry-martinez"; + repo = "pyml"; + rev = version; + sha256 = "PL4tFIKQLRutSn9Sf84/ImJv0DqkstNnJaNBqWDTKDQ="; }; - nativeBuildInputs = [ - ocaml - findlib + patches = [ + # Fixes test crash. + # https://github.com/thierry-martinez/pyml/issues/85 + (fetchpatch { + url = "https://github.com/thierry-martinez/pyml/commit/a0bc5aca8632bea273f869d622cad2f55e754a7c.patch"; + sha256 = "bOqAokm5DE5rlvkBMQZtwMppRmoK9cvjJeGeP6BusnE="; + excludes = [ + "CHANGES.md" + ]; + }) ]; + buildInputs = [ utop - ncurses ]; propagatedBuildInputs = [ @@ -25,24 +39,17 @@ stdenv.mkDerivation rec { stdcompat ]; + checkInputs = [ + python3.pkgs.numpy + ]; + strictDeps = true; - buildPhase = '' - make all pymltop pymlutop PREFIX=$out - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $OCAMLFIND_DESTDIR/stublibs - make install PREFIX=$out - runHook postInstall - ''; - doCheck = true; meta = { description = "OCaml bindings for Python"; + homepage = "https://github.com/thierry-martinez/pyml"; license = lib.licenses.bsd2; }; } From 56e24a2ddaed6a6bc8ecaaa7374feda5fe1c5e70 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 10 Dec 2022 11:26:39 +0100 Subject: [PATCH 6/8] =?UTF-8?q?gajim:=201.5.3=20=E2=86=92=201.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c492cf49d1766efbe4eb8a166cf824a9e794f0bb) --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b23b64790710..f3bc55f6d15c 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA="; + sha256 = "sha256-uIzOKiCbHiSVRlXcpE0B/+Ats3cfw4u7eA+KyPriwhk="; }; buildInputs = [ From 84c265d668aa4972a0c40c1bc0ffcfe4a2a90fac Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Dec 2022 04:35:57 +1000 Subject: [PATCH 7/8] nixVersions.nix_2_12: init at 2.12.0 https://github.com/NixOS/nix/releases/tag/2.12.0 (cherry picked from commit 343503b44c60a5809b51348b688585a64df6ae1b) --- pkgs/tools/package-management/nix/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c2d016a1bc33..d1992725e796 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -119,6 +119,14 @@ in lib.makeExtensible (self: { ]; }; + nix_2_12 = common { + version = "2.12.0"; + sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI="; + patches = [ + ./patches/flaky-tests.patch + ]; + }; + stable = self.nix_2_11; unstable = self.stable; From 34cf67883ed72da691b8c7ac33c3c41e2daaed17 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 12 Dec 2022 11:14:03 +0100 Subject: [PATCH 8/8] element-{web,desktop}: 1.11.15 -> 1.11.16 ChangeLog web: https://github.com/vector-im/element-web/releases/tag/v1.11.16 ChangeLog desktop: https://github.com/vector-im/element-desktop/releases/tag/v1.11.16 (cherry picked from commit 8e832b78fdb99c22e254a001028f84a5cb1a81ee) --- .../instant-messengers/element/element-desktop.nix | 5 +++++ .../networking/instant-messengers/element/pin.json | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index e192e33c4969..55d8227f5759 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Only affects unused scripts in $out/share/element/electron/scripts. Also + # breaks because there are some `node`-scripts with a `npx`-shebang and + # this shouldn't be in the closure just for unused scripts. + dontPatchShebangs = true; + buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index d3d4eb06ba1d..c92532b74b82 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.15", - "desktopSrcHash": "l+IjI3uvnOjaJA6IszDSuOO08SMqbUf8rI/u12g5Rxo=", - "desktopYarnHash": "024vd7xiwialfrag325558qjrqlfxzy9xq7jb15ysawand1k2xyv", - "webSrcHash": "YLQ4z333RMx9qyVRTBbDCWLTy5QqLlHmYpmOa8vlCbg=", - "webYarnHash": "1ll2sj9q3h2b76383bqv8a8ckqlk8b131zwx223fnz8mfqsc9br0" + "version": "1.11.16", + "desktopSrcHash": "EeED62HRpaWN91yxcDvwwNUWmDRU38lyT5ba1S4go6Q=", + "desktopYarnHash": "1f0bghcbzab2dkvxmvhhc0dzyk3js09v2sh93gsjsq9mkhld1k0w", + "webSrcHash": "T6UcGNm4i+Nc4Yk/mVFc4L9jxWQtOpjps1ZtEhilHW0=", + "webYarnHash": "1jyzym34lzadniqrysbm1m5agw03hzw6ymmdxpbay38afrhrciyk" }