Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-22 00:07:09 +00:00 committed by GitHub
commit d88eff741c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 68 additions and 7 deletions

View file

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, guile
, libssh
, autoreconfHook
, pkg-config
, texinfo
, which
}:
stdenv.mkDerivation rec {
pname = "guile-ssh";
version = "0.13.1";
src = fetchFromGitHub {
owner = "artyom-poptsov";
repo = pname;
rev = "v${version}";
sha256 = "LzTR1QuK3mle0Q6a4YRn9ZTkcs1sygYKoezxI9+e/fY=";
};
configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ];
postFixup = ''
for f in $out/share/guile/site/ssh/**.scm; do \
substituteInPlace $f \
--replace "libguile-ssh" "$out/lib/libguile-ssh"; \
done
'';
nativeBuildInputs = [
autoreconfHook pkg-config texinfo which
];
buildInputs = [
guile
];
propagatedBuildInputs = [
libssh
];
enableParallelBuilding = true;
meta = with lib; {
description = "Bindings to Libssh for GNU Guile";
homepage = "https://github.com/artyom-poptsov/guile-ssh";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ethancedwards8 ];
platforms = platforms.linux;
};
}

View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.10";
version = "6.11";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-WO3hSEgtSRiCYtWi0MnXAKdMacUcyqEcWt9j0/MUQZ8=";
sha256 = "02v725qjsibiv6ad6hxsc6199dvlmnp7983286a4k8rygqnvqln9";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@ -65,7 +65,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-nqXgJe2i1xDW1aCAmwFPshiUI2PtZ/S7p8Cq2ODMTQk=";
sha256 = "0gbci8fjvl1bdz7fj4bh25mqrgi1i04q5na2ckv9hj9nh9x7crbm";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuigreet";
version = "0.2.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "apognu";
repo = pname;
rev = version;
sha256 = "1fk8ppxr3a8vdp7g18pp3sgr8b8s11j30mcqpdap4ai14v19idh8";
sha256 = "1v16gl6ajqdbl265nh8akr2far5qhiqv7787hvqlzpr3rd39vnij";
};
cargoSha256 = "1ds5rcxg7qn799zp0jdn9ifkdzh9h5ibsqh688dvrqyzrsfz6x7m";
cargoSha256 = "072zvvgf9m1afjz15m8pwslh2mav37ahjqgg33pdvzdnvg5j1q2h";
meta = with lib; {
description = "Graphical console greter for greetd";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
, gnugrep, gnused, jq, nix }:
, gnugrep, gnused, jq, nix, fetchpatch }:
let
binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
@ -20,6 +20,14 @@ in stdenv.mkDerivation rec {
'';
};
patches = [
# Fix input_type regex for macOS systems: https://github.com/msteen/nix-prefetch/pull/24
(fetchpatch {
url = "https://github.com/msteen/nix-prefetch/commit/08282891bdb108e886eaf39be2030ba1feda1cb1.patch";
sha256 = "1v6ask54ind6f3784pbncv0dfg6draaaicg0q46jfvp0lafms70x";
})
];
postPatch = ''
lib=$out/lib/${pname}

View file

@ -12735,6 +12735,8 @@ in
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
guile-xcb = callPackage ../development/guile-modules/guile-xcb {
guile = guile_2_0;
};