From 47a072b984946d475200d56c93f76deb3bc1d5bb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 7 Aug 2022 20:13:20 -0300 Subject: [PATCH 1/5] bmake: new recursive style attributes --- pkgs/development/tools/build-managers/bmake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 5afbf979700f..ca06a3b5a0d9 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -8,12 +8,12 @@ , pkgsMusl # for passthru.tests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bmake"; version = "20220208"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; + url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to="; }; @@ -109,5 +109,5 @@ stdenv.mkDerivation rec { }; passthru.tests.bmakeMusl = pkgsMusl.bmake; -} +}) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) From ce83a76107275404f0825e1d5f6305cc1fdd326d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 7 Aug 2022 20:30:40 -0300 Subject: [PATCH 2/5] bmake: 20220208 -> 20220726 --- .../tools/build-managers/bmake/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index ca06a3b5a0d9..8110d91388ee 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20220208"; + version = "20220726"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to="; + hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; }; # Make tests work with musl @@ -60,10 +60,15 @@ stdenv.mkDerivation (finalAttrs: { ]; # Disabled tests: + # opt-chdir: ofborg complains about it somehow + # opt-keep-going-indirect: not yet known # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, # implicit paths - # opt-chdir: ofborg complains about it somehow - BROKEN_TESTS = "varmod-localtime opt-chdir"; + BROKEN_TESTS = builtins.concatStringsSep " " [ + "opt-chdir" + "opt-keep-going-indirect" + "varmod-localtime" + ]; buildPhase = '' runHook preBuild From d17f36789ba5b68a03d70d59a769f67d008dbeb2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 7 Aug 2022 20:50:10 -0300 Subject: [PATCH 3/5] bmake: unbreak --- pkgs/development/tools/build-managers/bmake/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 8110d91388ee..e7c38c1b0234 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; platforms = platforms.unix; - broken = with stdenv; isAarch64 && !isDarwin; # ofborg complains }; passthru.tests.bmakeMusl = pkgsMusl.bmake; From 053fb00690945ab06650c4508b98659c6a2343b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 11:02:40 +0000 Subject: [PATCH 4/5] freerdp: 2.7.0 -> 2.8.0 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 99a81fd1a809..c769b7de6c86 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0="; + sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; }; postPatch = '' From f51f722597598eec959df03ea0ffe82444d6609f Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 8 Aug 2022 00:41:12 +0200 Subject: [PATCH 5/5] cinny: 2.0.4 -> 2.1.1 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 3f3d71a33718..f9a2f42c5517 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.4"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg"; + sha256 = "0qzg790yd23ja3a782ga085vgd5vvh7rgmdy8kpvc3wf8plvw5nm"; }; installPhase = ''