From c60bd180065e37891b952c7cbdbe93ed293d6165 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Wed, 17 Mar 2021 22:01:59 +0000 Subject: [PATCH 01/14] agda nixos test: fix hello world program --- nixos/tests/agda.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix index 3773907cff5..f282788519c 100644 --- a/nixos/tests/agda.nix +++ b/nixos/tests/agda.nix @@ -3,8 +3,9 @@ import ./make-test-python.nix ({ pkgs, ... }: let hello-world = pkgs.writeText "hello-world" '' open import IO + open import Level - main = run(putStrLn "Hello World!") + main = run {0ℓ} (putStrLn "Hello World!") ''; in { From 0e162b97d6a35cd96f10ecda5a1c295e6aeed612 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Tue, 30 Mar 2021 13:54:02 +0100 Subject: [PATCH 02/14] agda nixos test: add to passthru for agda + stdlib --- pkgs/build-support/agda/default.nix | 7 +++++-- .../libraries/agda/standard-library/default.nix | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index d610a8f9a61..984d61f1f75 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages }: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }: with lib.strings; @@ -18,7 +18,10 @@ let in runCommandNoCC "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ makeWrapper ]; - passthru.unwrapped = Agda; + passthru = { + unwrapped = Agda; + tests = { inherit (nixosTests) agda; }; + }; } '' mkdir -p $out/bin makeWrapper ${Agda}/bin/agda $out/bin/agda \ diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 4bd5de8bd48..fd20a0d9a97 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages, nixosTests }: mkDerivation rec { pname = "standard-library"; @@ -19,6 +19,7 @@ mkDerivation rec { rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda ''; + passthru.tests = { inherit (nixosTests) agda; }; meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; From d5c378d0ff2cc9325b0eff4b0a9232f2e8477d34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Mar 2021 17:41:35 +0000 Subject: [PATCH 03/14] rtsp-simple-server: 0.15.1 -> 0.15.2 --- pkgs/servers/rtsp-simple-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index ada7ea1c220..df9cab557b4 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uahgIphp2/iE11v33sPNrm0evz6dQvzjEQ9uMVEuTTI="; + sha256 = "sha256-XuyE0gubkE08Qei30/q8fLdX8V7zBsbFsdaiqbXgeI4="; }; - vendorSha256 = "sha256-nAeP9ZmYu5VPKR628aJVNS8t41V/AYkgwOcO/d0nQv4="; + vendorSha256 = "sha256-4R2gA9QwfyBNDasRuDawDFEmXu31yGuZUQZS6cZL3B0="; # Tests need docker doCheck = false; From 80a084dcee8a347a3b7de6f49df31c52d557ab59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 1 Apr 2021 07:05:12 +0000 Subject: [PATCH 04/14] documize-community: 3.8.2 -> 3.9.0 --- pkgs/servers/documize-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 5c6b6b10708..036ea5fbee7 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "documize-community"; - version = "3.8.2"; + version = "3.9.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "sha256-6DOvInfD32/mEILGXdXUeflmHoyn0eiYyQN/aI23FJ0="; + sha256 = "sha256-Kv4BsFB08rkGRkePFIkjjuhK1TnLPS4m+PUlgKG5cTQ="; }; vendorSha256 = null; From 38a672aa79c85ec0240685449ed4c7844087b874 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 1 Apr 2021 08:42:49 +0000 Subject: [PATCH 05/14] git-quick-stats: 2.1.6 -> 2.1.7 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 3fda533c527..5aaae4a8149 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-l3Aftu1RkcDgzdzrKIAlziDgbjYfj5xLIbysS0a5JZw="; + sha256 = "sha256-DFssuvafgAZY26Ycv/SV5EF1B5rax3R41PCLZL09A0s="; }; nativeBuildInputs = [ makeWrapper ]; From 119b2d63f175c4bce718febe1b51ea20cf8aaa18 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Thu, 1 Apr 2021 10:16:32 +0200 Subject: [PATCH 06/14] python3Packages.wasmer: build on Darwin Signed-off-by: Sirio Balmelli --- pkgs/development/python-modules/wasmer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 28c9b8b5c16..373e7a0a220 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { description = "Python extension to run WebAssembly binaries"; homepage = "https://github.com/wasmerio/wasmer-python"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; }; } From eaba4b04af54414f16c206f4dee72887c99d0a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 1 Apr 2021 11:15:35 +0200 Subject: [PATCH 07/14] bundix: 2.5.0 -> 2.5.1 --- pkgs/development/ruby-modules/bundix/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index f3ac42b9406..58af7b7c8d6 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,29 +1,20 @@ { buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, - nix-prefetch-git, fetchpatch }: + nix-prefetch-git }: buildRubyGem rec { inherit (bundler) ruby; name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "bundix"; rev = version; - sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8"; + sha256 = "sha256-iMp6Yj7TSWDqge3Lw855/igOWdTIuFH1LGeIN/cpq7U="; }; - patches = [ - # write trailing newline to gemset.nix - # https://github.com/nix-community/bundix/pull/78 - (fetchpatch { - url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch"; - sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb"; - }) - ]; - buildInputs = [ ruby bundler ]; nativeBuildInputs = [ makeWrapper ]; From ef0e64ec60a969bcea7d4c61c347a41e1a3f53e6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Apr 2021 08:49:42 +0200 Subject: [PATCH 08/14] ocamlPackages.sosa: remove spurious dependency on nonstd --- pkgs/development/ocaml-modules/sosa/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index 4278989341f..3687f2be997 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -1,7 +1,11 @@ { lib, fetchFromGitHub, stdenv -, findlib, nonstd, ocaml, ocamlbuild +, findlib, ocaml, ocamlbuild }: +if !lib.versionAtLeast ocaml.version "4.02" +then throw "sosa is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-sosa-${version}"; version = "0.3.0"; @@ -13,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; - buildInputs = [ nonstd ocaml ocamlbuild findlib ]; + buildInputs = [ ocaml ocamlbuild findlib ]; buildPhase = "make build"; From 9ac5c7df176fbe091ba5e508240b37d3e4ba6f37 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Apr 2021 22:24:55 +0200 Subject: [PATCH 09/14] ocamlPackages.gettext-camomile: init at 0.4.2 --- .../ocaml-modules/ocaml-gettext/camomile.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix new file mode 100644 index 00000000000..012f3b61ff3 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -0,0 +1,16 @@ +{ buildDunePackage, ocaml_gettext, camomile, ounit, fileutils }: + +buildDunePackage { + pname = "gettext-camomile"; + inherit (ocaml_gettext) src version useDune2; + + propagatedBuildInputs = [ camomile ocaml_gettext ]; + + doCheck = true; + checkInputs = [ ounit fileutils ]; + + meta = ocaml_gettext.meta // { + description = "Internationalization library using camomile (i18n)"; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 826f7cf8e45..6d34d825a20 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -796,6 +796,8 @@ let ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; + gettext-camomile = callPackage ../development/ocaml-modules/ocaml-gettext/camomile.nix { }; + gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; From cf8da7eabda0336a3be0329eb95bbe1feb24df52 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 2 Apr 2021 10:02:48 +0200 Subject: [PATCH 10/14] doc/stdenv/cross: fix typo --- doc/stdenv/cross-compilation.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index ee090c82114..96641426628 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -190,7 +190,7 @@ If one imagines the saturating self references at the end being replaced with in ``` (native..., native, native, native, foreign, foreign, foreign...) ``` -On can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host". +One can then imagine any sequence of platforms such that there are bootstrap stages with their 3 platforms determined by "sliding a window" that is the 3 tuple through the sequence. This was the original model for bootstrapping. Without a target platform (assume a better world where all compilers are multi-target and all standard libraries are built in their own derivation), this is sufficient. Conversely if one wishes to cross compile "faster", with a "Canadian Cross" bootstrapping stage where `build != host != target`, more bootstrapping stages are needed since no sliding window provides the pesky `pkgsBuildTarget` package set since it skips the Canadian cross stage's "host". ::: note From 619953ead4793e7945c5477c12192750783e1deb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 2 Apr 2021 11:56:01 +0200 Subject: [PATCH 11/14] fscrypt-experimental: 0.2.9 -> 0.3.0 (#118243) --- pkgs/os-specific/linux/fscrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index b60a10c73ed..7528fae6bdd 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "020hhdarbn3bwlc2j2g89868v8nfx8562z1a778ihpvvsa4ykr31"; + sha256 = "1zdadi9f7wj6kgmmk9zlkpdm1lb3gfiscg9gkqqdql2si7y6g2nq"; }; postPatch = '' From 328ce4d864aee2120057f0ca601a18a23e89594f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 2 Apr 2021 12:02:26 +0200 Subject: [PATCH 12/14] libplacebo: 3.104.0 -> 3.120.0 (#118271) --- pkgs/development/libraries/libplacebo/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 94301b34fbc..98d9c3477e7 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -17,22 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.104.0"; - - patches = [ - (fetchpatch { - # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131 - url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch"; - sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc"; - }) - ]; + version = "3.120.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb"; + sha256 = "1vjcp703h0a8z70bqkx1fawhpyv3zl11c7rczyky8v4cmcihscgg"; }; nativeBuildInputs = [ From 53fd303d0eef1d8710548c7923588f8a52263c06 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 1 Apr 2021 20:11:15 +0200 Subject: [PATCH 13/14] llvmPackages_12: Add recurseIntoAttrs See #115288 (835a8f1cbc5). This was missing for LLVM 12 because both changes where made in parallel. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fef7f5b1d75..c740d0e156b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10894,13 +10894,13 @@ in stdenv = gcc7Stdenv; })); - llvmPackages_12 = callPackage ../development/compilers/llvm/12 ({ + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - }); + })); llvmPackages_latest = llvmPackages_11; From 166520812e9127532a64ed1707f2a978d2edcd9b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 27 Mar 2021 15:52:40 +0100 Subject: [PATCH 14/14] chromium{Beta,Dev}: Use LLVM 12 LLVM 12 is required but the build still fails due to other changes that where introduced in the meantime (and Chromium 90.0.4430.51 introduced another LLVM failure). --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- pkgs/applications/networking/browsers/chromium/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 989368f198c..1fecadc2ec0 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" ]; # Build requires LLVM 12 + broken = elem channel [ "beta" "dev" ]; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c1b5711b02e..1ad7bc8bfa8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire @@ -39,6 +39,8 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") { + llvmPackages = llvmPackages_12; }); browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };