From 2fa1bcd7c3b49a049665fca17e34fc43fe208d98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 17:09:37 +0000 Subject: [PATCH 1/9] oq: 1.2.0 -> 1.2.1 --- pkgs/development/tools/oq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index f10136793bf0..499398c5c5d8 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vMW+N3N6H8S6dNm4eBJo2tSxSiouG92t4Nq3cYSWcw0="; + sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34="; }; nativeBuildInputs = [ makeWrapper ]; From bc368ab7fd28fe442c244d6e53f5f4d6d45f90f7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 15 Aug 2021 21:22:15 +0200 Subject: [PATCH 2/9] entr: 4.9 -> 5.0 --- pkgs/tools/misc/entr/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index abfd12523db9..8309bc129414 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,23 +2,13 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.9"; + version = "5.0"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI="; + sha256 = "1fqyshn9i213h6hiy31xlm719f6vayskfna92kvbd2aykryvp1ra"; }; - patches = lib.optionals stdenv.isDarwin [ - # Fix v4.9 segfault on Darwin. remove with the next update - # https://github.com/eradman/entr/issues/74 - (fetchpatch { - url = "https://github.com/eradman/entr/commit/468d77d45925abba826bb1dcda01487dbe37eb33.patch"; - sha256 = "17kkcrsnac0pb930sf2kix71h4c7krzsrvz8pskx0vm39n1c9xfi"; - includes = [ "entr.c" ]; - }) - ]; - postPatch = '' substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat From e6a9fcd47c6bbaf23951946288088f8754e19b87 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 15 Aug 2021 14:05:37 -0700 Subject: [PATCH 3/9] acl2: Fix typo in cleanup commands --- pkgs/development/interpreters/acl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 2d104e9fb4c4..9436cf58e427 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { # Clean up some stuff to save space find -name '*@useless-runes.lsp' -execdir rm {} + # saves ~1GB of space - find -name '*.cert.out' -execdir gz {} + # saves ~400MB of space + find -name '*.cert.out' -execdir gzip {} + # saves ~400MB of space popd ''; From a13f8aa9be146c91c244e25580dd9b6ee369756f Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 16 Aug 2021 02:31:50 +0300 Subject: [PATCH 4/9] oh-my-git: Add libudev --- pkgs/games/oh-my-git/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 542effa65965..4e17fdb6cf10 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -20,6 +20,7 @@ , libglvnd , libpulseaudio , zlib +, libudev }: stdenv.mkDerivation rec { @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { libglvnd libpulseaudio zlib + libudev ]; desktopItems = [ From 6adca8026c26d49de0c07a239642c33df58376a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Aug 2021 02:42:43 +0100 Subject: [PATCH 5/9] exa: fix on aarch64-darwin (#133660) --- pkgs/tools/misc/exa/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 632eb4590586..9cabff9a9bef 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -18,16 +18,21 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; - nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; + nativeBuildInputs = [ + cmake pkg-config installShellFiles + # ghc is not supported on aarch64-darwin yet. + ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc; + buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man"; - postInstall = '' + postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") '' pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5 + '' + '' installShellCompletion \ --name exa completions/completions.bash \ --name exa.fish completions/completions.fish \ From a299818b7922e6403034b1bb9a388c0dbe238917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <238528+smancill@users.noreply.github.com> Date: Sun, 15 Aug 2021 22:40:11 -0400 Subject: [PATCH 6/9] mkvtoolnix: fix GUI on darwin (#133848) The MKVToolNix GUI has been marked as unsupported on darwin since 88d7718a64d (mkvtoolnix-cli: fix build on darwin, 2017-03-13), but currently it builds without issues. It is when mkvtoolnix-gui is run that the window doesn't appear. Setting the environment variable QT_MAC_WANTS_LAYER=1 fixes it and now the GUI runs on Darwin too. Tested on Big Sur. Picked from 461466306ef (octaveFull: set QT_MAC_WANTS_LAYER=1 on Darwin, 2021-07-22). --- pkgs/applications/video/mkvtoolnix/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7cffcd923ff7..0f271dd889e8 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -122,6 +122,11 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 + qtWrapperArgs = lib.optionals stdenv.isDarwin [ + "--set QT_MAC_WANTS_LAYER 1" + ]; + postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui ''; @@ -131,7 +136,6 @@ stdenv.mkDerivation rec { homepage = "https://mkvtoolnix.download/"; license = licenses.gpl2Only; maintainers = with maintainers; [ codyopel rnhmjoj ]; - platforms = platforms.linux - ++ optionals (!withGUI) platforms.darwin; + platforms = platforms.unix; }; } From 58abd7336749c486cfb1844ea74b79fb74007991 Mon Sep 17 00:00:00 2001 From: r-burns <52847440+r-burns@users.noreply.github.com> Date: Sun, 15 Aug 2021 20:18:23 -0700 Subject: [PATCH 7/9] oh-my-git: fix strict eval (#134281) libudev is an alias to udev --- pkgs/games/oh-my-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 4e17fdb6cf10..e1147d1b48c1 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -20,7 +20,7 @@ , libglvnd , libpulseaudio , zlib -, libudev +, udev }: stdenv.mkDerivation rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libglvnd libpulseaudio zlib - libudev + udev ]; desktopItems = [ From 697891710272f11611cf892ec0ab675fffa48e9c Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 16 Aug 2021 05:29:07 +0200 Subject: [PATCH 8/9] oh-my-git: clearify dependency the actual dependency is libudev --- pkgs/games/oh-my-git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index e1147d1b48c1..881935279fe4 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -20,7 +20,7 @@ , libglvnd , libpulseaudio , zlib -, udev +, udev # for libudev }: stdenv.mkDerivation rec { From 739f0b22b74a35f65e5b862108db4d4380feecc8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 15 Aug 2021 17:13:49 +0900 Subject: [PATCH 9/9] elixir_ls: 0.7.0 -> 0.8.0 --- pkgs/development/beam-modules/elixir_ls.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/elixir_ls.nix b/pkgs/development/beam-modules/elixir_ls.nix index 5afab0e1babd..2b6cc4f56810 100644 --- a/pkgs/development/beam-modules/elixir_ls.nix +++ b/pkgs/development/beam-modules/elixir_ls.nix @@ -4,20 +4,20 @@ mixRelease rec { pname = "elixir-ls"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s"; + sha256 = "sha256-pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM="; fetchSubmodules = true; }; mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1"; + sha256 = "sha256-YRzPASpg1K2kZUga5/aQf4Q33d8aHCwhw7KJxSY56k4="; }; # elixir_ls is an umbrella app