From f8a3b92fb28906e3beb26590bf5d6c5de13e689e Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 14 Jul 2021 16:55:53 +0200 Subject: [PATCH 1/5] steamPackages.steam-runtime: 20210527.0 -> 20210630.0 (cherry picked from commit 7cae0551597ab2129c59fb2c93ca42e51aaf0f72) --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index ab2c19249aa..a986e1baa2c 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20210527.0"; + version = "0.20210630.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "1880d1byn265w0vy5p98d8w8virnbywj707ydybj7rixhid2gzdc"; + sha256 = "sha256-vwSgk3hEaI/RO9uvehAx3+ZBynpqjwGDzuyeyGCnu18="; name = "scout-runtime-${version}.tar.gz"; }; From d240845bbb82dd39f11026a34ac029b6fef888e5 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 20 Jul 2021 21:27:01 +0200 Subject: [PATCH 2/5] lha: init at 2021-07-01 (cherry picked from commit c4508944773a579423c370b81860b175059ab540) --- pkgs/tools/archivers/lha/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/archivers/lha/default.nix diff --git a/pkgs/tools/archivers/lha/default.nix b/pkgs/tools/archivers/lha/default.nix new file mode 100644 index 00000000000..f6b5c2bd135 --- /dev/null +++ b/pkgs/tools/archivers/lha/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation { + pname = "lha"; + version = "unstable-2021-01-07"; + + src = fetchFromGitHub { + owner = "jca02266"; + repo = "lha"; + rev = "03475355bc6311f7f816ea9a88fb34a0029d975b"; + sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms"; + platforms = platforms.unix; + maintainers = [ maintainers.sander ]; + # Some of the original LhA code has been rewritten and the current author + # considers adopting a "true" free and open source license for it. + # However, old code is still covered by the original LHa license, which is + # not a free software license (it has additional requirements on commercial + # use). + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12c932cf83..eee53ce543d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6127,6 +6127,8 @@ in lf = callPackage ../tools/misc/lf {}; + lha = callPackage ../tools/archivers/lha { }; + lhasa = callPackage ../tools/compression/lhasa {}; libcpuid = callPackage ../tools/misc/libcpuid { }; From a37709b2321c03cc4002e8b3bfc4722481bb09d2 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 29 Jun 2021 11:54:05 -0600 Subject: [PATCH 3/5] zsh: remove conflicting nixUnstable completions (cherry picked from commit d687fe88fdbb00b89f4e5b82824c7b187659d648) --- nixos/modules/programs/zsh/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 049a315c762..81f1395662a 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -279,7 +279,7 @@ in environment.etc.zinputrc.source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + ++ optional (cfg.enableCompletion && ! lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") pkgs.nix-zsh-completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; From b16eb24c4d97939099dd59624726475271043e16 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 29 Jun 2021 14:31:10 -0600 Subject: [PATCH 4/5] zsh: format module with nixpkgs-fmt (cherry picked from commit 9ad645dce8e11a3ffcf27cd797abc99476c837f0) --- nixos/modules/programs/zsh/zsh.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 81f1395662a..4eac7c8afbf 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -53,7 +53,7 @@ in }; shellAliases = mkOption { - default = {}; + default = { }; description = '' Set of aliases for zsh shell, which overrides . See for an option format description. @@ -118,7 +118,9 @@ in setOptions = mkOption { type = types.listOf types.str; default = [ - "HIST_IGNORE_DUPS" "SHARE_HISTORY" "HIST_FCNTL_LOCK" + "HIST_IGNORE_DUPS" + "SHARE_HISTORY" + "HIST_FCNTL_LOCK" ]; example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ]; description = '' @@ -279,14 +281,18 @@ in environment.etc.zinputrc.source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional (cfg.enableCompletion && ! lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") pkgs.nix-zsh-completions; + ++ optional + (cfg.enableCompletion + && !lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") + pkgs.nix-zsh-completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = - [ "/run/current-system/sw/bin/zsh" + [ + "/run/current-system/sw/bin/zsh" "${pkgs.zsh}/bin/zsh" ]; From 6322c5baf7db6c1f16bb39a389d3dbe408dee10d Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Sat, 3 Jul 2021 13:54:00 -0600 Subject: [PATCH 5/5] zsh: include completions for nix-* commands (cherry picked from commit 6dbf8c04097c8961bb1cb9cb319fee42eb19ab7a) --- nixos/modules/programs/zsh/zsh.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 4eac7c8afbf..e0335643b6e 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -280,11 +280,21 @@ in environment.etc.zinputrc.source = ./zinputrc; - environment.systemPackages = [ pkgs.zsh ] - ++ optional - (cfg.enableCompletion - && !lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") - pkgs.nix-zsh-completions; + environment.systemPackages = + let + completions = + if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre" + then + pkgs.nix-zsh-completions.overrideAttrs + (_: { + postInstall = '' + rm $out/share/zsh/site-functions/_nix + ''; + }) + else pkgs.nix-zsh-completions; + in + [ pkgs.zsh ] + ++ optional cfg.enableCompletion completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh";