From ba4c0bf16ff2aa4d1d08c3a455dbefd58d6ae7ab Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Wed, 24 Feb 2021 22:28:58 -0800 Subject: [PATCH 1/8] aws-c-common: fix build on clang 11 --- pkgs/development/libraries/aws-c-common/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 937eef2d0d99..36315aa86780 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; }; + patches = [ + # Remove once https://github.com/awslabs/aws-c-common/pull/764 is merged + (fetchpatch { + url = "https://github.com/awslabs/aws-c-common/commit/4f85fb3e398d4e4d320d3559235267b26cbc9531.patch"; + sha256 = "1jg3mz507w4kwgmg57kvz419gvw47pd9rkjr6jhsmvardmyyskap"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ From 7f7d5bcd902f88fdb6959a33e3e4ae15fcde95c4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 25 Feb 2021 23:01:09 +0100 Subject: [PATCH 2/8] lib/licenses: fix regression removing shortName for some licenses Usually we ensure using the mapAttrs call wrapping the license set that every license has an associated shortName. A change related to legacy aliases most likely introduced the removal of the shortName attribute for all the legacy license names by splitting the set into two sets connected by a record update operator -- leading to mapAttrs only affecting the first set. Since it used to be a valid assumption to have that every license had a shortName attribute, we reintroduce this attribute for the legacy aliases as well. --- lib/licenses.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index ee136c7337c1..993783db3ed6 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -7,7 +7,7 @@ let in -lib.mapAttrs (n: v: v // { shortName = n; }) { +lib.mapAttrs (n: v: v // { shortName = n; }) ({ /* License identifiers from spdx.org where possible. * If you cannot find your license here, then look for a similar license or * add it to this list. The URL mentioned above is a good source for inspiration. @@ -877,4 +877,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Lesser General Public License v3.0"; deprecated = true; }; -} +}) From 4fb330d3346f1d6229ddce7fc70da1b7ab202214 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 26 Feb 2021 14:55:45 +0900 Subject: [PATCH 3/8] purescript: 0.13.8 -> 0.14.0 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 741d0ec7d1c3..6d7f05ebdae7 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.8"; + version = "0.14.0"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391"; + sha256 = "0dfnn5ar7zgvgvxcvw5f6vwpkgkwa017y07s7mvdv44zf4hzsj3s"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy"; + sha256 = "1l3i7mxlzb2dkq6ff37rvnaarikxzxj0fg9i2kk26s8pz7vpqgjh"; }; From 84ed14ac60803aba29e38ac2b1307b9d406bc6f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Feb 2021 10:24:30 +0100 Subject: [PATCH 4/8] vorta: 0.7.3 -> 0.7.4 ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.4 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 690a25d6b4d4..1809777ed542 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U="; + sha256 = "sha256-+WQ3p2ddyQpJqCLc1HqFZlKK85VkX2Iv2eXEcVkBs6g="; }; postPatch = '' From a439e0ef6eb2ab395048b3cf68a46224874245ef Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 26 Feb 2021 12:10:21 +0200 Subject: [PATCH 5/8] gcc10: Pass langJit to preConfigure This should fix libgccjit on darwin. --- pkgs/development/compilers/gcc/10/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 07b0921ec184..1502b09cca6a 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo; + inherit version hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; From 02b4f95f788e57c71b2c2af0f24df9fe50b627f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 26 Feb 2021 07:13:27 +0100 Subject: [PATCH 6/8] =?UTF-8?q?ocamlPackages.stdlib-shims:=200.1.0=20?= =?UTF-8?q?=E2=86=92=200.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/stdlib-shims/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdlib-shims/default.nix b/pkgs/development/ocaml-modules/stdlib-shims/default.nix index d76ec29e63aa..470a2a5bd030 100644 --- a/pkgs/development/ocaml-modules/stdlib-shims/default.nix +++ b/pkgs/development/ocaml-modules/stdlib-shims/default.nix @@ -2,11 +2,12 @@ buildDunePackage rec { pname = "stdlib-shims"; - version = "0.1.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk"; + sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; minimumOCamlVersion = "4.02"; doCheck = true; meta = { From 8066dd61a386f789be0683bd74671a2ecb1d8f0b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 26 Feb 2021 12:28:47 +0100 Subject: [PATCH 7/8] libglvnd: Add myself as maintainer The package lacked a maintainer and since I already maintain Mesa it makes sense to look after libglvnd as well. --- pkgs/development/libraries/libglvnd/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 88ba7dacc22f..70deed5343de 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -47,8 +47,16 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The GL Vendor-Neutral Dispatch library"; + longDescription = '' + libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API + calls between multiple vendors. It allows multiple drivers from different + vendors to coexist on the same filesystem, and determines which vendor to + dispatch each API call to at runtime. + Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES. + ''; homepage = "https://github.com/NVIDIA/libglvnd"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ primeos ]; }; } From c6f1dc2320db5b28136ca4a78ffce5cf0b7cdba5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 26 Feb 2021 12:40:17 +0100 Subject: [PATCH 8/8] libglvnd: Switch to the new official repository "The official repository for libglvnd is hosted on FreeDesktop.org's GitLab: https://gitlab.freedesktop.org/glvnd/libglvnd" [0] [0]: https://github.com/NVIDIA/libglvnd/tree/master#introduction --- pkgs/development/libraries/libglvnd/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 70deed5343de..1ef63c2406d0 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,11 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitLab +, autoreconfHook, pkg-config, python3, addOpenGLRunpath +, libX11, libXext, xorgproto +}: stdenv.mkDerivation rec { pname = "libglvnd"; version = "1.3.2"; - src = fetchFromGitHub { - owner = "NVIDIA"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; @@ -54,7 +58,7 @@ stdenv.mkDerivation rec { dispatch each API call to at runtime. Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES. ''; - homepage = "https://github.com/NVIDIA/libglvnd"; + inherit (src.meta) homepage; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ primeos ];