mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
86713fcaba
@ -157,9 +157,9 @@ in rec {
|
||||
});
|
||||
|
||||
terraform_0_14 = pluggable (generic {
|
||||
version = "0.14.5";
|
||||
sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r";
|
||||
vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs";
|
||||
version = "0.14.6";
|
||||
sha256 = "0ba3vd6lswy4pd0qywdbx8cf71j5z3p8p8kdjs9m4qbyrzsbq0fk";
|
||||
vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, ncurses
|
||||
, withLibrary ? false, libtool
|
||||
, unicodeSupport ? true
|
||||
@ -10,14 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dialog";
|
||||
version = "1.3-20201126";
|
||||
version = "1.3-20210117";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz"
|
||||
];
|
||||
sha256 = "sha256-ySM6bI6jOlniN45RRq4r0TtRl0TP22R690IK2sWtOGY=";
|
||||
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
|
||||
sha256 = "PB7Qj0S89vFZ8qpv3nZduU6Jl7Pu+0nYtMhmkWk8Q+E=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sd-local";
|
||||
version = "1.0.17";
|
||||
version = "1.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "screwdriver-cd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13krr1zjh544swv4frfapvyi7bm8qf121x6qz9jqbw2cm3mid301";
|
||||
sha256 = "sha256-SKBSsS8WPsr5/42IMueLkfJCrOQIO/ODlhTp+xrmQ/4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z";
|
||||
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -8,6 +8,6 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "15.7.0";
|
||||
sha256 = "1nnv5337p23mhp0s2zgv75yysgfai0px8h1kks2mc8w0xnmwwppg";
|
||||
version = "15.8.0";
|
||||
sha256 = "1a9h88zdzk98k618jascfrivq3v51viw60sfyxn0ci0l33vf4fp2";
|
||||
}
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stella";
|
||||
version = "6.4";
|
||||
version = "6.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stella-emu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gva6pw5c1pplcf2g48zmm24h1134v0vr705rbzj4v6ifp3adrsl";
|
||||
sha256 = "2O7pN0xByEbWVL32VZw9191tG+kCMOuivJZRpXssQIw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -17,15 +22,19 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://stella-emu.github.io/";
|
||||
description = "An open-source Atari 2600 VCS emulator";
|
||||
longDescription = ''
|
||||
Stella is a multi-platform Atari 2600 VCS emulator released under
|
||||
the GNU General Public License (GPL). Stella was originally
|
||||
developed for Linux by Bradford W. Mott, and is currently
|
||||
maintained by Stephen Anthony.
|
||||
As of its 3.5 release, Stella is officially donationware.
|
||||
Stella is a multi-platform Atari 2600 VCS emulator released under the GNU
|
||||
General Public License (GPL). Stella was originally developed for Linux by
|
||||
Bradford W. Mott, and is currently maintained by Stephen Anthony. Since
|
||||
its original release several people have joined the development team to
|
||||
port Stella to other operating systems such as AcornOS, AmigaOS, DOS,
|
||||
FreeBSD, IRIX, Linux, OS/2, MacOS, Unix, and Windows. The development team
|
||||
is working hard to perfect the emulator and we hope you enjoy our effort.
|
||||
|
||||
As of its 3.5 release, Stella is officially donationware.
|
||||
'';
|
||||
homepage = "https://stella-emu.github.io/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -16,11 +16,21 @@
|
||||
, ncurses
|
||||
, python3
|
||||
, cmake
|
||||
, fishPlugins
|
||||
|
||||
, runCommand
|
||||
, writeText
|
||||
, nixosTests
|
||||
, useOperatingSystemEtc ? true
|
||||
# An optional string containing Fish code that initializes the environment.
|
||||
# This is run at the very beginning of initialization. If it sets $NIX_PROFILES
|
||||
# then Fish will use that to configure its function, completion, and conf.d paths.
|
||||
# For example:
|
||||
# fishEnvPreInit = "source /etc/fish/my-env-preinit.fish";
|
||||
# It can also be a function that takes one argument, which is a function that
|
||||
# takes a path to a bash file and converts it to fish. For example:
|
||||
# fishEnvPreInit = source: source "${nix}/etc/profile.d/nix-daemon.sh";
|
||||
, fishEnvPreInit ? null
|
||||
}:
|
||||
let
|
||||
etcConfigAppendix = writeText "config.fish.appendix" ''
|
||||
@ -62,8 +72,12 @@ let
|
||||
# 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH
|
||||
builtin status --is-login
|
||||
or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED"
|
||||
${if fishEnvPreInit != null then ''
|
||||
and begin
|
||||
${lib.removeSuffix "\n" (if lib.isFunction fishEnvPreInit then fishEnvPreInit sourceWithFenv else fishEnvPreInit)}
|
||||
end'' else ''
|
||||
and test -f /etc/fish/nixos-env-preinit.fish
|
||||
and source /etc/fish/nixos-env-preinit.fish
|
||||
and source /etc/fish/nixos-env-preinit.fish''}
|
||||
and set -gx __fish_nixos_env_preinit_sourced 1
|
||||
|
||||
test -n "$NIX_PROFILES"
|
||||
@ -94,6 +108,22 @@ let
|
||||
end
|
||||
'';
|
||||
|
||||
# This is wrapped in begin/end in case the user wants to apply redirections.
|
||||
# This does mean the basic usage of sourcing a single file will produce
|
||||
# `begin; begin; …; end; end` but that's ok.
|
||||
sourceWithFenv = path: ''
|
||||
begin # fenv
|
||||
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
|
||||
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
|
||||
set fish_function_path ${fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
|
||||
fenv source ${lib.escapeShellArg path}
|
||||
set -l fenv_status $status
|
||||
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
|
||||
set -e fish_function_path
|
||||
test $fenv_status -eq 0
|
||||
end # fenv
|
||||
'';
|
||||
|
||||
fish = stdenv.mkDerivation rec {
|
||||
pname = "fish";
|
||||
version = "3.1.2";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.36.2";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qAUJgQzC9dGeVePsLpZHt+Ogz5ty5+N8hKBtGozhRZM=";
|
||||
sha256 = "sha256-1IhCBDMfGW9hDvQoGSJKJ1ZlShzVeIGjVOfiUspHRBw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-woEa/h6TKQD32BslmPBuILvBAObhWjT8XqnQmuweUx0=";
|
||||
vendorSha256 = "sha256-fa8IrJhsy5cBzBs4tGIx7ykJcXjdvLqms3Dk97P4Vik=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation {
|
||||
pname = "cue2pops";
|
||||
version = "git-2018-01-04";
|
||||
version = "unstable-2018-01-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "makefu";
|
||||
@ -14,14 +16,14 @@ stdenv.mkDerivation {
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = ["CC=cc"];
|
||||
makeFlags = [ "CC=cc" ];
|
||||
|
||||
installPhase = ''
|
||||
install --directory --mode=755 $out/bin
|
||||
install --mode=755 cue2pops $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Convert CUE to ISO suitable to POPStarter";
|
||||
homepage = "https://github.com/makefu/cue2pops-linux";
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
let jdk = jdk8; jre = jre8; in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ili2c";
|
||||
version = "5.0.8";
|
||||
version = "5.1.1";
|
||||
|
||||
nativeBuildInputs = [ ant jdk makeWrapper ];
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "claeis";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1yhsyh940kb33y2n6xl7zhf0f6q0nrxbyg6c4g5n2imllpn54sgi";
|
||||
sha256 = "sha256-FHhx+f253+UdbFjd2fOlUY1tpQ6pA2aVu9CBSwUVoKQ=";
|
||||
};
|
||||
|
||||
buildPhase = "ant jar";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user