Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-07-22 18:02:15 +00:00 committed by GitHub
commit 8c1d120aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 7 deletions

View File

@ -53,7 +53,7 @@ in
};
shellAliases = mkOption {
default = {};
default = { };
description = ''
Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>.
See <option>environment.shellAliases</option> 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 = ''
@ -278,15 +280,29 @@ in
environment.etc.zinputrc.source = ./zinputrc;
environment.systemPackages = [ pkgs.zsh ]
++ optional cfg.enableCompletion 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";
#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"
];

View File

@ -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";
};

View File

@ -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;
};
}

View File

@ -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 { };