Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1g4a001k86myfln0xlzy8w9krwamvfchnvywpr1p3x6iw95z46w8";
|
||||
sha256 = "0nxdyd0zg4w1zr8p9z2x88h36vbn7ryk7160zszdiwh5qmdlv47v";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, guile
|
||||
, guile-commonmark
|
||||
, guile-reader
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haunt";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-zOkICg7KmJJhPWPtJRT3C9sYB1Oig1xLtgPNGe0n3xQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
guile
|
||||
guile-commonmark
|
||||
guile-reader
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/haunt \
|
||||
--prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \
|
||||
--prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dthompson.us/projects/haunt.html";
|
||||
description = "Guile-based static site generator";
|
||||
longDescription = ''
|
||||
Haunt is a simple, functional, hackable static site generator that gives
|
||||
authors the ability to treat websites as Scheme programs.
|
||||
|
||||
By giving authors the full expressive power of Scheme, they are able to
|
||||
control every aspect of the site generation process. Haunt provides a
|
||||
simple, functional build system that can be easily extended for this
|
||||
purpose.
|
||||
|
||||
Haunt has no opinion about what markup language authors should use to
|
||||
write posts, though it comes with support for the popular Markdown
|
||||
format. Likewise, Haunt has no opinion about how authors structure their
|
||||
sites. Though it comes with support for building simple blogs or Atom
|
||||
feeds, authors should feel empowered to tweak, replace, or create builders
|
||||
to do things that aren't provided out-of-the-box.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
@@ -5,18 +5,17 @@
|
||||
, electron
|
||||
, common-updater-scripts
|
||||
, writeShellScript
|
||||
, jq
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda";
|
||||
sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
-24
@@ -1,24 +0,0 @@
|
||||
From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Wed, 25 Nov 2020 11:26:49 +0100
|
||||
Subject: [PATCH] replace git with normal python package
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
requirements.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index ef25aad..b4246a4 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -1,2 +1,2 @@
|
||||
-git+https://github.com/Yubico/yubikey-manager.git
|
||||
+yubikey-manager
|
||||
./py/qr
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "yubioath-desktop";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
|
||||
sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h";
|
||||
sha256 = "05xs6xh9pi50h0668arirj0gnz11adpixgsdkds072077gasdm0g";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
@@ -19,10 +19,6 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
|
||||
|
||||
patches = [
|
||||
./0001-replace-git-with-normal-python-package.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace deployment.pri \
|
||||
--replace '/usr/bin' "$out/bin"
|
||||
@@ -48,7 +44,7 @@ mkDerivation rec {
|
||||
cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons
|
||||
substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \
|
||||
--replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \
|
||||
--replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png"
|
||||
--replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Reference in New Issue
Block a user