From ea1a4b35e5adbb6d6fd11257ca36e67e1a401876 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 30 Aug 2021 21:38:02 +0200 Subject: [PATCH 01/23] maintainers: add alexnortung --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 43968e4d80d..fd78aff597a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -450,6 +450,12 @@ githubId = 2335822; name = "Alexandre Esteves"; }; + alexnortung = { + name = "alexnortung"; + email = "alex_nortung@live.dk"; + github = "alexnortung"; + githubId = 1552267; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; From 5da0c38517f6c85f2831a235ff6ef4d96ff9e1ec Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 30 Aug 2021 21:43:53 +0200 Subject: [PATCH 02/23] session-desktop-appimage: init at 1.6.11 --- .../session-desktop-appimage/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix new file mode 100644 index 00000000000..fda11a34f89 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchurl +, appimageTools +}: + +let + version = "1.6.11"; +in +appimageTools.wrapType2 { + name = "session-desktop-appimage-${version}"; + src = fetchurl { + url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; + sha256 = "08vnkxj2w2k7lhygs5qhbyikpvw5nmby3qhxigbbkj5qj1wvs48b"; + }; + + meta = with lib; { + description = "Onion routing based messenger"; + homepage = "https://getsession.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ alexnortung ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6c75d3ee6d..7cad3c1bd9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22996,6 +22996,8 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; + session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + shaderc = callPackage ../development/compilers/shaderc { }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; From f45e8d560e391ac1a846cf89388ed3d6279d49af Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 2 Sep 2021 16:20:50 +0300 Subject: [PATCH 03/23] nixos/tmp: add tmpOnTmpfsSize --- nixos/modules/system/boot/tmp.nix | 17 +++++++++++++++-- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 5bb299adb15..6edafd6695b 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -2,6 +2,9 @@ with lib; +let + cfg = config.boot; +in { ###### interface @@ -24,18 +27,28 @@ with lib; ''; }; + boot.tmpOnTmpfsSize = mkOption { + type = types.oneOf [ types.str types.types.ints.positive ]; + default = "50%"; + description = '' + Size of tmpfs in percentage. + Percentage is defined by systemd. + ''; + }; + }; ###### implementation config = { - systemd.mounts = mkIf config.boot.tmpOnTmpfs [ + # When changing remember to update /tmp mount in virtualisation/qemu-vm.nix + systemd.mounts = mkIf cfg.tmpOnTmpfs [ { what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ]; + mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; } ]; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index d9935bcafb7..b51c29f83d6 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -686,7 +686,7 @@ in fsType = "tmpfs"; neededForBoot = true; # Sync with systemd's tmp.mount; - options = [ "mode=1777" "strictatime" "nosuid" "nodev" ]; + options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ]; }; "/tmp/xchg" = { device = "xchg"; From fd48ed5022b6c367adbffcfc7aa89a694f5508e6 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Wed, 8 Sep 2021 20:50:37 -0400 Subject: [PATCH 04/23] multimc: unstable-2021-06-21 -> unstable-2021-09-08 --- .../multimc/0001-pick-latest-java-first.patch | 16 ++++++++-------- pkgs/games/multimc/default.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/games/multimc/0001-pick-latest-java-first.patch b/pkgs/games/multimc/0001-pick-latest-java-first.patch index 31ab0497f8d..a65dcbfd037 100644 --- a/pkgs/games/multimc/0001-pick-latest-java-first.patch +++ b/pkgs/games/multimc/0001-pick-latest-java-first.patch @@ -4,14 +4,14 @@ Date: Tue, 22 Jun 2021 21:50:11 +0300 Subject: [PATCH] pick latest java first --- - api/logic/java/JavaInstallList.cpp | 4 ++-- - api/logic/java/JavaUtils.cpp | 2 +- + launcher/java/JavaInstallList.cpp | 4 ++-- + launcher/java/JavaUtils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp +diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index 0bded03c..40898e20 100644 ---- a/api/logic/java/JavaInstallList.cpp -+++ b/api/logic/java/JavaInstallList.cpp +--- a/launcher/java/JavaInstallList.cpp ++++ b/launcher/java/JavaInstallList.cpp @@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList versions) bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) @@ -23,10 +23,10 @@ index 0bded03c..40898e20 100644 return (*rleft) > (*rright); } -diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp +diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 5f004a10..6d633631 100644 ---- a/api/logic/java/JavaUtils.cpp -+++ b/api/logic/java/JavaUtils.cpp +--- a/launcher/java/JavaUtils.cpp ++++ b/launcher/java/JavaUtils.cpp @@ -350,7 +350,6 @@ QList JavaUtils::FindJavaPaths() qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 8e72b958856..76326b48bb8 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,12 +4,12 @@ let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "unstable-2021-06-21"; + version = "unstable-2021-09-08"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "8179a89103833805d5374399d80a4305be1b8355"; - sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8="; + rev = "e2355eb276bf355ca4acf526a0f3cc390aa88f8b"; + sha256 = "3G9QPoAbC+uVfUYR0Kq6hnxl9c2mvCzIEYGjwfarQJ8="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; @@ -19,7 +19,7 @@ in mkDerivation rec { postPatch = '' # hardcode jdk paths - substituteInPlace api/logic/java/JavaUtils.cpp \ + substituteInPlace launcher/java/JavaUtils.cpp \ --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' ''; @@ -27,8 +27,8 @@ in mkDerivation rec { cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; postInstall = '' - install -Dm644 ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg - install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop + install -Dm644 ../launcher/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg + install -Dm755 ../launcher/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/multimc \ From a6294ed2932216d1fd4dcde4f7bd818705d388e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 09:22:17 +0000 Subject: [PATCH 05/23] python38Packages.pynanoleaf: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/pynanoleaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix index 9bdf4885dd4..9fab8f7b31c 100644 --- a/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynanoleaf"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BiLJgsey7kIIeN5+CKKnrTB2bSKMNEbeMLwGi2LRLcg="; + sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7"; }; disabled = !isPy3k; From c2743d7e787b7e0e19edd219f28136a33b25d87a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 00:56:41 +0000 Subject: [PATCH 06/23] tendermint: 0.34.12 -> 0.34.13 --- pkgs/tools/networking/tendermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 5afd8aec348..1f363ae3f9f 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.12"; + version = "0.34.13"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY="; + sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY="; }; - vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI="; + vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM="; subPackages = [ "cmd/tendermint" ]; From 90b0fda38eb250505aa027e8ae4ebbf746eb96e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 18:23:44 +0000 Subject: [PATCH 07/23] opencolorio: 2.0.1 -> 2.0.2 --- pkgs/development/libraries/opencolorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 522c8cfa4a1..a660008841a 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; + sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA="; }; nativeBuildInputs = [ cmake ]; From 8f6aa1f1daaf171d2ca068804228a96fff2e69c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 21:10:01 +0000 Subject: [PATCH 08/23] pt2-clone: 1.32 -> 1.33 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 2724f889337..c713c2ca52e 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.32"; + version = "1.33"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-U1q4xCOzV7n31WgCTGlEXvZaUT/TP797cOAHkecQaLo="; + sha256 = "sha256-XPQRFbIgSU3oCTbLe4gYkMNBvcLZdJvU/YQHtUvgt9k="; }; nativeBuildInputs = [ cmake ]; From e2cce9e0ca53578229099d08baf0b52794bbad4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 23:32:37 +0000 Subject: [PATCH 09/23] sniffglue: 0.13.0 -> 0.13.1 --- pkgs/tools/networking/sniffglue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 5800df6950b..502ab323e8e 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UZLVkTkuJPzju9fl4N6Lgdn3gNBpKruNFxDcoTwdtYc="; + sha256 = "sha256-P8ubw523sw1O6Gpruy1Wa/Y0I3qJgvMdT53wBBoEGhE="; }; - cargoSha256 = "sha256-bHwp0U83uvhFOi9oaeVwNrqHkxK2IQs/bvxqUl/rpjI="; + cargoSha256 = "sha256-+Wh+/C9LvYppCghv11e8NKNhiMy0SV4S3nEWA6b1hQk="; nativeBuildInputs = [ pkg-config ]; From e9afd04202c745a0a251a530634e122d92550c2a Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 15 Sep 2021 05:38:03 +0300 Subject: [PATCH 10/23] mit-scheme: set MITSCHEME_LIBRARY_PATH properly by changing its path and wrapping the correct binary all the other binaries in bin/ are symlinks to bin/mit-scheme${arch}-${version} therefore its easier to just wrap that one instead of all the others --- pkgs/development/compilers/mit-scheme/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index e7098abb60a..c67f8d2f72f 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -62,10 +62,10 @@ stdenv.mkDerivation { runHook postInstall ''; - postFixup = - '' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \ - $out/lib/mit-scheme${arch} - ''; + postFixup = '' + wrapProgram $out/bin/mit-scheme${arch}-${version} --set MITSCHEME_LIBRARY_PATH \ + $out/lib/mit-scheme${arch}-${version} + ''; nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ]; From 51e8290b19b376d6432cf7e6c6039d8da0db23d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 05:17:16 +0000 Subject: [PATCH 11/23] xmrig-mo: 6.14.1-mo2 -> 6.15.0-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index fa9f1644b50..431aac070f2 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.14.1-mo2"; + version = "6.15.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No="; + sha256 = "sha256-2JT315JbjiU8gAwROZL820MYC/v3MPtJVsN+vsf4KDQ="; }; meta = with lib; { From 473c90014fbbe65dab653260d648084276219301 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 08:40:30 +0000 Subject: [PATCH 12/23] cobalt: 0.17.0 -> 0.17.4 --- pkgs/applications/misc/cobalt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index fd5d9f20a1d..9b263e6f0d4 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.17.0"; + version = "0.17.4"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-IeO50/f+DX9ujZy1+cU1j+nnSl3lpf/nPOu5YBGcCSc="; + sha256 = "sha256-uZcs3VkmpasFwgB7m1spTHi2W86tJt2kWlRTXAotvvo="; }; - cargoSha256 = "sha256-ECgCxR5nsHCeQ3Qc7GWm/lMbmtU2fbAF42nrn2LEcyw="; + cargoSha256 = "sha256-U2TVg2/SIOxaWs4EehTpcu47uDO/EA2dJK56k3I6F+0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From c2d97ef72de1b96dfd0e4f51fb7253f9aaf5cf7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 11:04:39 +0000 Subject: [PATCH 13/23] exoscale-cli: 1.40.5 -> 1.41.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 088c64d98ed..09f0a3cb137 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.5"; + version = "1.41.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-OKGbTkX3HNMYd5UT6l2uqExVZ0TOw0soB3dhebzm2Kg="; + sha256 = "sha256-0utKBCe65lCaamoF4uqvku1zTX2QPpV/6xBtpGteVYw="; }; goPackagePath = "github.com/exoscale/cli"; From 82397b844d8bf4e84e694e2be836cadd3ab6be31 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Fri, 10 Sep 2021 10:31:47 -0400 Subject: [PATCH 14/23] multimc: user-provided client ID --- pkgs/games/multimc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 76326b48bb8..732a66ef8b4 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; @@ -22,6 +22,10 @@ in mkDerivation rec { substituteInPlace launcher/java/JavaUtils.cpp \ --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' + + # add client ID + substituteInPlace notsecrets/Secrets.cpp \ + --replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";' ''; cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; From dc34788a25664926a04393d5f20a266c4a884385 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 15 Sep 2021 13:43:26 +0200 Subject: [PATCH 15/23] nixos/lock-kernel-modules: use `udevadm settle` Instead of relying on systemd-udev-settle, which is deprecated, directly call `udevamd settle` to wait for hardware to settle. --- .../modules/security/lock-kernel-modules.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index fc9e7939d81..3c4cc69e0e3 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -13,7 +13,7 @@ with lib; default = false; description = '' Disable kernel module loading once the system is fully initialised. - Module loading is disabled until the next reboot. Problems caused + Module loading is disabled until the next reboot. Problems caused by delayed module loading can be fixed by adding the module(s) in question to . ''; @@ -29,20 +29,30 @@ with lib; else [ x.fsType ] else []) config.system.build.fileSystems; - systemd.services.disable-kernel-module-loading = rec { + systemd.services.disable-kernel-module-loading = { description = "Disable kernel module loading"; + wants = [ "systemd-udevd.service" ]; wantedBy = [ config.systemd.defaultUnit ]; - after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy; + before = [ config.systemd.defaultUnit ]; + after = + [ "firewall.service" + "systemd-modules-load.service" + ]; unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "/bin/sh -c 'echo -n 1 >/proc/sys/kernel/modules_disabled'"; - }; + serviceConfig = + { Type = "oneshot"; + RemainAfterExit = true; + TimeoutSec = 180; + }; + + script = '' + ${pkgs.udev}/bin/udevadm settle + echo -n 1 >/proc/sys/kernel/modules_disabled + ''; }; }; } From 20b905a8dfe4a65e18fce7fa9bd919f00ff3a9bd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 15 Sep 2021 17:07:21 +0200 Subject: [PATCH 16/23] alternatives/blas: fix ILP64 check This fix allows for MKL ILP64 builds. --- pkgs/build-support/alternatives/blas/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index cf880677fdd..2fab523f6a9 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -31,7 +31,6 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; - isILP64 = blasProvider.blas64 or false; blasImplementation = lib.getName blasProvider; in From 3c4b11f25dcd0bb6a060872a63b08d1f6087bd40 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Wed, 15 Sep 2021 14:31:08 +0000 Subject: [PATCH 17/23] python3Packages.migen: init at unstable-2021-09-14 --- .../python-modules/migen/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/migen/default.nix diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix new file mode 100644 index 00000000000..41396e1c623 --- /dev/null +++ b/pkgs/development/python-modules/migen/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, colorama +}: + +buildPythonPackage rec { + pname = "migen"; + version = "unstable-2021-09-14"; + disabled = pythonOlder "3.3"; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "migen"; + rev = "a5bc262560238f93ceaad423820eb06843326274"; + sha256 = "32UjaIam/B7Gx6XbPcR067LcXfokJH2mATG9mU38a6o="; + }; + + propagatedBuildInputs = [ + colorama + ]; + + pythonImportsCheck = [ "migen" ]; + + meta = with lib; { + description = " A Python toolbox for building complex digital hardware"; + homepage = "https://m-labs.hk/migen"; + license = licenses.bsd2; + maintainers = with maintainers; [ l-as ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de99651cca6..6ae79903c80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4524,6 +4524,8 @@ in { mido = callPackage ../development/python-modules/mido { }; + migen = callPackage ../development/python-modules/migen { }; + milc = callPackage ../development/python-modules/milc { }; milksnake = callPackage ../development/python-modules/milksnake { }; From 93d5531b29a9464033b5742dc988dfa4a9413699 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 17:35:16 +0000 Subject: [PATCH 18/23] macchina: 1.1.3 -> 1.1.4 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 91f23e1bc1d..5d85a80c616 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw"; + sha256 = "sha256-eZeS3lS/eKGvS7CoCnwhkX7jSwAqZOKLMWvLfZPzGtA="; }; - cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60"; + cargoSha256 = "sha256-Ix+Zj5qj1So8Urobw+78yCdRAerFkPctIkousk266DU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; From ea1775eeee16627ddaa8c9f04776303ea9144421 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Sep 2021 17:53:51 +0000 Subject: [PATCH 19/23] strace: remove strace-graph stuff strace-graph is no longer installed as of strace v5.11[1]. The perl build input was only needed for the patchShebangs line, but was causing pkgsStatic.strace to fail to build since pkgsStatic.perl is currently broken[2]. [1]: https://github.com/strace/strace/commit/5685c0d0335246b37c57e65303c82206bdd45e65 [2]: https://github.com/NixOS/nixpkgs/pull/133851#issuecomment-920220593 --- pkgs/development/tools/misc/strace/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 785331fb50b..7e5490fcc3d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. - buildInputs = [ perl.out libunwind ]; # support -k - - postPatch = "patchShebangs --host strace-graph"; + buildInputs = [ libunwind ]; # support -k configureFlags = [ "--enable-mpers=check" ]; From 4872d2ed2a2b5cfb9ac0d2503b0650128a114ba3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 18:40:34 +0000 Subject: [PATCH 20/23] nushell: 0.36.0 -> 0.37.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index eaddb0f56dc..3ebdc4c8e5a 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU="; + sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E="; }; - cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY="; + cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; From ca831be54c1588b44d3452f79a4cfa540a341856 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Sep 2021 07:28:13 +1000 Subject: [PATCH 21/23] miniserve: 0.15.0 -> 0.17.0 https://github.com/svenstaro/miniserve/releases/tag/v0.16.0 https://github.com/svenstaro/miniserve/releases/tag/v0.17.0 --- pkgs/tools/misc/miniserve/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 64fdb40f52a..b6d0bc9ede2 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,21 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg="; + sha256 = "sha256-DqH/6Uu4L0fWbnGX8s3jCGwBgPE2PLIkS/dZIj+BA9Q="; }; - cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ="; + cargoSha256 = "sha256-LgdVO41e56DIRkky1aF0X80ixs7ZH93Qk9Yx67vkO9E="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ "--skip=cant_navigate_up_the_root" ]; + checkFlags = [ + "--skip=bind_ipv4_ipv6::case_2" + "--skip=cant_navigate_up_the_root" + ]; postInstall = '' installShellCompletion --cmd miniserve \ From 132593e334377251bb178d93c107fbb644630742 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Wed, 15 Sep 2021 22:28:59 +0200 Subject: [PATCH 22/23] session-desktop-appimage: 1.6.11 -> 1.7.1 --- .../instant-messengers/session-desktop-appimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index fda11a34f89..c36159bfabd 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.6.11"; + version = "1.7.1"; in appimageTools.wrapType2 { name = "session-desktop-appimage-${version}"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "08vnkxj2w2k7lhygs5qhbyikpvw5nmby3qhxigbbkj5qj1wvs48b"; + sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6"; }; meta = with lib; { From c706ca58e06328c98a9dfc8e9e069a60f2864237 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 21:26:16 +0000 Subject: [PATCH 23/23] rpg-cli: 0.6.0 -> 1.0.0 --- pkgs/games/rpg-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 602bdb1ee31..23396ebf978 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw="; + sha256 = "sha256-Ih+1qO/VHkRp766WDe09xXL/pkby+sURopy7m5wRn4Y="; }; - cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g="; + cargoSha256 = "sha256-Au7Nlpl4XOSG8rW0DaHFDqBr1kUY5Emyw6ff0htPc+I="; # tests assume the authors macbook, and thus fail doCheck = false;