Merge master into staging-next
This commit is contained in:
commit
36faabcd7c
|
@ -13,6 +13,25 @@ self: super: let
|
|||
in {
|
||||
inherit buildPlugin;
|
||||
|
||||
m86motorsoff = buildPlugin rec {
|
||||
pname = "M84MotorsOff";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ntoff";
|
||||
repo = "Octoprint-M84MotOff";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w6h4hia286lbz2gy33rslq02iypx067yqn413xcipb07ivhvdq7";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Changes the \"Motors off\" button in octoprint's control tab to issue an M84 command to allow compatibility with Repetier firmware Resources";
|
||||
homepage = "https://github.com/ntoff/OctoPrint-M84MotOff";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
abl-expert = buildPlugin rec {
|
||||
pname = "ABL_Expert";
|
||||
version = "0.6";
|
||||
|
@ -52,6 +71,25 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
costestimation = buildPlugin rec {
|
||||
pname = "CostEstimation";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OllisGit";
|
||||
repo = "OctoPrint-${pname}";
|
||||
rev = version;
|
||||
sha256 = "1j476jcw7gh8zqqdc5vddwv5wpjns7cd1hhpn7m9fxq3d5bi077w";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin to display the estimated print cost for the loaded model.";
|
||||
homepage = "https://github.com/malnvenshorn/OctoPrint-CostEstimation";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
curaenginelegacy = buildPlugin rec {
|
||||
pname = "CuraEngineLegacy";
|
||||
version = "1.1.1";
|
||||
|
@ -71,6 +109,25 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
displayprogress = buildPlugin rec {
|
||||
pname = "DisplayProgress";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint-${pname}";
|
||||
rev = version;
|
||||
sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Displays the job progress on the printer's display";
|
||||
homepage = "https://github.com/OctoPrint/OctoPrint-DisplayProgress";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
displaylayerprogress = buildPlugin rec {
|
||||
pname = "OctoPrint-DisplayLayerProgress";
|
||||
version = "1.24.0";
|
||||
|
@ -240,6 +297,27 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
telegram = buildPlugin rec {
|
||||
pname = "Telegram";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabianonline";
|
||||
repo = "OctoPrint-${pname}";
|
||||
rev = version;
|
||||
sha256 = "14d9f9a5m1prcikd7y26qks6c2ls6qq4b97amn24q5a8k5hbgl94";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with super; [ pillow ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin to send status messages and receive commands via Telegram messenger.";
|
||||
homepage = "https://github.com/fabianonline/OctoPrint-Telegram";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
themeify = buildPlugin rec {
|
||||
pname = "Themeify";
|
||||
version = "1.2.2";
|
||||
|
|
|
@ -53,11 +53,11 @@ in buildPythonPackage {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share $out/bin
|
||||
cp $src/main.py $out/share/matrix.py
|
||||
cp main.py $out/share/matrix.py
|
||||
|
||||
cp $src/contrib/matrix_upload.py $out/bin/matrix_upload
|
||||
cp $src/contrib/matrix_decrypt.py $out/bin/matrix_decrypt
|
||||
cp $src/contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper
|
||||
cp contrib/matrix_upload.py $out/bin/matrix_upload
|
||||
cp contrib/matrix_decrypt.py $out/bin/matrix_decrypt
|
||||
cp contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper
|
||||
substituteInPlace $out/bin/matrix_upload \
|
||||
--replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
|
||||
substituteInPlace $out/bin/matrix_sso_helper \
|
||||
|
@ -66,7 +66,7 @@ in buildPythonPackage {
|
|||
--replace '/usr/bin/env python3' '${scriptPython}/bin/python'
|
||||
|
||||
mkdir -p $out/${python.sitePackages}
|
||||
cp -r $src/matrix $out/${python.sitePackages}/matrix
|
||||
cp -r matrix $out/${python.sitePackages}/matrix
|
||||
'';
|
||||
|
||||
dontPatchShebangs = true;
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001
|
||||
From: Geoffrey McRae <geoff@hostfission.com>
|
||||
Date: Tue, 23 Feb 2021 20:25:30 +1100
|
||||
Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in
|
||||
use
|
||||
|
||||
Closes #475
|
||||
---
|
||||
client/renderers/EGL/egl.c | 3 ++-
|
||||
client/src/main.c | 5 +++--
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c
|
||||
index b7a5644..72ce50d 100644
|
||||
--- a/client/renderers/EGL/egl.c
|
||||
+++ b/client/renderers/EGL/egl.c
|
||||
@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this)
|
||||
if (!this->formatValid)
|
||||
return;
|
||||
|
||||
- int w, h;
|
||||
+ int w = 0, h = 0;
|
||||
+
|
||||
switch(this->format.rotate)
|
||||
{
|
||||
case LG_ROTATE_0:
|
||||
diff --git a/client/src/main.c b/client/src/main.c
|
||||
index f05e929..f5d6fad 100644
|
||||
--- a/client/src/main.c
|
||||
+++ b/client/src/main.c
|
||||
@@ -186,8 +186,9 @@ static void updatePositionInfo(void)
|
||||
if (!g_state.haveSrcSize)
|
||||
goto done;
|
||||
|
||||
- float srcW;
|
||||
- float srcH;
|
||||
+ float srcW = 0.0f;
|
||||
+ float srcH = 0.0f;
|
||||
+
|
||||
switch(params.winRotate)
|
||||
{
|
||||
case LG_ROTATE_0:
|
||||
--
|
||||
2.30.1
|
||||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol
|
||||
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
|
||||
, libXi, libXext, wayland, libffi, libGLU, expat, libbfd
|
||||
, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver
|
||||
, expat, libbfd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "looking-glass-client";
|
||||
version = "B2";
|
||||
version = "B3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnif";
|
||||
repo = "LookingGlass";
|
||||
rev = version;
|
||||
sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d";
|
||||
sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -19,10 +20,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
|
||||
libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat
|
||||
libbfd
|
||||
libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols
|
||||
libffi libGLU libXScrnSaver expat libbfd
|
||||
];
|
||||
|
||||
patches = [
|
||||
# error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||
# Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3.
|
||||
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
|
||||
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
|
||||
];
|
||||
patchFlags = "-p2";
|
||||
|
||||
sourceRoot = "source/client";
|
||||
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ in {
|
|||
sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
|
||||
};
|
||||
v5 = font-awesome {
|
||||
version = "5.10.2";
|
||||
sha256 = "0bg28zn2lhrcyj7mbavphkvw3hrbnjsnn84305ax93nj3qd0d4hx";
|
||||
version = "5.15.3";
|
||||
sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,24 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, premake4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bootil";
|
||||
version = "unstable-2015-12-17";
|
||||
version = "unstable-2019-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garrynewman";
|
||||
repo = "bootil";
|
||||
rev = "1d3e321fc2be359e2350205b8c7f1cad2164ee0b";
|
||||
sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
|
||||
rev = "beb4cec8ad29533965491b767b177dc549e62d23";
|
||||
sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/garrynewman/bootil/pull/22.patch";
|
||||
name = "github-pull-request-22.patch";
|
||||
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
|
||||
})
|
||||
];
|
||||
|
||||
# Avoid guessing where files end up. Just use current directory.
|
||||
postPatch = ''
|
||||
substituteInPlace projects/premake4.lua \
|
||||
|
@ -28,6 +24,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ premake4 ];
|
||||
|
||||
premakefile = "projects/premake4.lua";
|
||||
|
||||
installPhase = ''
|
||||
|
@ -40,8 +37,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/garrynewman/bootil";
|
||||
# License unsure - see https://github.com/garrynewman/bootil/issues/21
|
||||
license = licenses.free;
|
||||
maintainers = [ maintainers.abigailbuccaneer ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ abigailbuccaneer ];
|
||||
# Build uses `-msse` and `-mfpmath=sse`
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
|
|
|
@ -1,13 +1,24 @@
|
|||
{ buildPythonPackage, fetchPypi, atpublic }:
|
||||
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook
|
||||
, atpublic, psutil, pytestcov, sybil
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flufl.lock";
|
||||
version = "3.2";
|
||||
|
||||
propagatedBuildInputs = [ atpublic ];
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8";
|
||||
sha256 = "1bnapkg99r6mixn3kh314bqcfk8q54y0cvhjpj87j7dhjpsakfpz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ atpublic psutil ];
|
||||
checkInputs = [ pytestCheckHook pytestcov sybil ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://flufllock.readthedocs.io/";
|
||||
description = "NFS-safe file locking with timeouts for POSIX and Windows";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Formal verification tool for distributed software systems";
|
||||
homepage = "http://spinroot.com/";
|
||||
homepage = "https://spinroot.com/";
|
||||
license = licenses.free;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
|
|
|
@ -1,26 +1,39 @@
|
|||
{ lib, stdenv, fetchurl, perl }:
|
||||
{ lib, stdenv, fetchurl, perl, installShellFiles }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0.2";
|
||||
version = "2.21.1";
|
||||
pname = "checkbashisms";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
|
||||
sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd";
|
||||
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
|
||||
hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
# The link returns directly the script. No need for unpacking
|
||||
dontUnpack = true;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
substituteInPlace ./scripts/checkbashisms.pl \
|
||||
--replace '###VERSION###' "$version"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
install -D -m755 $src $out/bin/checkbashisms
|
||||
runHook preInstall
|
||||
|
||||
installManPage scripts/$pname.1
|
||||
installShellCompletion --bash --name $pname scripts/$pname.bash_completion
|
||||
install -D -m755 scripts/$pname.pl $out/bin/$pname
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://sourceforge.net/projects/checkbaskisms/";
|
||||
description = "Check shell scripts for non-portable syntax";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ kaction ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,29 +1,22 @@
|
|||
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
|
||||
{ lib, stdenv, autoreconfHook, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inotify-tools";
|
||||
version = "3.20.2.2";
|
||||
version = "3.20.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "inotify-tools";
|
||||
owner = "rvoicilas";
|
||||
rev = version;
|
||||
sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0";
|
||||
sha256 = "1m8avqccrhm38krlhp88a7v949f3hrzx060bbrr5dp5qw2nmw9j2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch";
|
||||
sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rvoicilas/inotify-tools/wiki";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ marcweber pSub ];
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ marcweber pSub shamilton ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,12 +9,12 @@ buildPythonPackage rec {
|
|||
pname = "HyperKitty";
|
||||
# Note: Mailman core must be on the latest version before upgrading HyperKitty.
|
||||
# See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0p85r9q6mn5as5b39xp9hkkipnk0156acx540n2ygk3qb3jd4a5n";
|
||||
sha256 = "1lbh8n66fp3l5s0xvmvsbfvgs3z4knx0gwf0q117n2nfkslf13zp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ isort ];
|
||||
|
|
|
@ -1,16 +1,21 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sta";
|
||||
version = "unstable-2016-01-25";
|
||||
version = "unstable-2020-05-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonccarter";
|
||||
repo = "sta";
|
||||
rev = "2aa2a6035dde88b24978b875e4c45e0e296f77ed";
|
||||
sha256 = "05804f106nb89yvdd0csvpd5skwvnr9x4qr3maqzaw0qr055mrsk";
|
||||
rev = "566e3a77b103aa27a5f77ada8e068edf700f26ef";
|
||||
sha256 = "1v20di90ckl405rj5pn6lxlpxh2m2b3y9h2snjvk0k9sihk7w7d5";
|
||||
};
|
||||
|
||||
buildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple statistics from the command line interface (CLI), fast";
|
||||
|
|
25
pkgs/tools/networking/innernet/default.nix
Normal file
25
pkgs/tools/networking/innernet/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, linuxHeaders, sqlite, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "innernet";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tonarino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OomCSA02ypFVzkYMcmkFREWB6x7oxgpt7x2zRANIDMw=";
|
||||
};
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
|
||||
nativeBuildInputs = with llvmPackages; [ llvm clang ];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
cargoSha256 = "sha256-GYNk3j8fjKSo3Qk6Qy0l6kNINK3FxlSYoEkJSx7kVpk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A private network system that uses WireGuard under the hood";
|
||||
homepage = "https://github.com/tonarino/innernet";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tomberek _0x4A6F ];
|
||||
};
|
||||
}
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.10.5";
|
||||
version = "1.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "0nagn7792qniczzv0912h89bn8rm8hyikdiw7cqwknx0hw8dwz1z";
|
||||
sha256 = "08k5j469750bhlq49qc5nwc2jjgmy9qsm58nf2jfwhxlpflv12sc";
|
||||
};
|
||||
|
||||
cargoSha256 = "0arqc0wnvfkmk8xzsdc6fvd1adazrw950ld8xyh7r588pyphjmhn";
|
||||
cargoSha256 = "1r8w5cdygd26m95q9qpqa85aixx25jr510hpjlllbpfvm7zjpbqk";
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
|
|||
--set JAVA_HOME "${jre.home}"
|
||||
|
||||
# install desktop entry and icons
|
||||
cp -r ${icons}/resources/appimage/AppDir/usr $out/
|
||||
cp -r ${icons}/resources/appimage/AppDir/usr/* $out/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ];
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, pandoc, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "passphrase2pgp";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Nje77tn55CKRU6igEA/6IquDhXVVQAdiez6nmN49di4";
|
||||
hash = "sha256-VNOoYYnHsSgiSbVxlBwYUq0JsLa4BwZQSvMVSiyB6rg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs";
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qYxWjvXGaygoe88muQmQWlDJfM04wqxHy8+l7KO688U=";
|
||||
sha256 = "sha256-zU4aSvfW1ph9PrXsAErCOedPn4oeeSh8tpnUj5LRlUw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
|
||||
|
|
|
@ -22,13 +22,13 @@ let
|
|||
++ recommendedDisplayInformationPrograms;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "inxi";
|
||||
version = "3.3.03-1";
|
||||
version = "3.3.04-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smxi";
|
||||
repo = "inxi";
|
||||
rev = version;
|
||||
sha256 = "sha256-OFjhMlBR1QUYUvpuFATCWZWZp2dop30Iz8qVCIK2UN0=";
|
||||
sha256 = "sha256-/EutIHQGLiRcRD/r8LJYG7oJBb7EAhR5cn6QiC7zMOc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -57,6 +57,6 @@ in stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5580,6 +5580,10 @@ in
|
|||
|
||||
infamousPlugins = callPackage ../applications/audio/infamousPlugins { };
|
||||
|
||||
innernet = callPackage ../tools/networking/innernet {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
innoextract = callPackage ../tools/archivers/innoextract { };
|
||||
|
||||
input-utils = callPackage ../os-specific/linux/input-utils { };
|
||||
|
|
Loading…
Reference in a new issue