Merge master into staging-next
This commit is contained in:
commit
f214722172
10
.github/labeler.yml
vendored
10
.github/labeler.yml
vendored
|
@ -36,11 +36,11 @@
|
||||||
|
|
||||||
"6.topic: GNOME":
|
"6.topic: GNOME":
|
||||||
- doc/languages-frameworks/gnome.section.md
|
- doc/languages-frameworks/gnome.section.md
|
||||||
- nixos/modules/services/desktops/gnome3/**/*
|
- nixos/modules/services/desktops/gnome/**/*
|
||||||
- nixos/modules/services/x11/desktop-managers/gnome3.nix
|
- nixos/modules/services/x11/desktop-managers/gnome.nix
|
||||||
- nixos/tests/gnome3-xorg.nix
|
- nixos/tests/gnome-xorg.nix
|
||||||
- nixos/tests/gnome3.nix
|
- nixos/tests/gnome.nix
|
||||||
- pkgs/desktops/gnome-3/**/*
|
- pkgs/desktops/gnome/**/*
|
||||||
|
|
||||||
"6.topic: golang":
|
"6.topic: golang":
|
||||||
- doc/languages-frameworks/go.section.md
|
- doc/languages-frameworks/go.section.md
|
||||||
|
|
|
@ -6380,6 +6380,12 @@
|
||||||
fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94";
|
fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94";
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
mdsp = {
|
||||||
|
github = "Mdsp9070";
|
||||||
|
githubId = 44469426;
|
||||||
|
name = "Matheus de Souza Pessanha";
|
||||||
|
email = "matheus_pessanha2001@outlook.com";
|
||||||
|
};
|
||||||
meatcar = {
|
meatcar = {
|
||||||
email = "nixpkgs@denys.me";
|
email = "nixpkgs@denys.me";
|
||||||
github = "meatcar";
|
github = "meatcar";
|
||||||
|
|
|
@ -8,6 +8,18 @@ let
|
||||||
username = config.users.users.mirakurun.name;
|
username = config.users.users.mirakurun.name;
|
||||||
groupname = config.users.users.mirakurun.group;
|
groupname = config.users.users.mirakurun.group;
|
||||||
settingsFmt = pkgs.formats.yaml {};
|
settingsFmt = pkgs.formats.yaml {};
|
||||||
|
|
||||||
|
polkitRule = pkgs.writeTextDir "share/polkit-1/rules.d/10-mirakurun.rules" ''
|
||||||
|
polkit.addRule(function (action, subject) {
|
||||||
|
if (
|
||||||
|
(action.id == "org.debian.pcsc-lite.access_pcsc" ||
|
||||||
|
action.id == "org.debian.pcsc-lite.access_card") &&
|
||||||
|
subject.user == "${username}"
|
||||||
|
) {
|
||||||
|
return polkit.Result.YES;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
|
@ -48,6 +60,15 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
allowSmartCardAccess = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = ''
|
||||||
|
Install polkit rules to allow Mirakurun to access smart card readers
|
||||||
|
which is commonly used along with tuner devices.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
serverSettings = mkOption {
|
serverSettings = mkOption {
|
||||||
type = settingsFmt.type;
|
type = settingsFmt.type;
|
||||||
default = {};
|
default = {};
|
||||||
|
@ -110,7 +131,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = [ mirakurun ];
|
environment.systemPackages = [ mirakurun ] ++ optional cfg.allowSmartCardAccess polkitRule;
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
"mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings;
|
"mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings;
|
||||||
"mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) {
|
"mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) {
|
||||||
|
|
|
@ -13,10 +13,10 @@ let
|
||||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||||
|
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2";
|
x86_64-linux = "1p68fvlr2fwrwr61gfrna3hjzgyazacr373hldbc4fxca3fdij76";
|
||||||
x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb";
|
x86_64-darwin = "0wyihr2yfzjaypsa682zdklfxn3m7zca81brkzdvrndw24hdcl8m";
|
||||||
aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w";
|
aarch64-linux = "0iw471n1fl8m2x06n2rdbkiwzhlc7lhk99vyql3z4fi0zyjy3pbn";
|
||||||
armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4";
|
armv7l-linux = "0dx1icp245cfx3hkkpzzgfg9y8sv45llx35s03w1zzga2h2vhm3a";
|
||||||
}.${system};
|
}.${system};
|
||||||
|
|
||||||
sourceRoot = {
|
sourceRoot = {
|
||||||
|
@ -33,7 +33,7 @@ in
|
||||||
|
|
||||||
# Please backport all compatible updates to the stable release.
|
# Please backport all compatible updates to the stable release.
|
||||||
# This is important for the extension ecosystem.
|
# This is important for the extension ecosystem.
|
||||||
version = "1.56.0";
|
version = "1.56.1";
|
||||||
pname = "vscodium";
|
pname = "vscodium";
|
||||||
|
|
||||||
executableName = "codium";
|
executableName = "codium";
|
||||||
|
|
|
@ -31,15 +31,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dev": {
|
"dev": {
|
||||||
"version": "92.0.4496.0",
|
"version": "92.0.4503.0",
|
||||||
"sha256": "1kk1bybl6nx3z80agyljsvdb7yi3nna14aag71xhv4n6pygqfgdi",
|
"sha256": "1fp4xz6x80m3ipcy4myzazyy1yj95qamyl6wf38mk2i6302gi2gb",
|
||||||
"sha256bin64": "0b12ab20g5vay9x8j1zpj9zapdmm3him7rrm15jvsdakn60czdpr",
|
"sha256bin64": "0fwq8rn3v1dijj9xh6z7jw3xx2ihq0qcyh3bbcdd066w5ny6padm",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2021-04-29",
|
"version": "2021-05-07",
|
||||||
"url": "https://gn.googlesource.com/gn",
|
"url": "https://gn.googlesource.com/gn",
|
||||||
"rev": "6771ce569fb4803dad7a427aa2e2c23e960b917e",
|
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
|
||||||
"sha256": "0lv1zs38qr862hwxrd3g6wz3l6v8j6p7b60nxyc5fhiglqxqz0im"
|
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -25,7 +25,7 @@ let
|
||||||
else "");
|
else "");
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "signal-desktop";
|
pname = "signal-desktop";
|
||||||
version = "5.0.0"; # Please backport all updates to the stable channel.
|
version = "5.1.0"; # Please backport all updates to the stable channel.
|
||||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||||
# When releases "expire" the application becomes unusable until an update is
|
# When releases "expire" the application becomes unusable until an update is
|
||||||
# applied. The expiration date for the current release can be extracted with:
|
# applied. The expiration date for the current release can be extracted with:
|
||||||
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||||
sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g";
|
sha256 = "1cirnnxy63jfkl98472k25bn1yp5apa7b5s74r42sxhlwzwkplw1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -79,6 +79,7 @@ in stdenv.mkDerivation rec {
|
||||||
pango
|
pango
|
||||||
systemd
|
systemd
|
||||||
xorg.libxcb
|
xorg.libxcb
|
||||||
|
xorg.libxshmfence
|
||||||
];
|
];
|
||||||
|
|
||||||
runtimeDependencies = [
|
runtimeDependencies = [
|
||||||
|
|
|
@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "librealsense";
|
pname = "librealsense";
|
||||||
version = "2.43.0";
|
version = "2.45.0";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -15,17 +15,18 @@ stdenv.mkDerivation rec {
|
||||||
owner = "IntelRealSense";
|
owner = "IntelRealSense";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs=";
|
sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libusb1
|
libusb1
|
||||||
gcc.cc.lib
|
gcc.cc.lib
|
||||||
] ++ lib.optional cudaSupport cudatoolkit
|
] ++ lib.optional cudaSupport cudatoolkit
|
||||||
++ lib.optional enablePython pythonPackages.python;
|
++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]);
|
||||||
|
|
||||||
patches = lib.optionals enablePython [
|
patches = lib.optionals enablePython [
|
||||||
./py_sitepackage_dir.patch
|
./py_sitepackage_dir.patch
|
||||||
|
./py_pybind11_no_external_download.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
|
||||||
|
Date: Mon, 10 May 2021 17:26:04 -0400
|
||||||
|
Subject: [PATCH 1/1] V1
|
||||||
|
|
||||||
|
---
|
||||||
|
wrappers/python/CMakeLists.txt | 15 +--------------
|
||||||
|
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
|
||||||
|
index aa83e4c77..4ec92ccfa 100644
|
||||||
|
--- a/wrappers/python/CMakeLists.txt
|
||||||
|
+++ b/wrappers/python/CMakeLists.txt
|
||||||
|
@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(DEPENDENCIES realsense2)
|
||||||
|
-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen),
|
||||||
|
-# we copy the external project declaration to the build folder and then execute it
|
||||||
|
-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt)
|
||||||
|
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
||||||
|
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11"
|
||||||
|
-)
|
||||||
|
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
|
||||||
|
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11"
|
||||||
|
-)
|
||||||
|
|
||||||
|
-# Add pybind11 makefile
|
||||||
|
-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11"
|
||||||
|
- "${CMAKE_BINARY_DIR}/third-party/pybind11"
|
||||||
|
- EXCLUDE_FROM_ALL
|
||||||
|
-)
|
||||||
|
+find_package(pybind11 REQUIRED)
|
||||||
|
|
||||||
|
set(PYBIND11_CPP_STANDARD -std=c++11)
|
||||||
|
# Force Pybind11 not to share pyrealsense2 resources with other pybind modules.
|
||||||
|
--
|
||||||
|
2.29.3
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "imap-tools";
|
pname = "imap-tools";
|
||||||
version = "0.40.0";
|
version = "0.41.0";
|
||||||
|
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||||
owner = "ikvk";
|
owner = "ikvk";
|
||||||
repo = "imap_tools";
|
repo = "imap_tools";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A=";
|
sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, requests
|
, requests
|
||||||
|
, cryptography
|
||||||
, python
|
, python
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -17,7 +18,7 @@ buildPythonPackage rec {
|
||||||
sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1";
|
sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests ];
|
propagatedBuildInputs = [ requests cryptography ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
${python.interpreter} test/test.py
|
${python.interpreter} test/test.py
|
||||||
|
|
28
pkgs/development/tools/earthly/default.nix
Normal file
28
pkgs/development/tools/earthly/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
{ lib, buildGoModule, fetchFromGitHub }:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "earthly";
|
||||||
|
version = "0.5.11";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "earthly";
|
||||||
|
repo = "earthly";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/debugger $out/bin/earthly-debugger
|
||||||
|
mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Build automation for the container era";
|
||||||
|
homepage = "https://earthly.dev/";
|
||||||
|
changelog = "https://github.com/earthly/earthly/releases/tag/v${version}";
|
||||||
|
license = licenses.mpl20;
|
||||||
|
maintainers = with maintainers; [ mdsp ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,16 +2,18 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sndio";
|
pname = "sndio";
|
||||||
version = "1.7.0";
|
version = "1.8.0";
|
||||||
enableParallelBuilding = true;
|
|
||||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
|
||||||
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.sndio.org/sndio-${version}.tar.gz";
|
url = "http://www.sndio.org/sndio-${version}.tar.gz";
|
||||||
sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x";
|
sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||||
|
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://www.sndio.org";
|
homepage = "http://www.sndio.org";
|
||||||
description = "Small audio and MIDI framework part of the OpenBSD project";
|
description = "Small audio and MIDI framework part of the OpenBSD project";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
|
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "agate";
|
pname = "agate";
|
||||||
|
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko=";
|
cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# Username and Password use the same ports and causes collision
|
# Username and Password use the same ports and causes collision
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
{ lib, stdenv, fetchurl, apacheHttpd, python2 }:
|
{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "mod_python-3.5.0";
|
pname = "mod_python";
|
||||||
|
version = "3.5.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://dist.modpython.org/dist/${name}.tgz";
|
url = "http://dist.modpython.org/dist/${pname}-${version}.tgz";
|
||||||
sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
|
sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
passthru = { inherit apacheHttpd; };
|
passthru = { inherit apacheHttpd; };
|
||||||
|
|
||||||
buildInputs = [ apacheHttpd python2 ];
|
buildInputs = [ apacheHttpd python2 ]
|
||||||
|
++ lib.optional stdenv.isDarwin libintl;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://modpython.org/";
|
homepage = "http://modpython.org/";
|
||||||
|
|
|
@ -1,24 +1,30 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub, lepton }:
|
{ lib, makeWrapper, buildGoModule, fetchFromGitHub, lepton }:
|
||||||
|
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "gb-backup";
|
pname = "gb-backup";
|
||||||
version = "unstable-2021-03-06";
|
version = "unstable-2021-04-07";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "leijurv";
|
owner = "leijurv";
|
||||||
repo = "gb";
|
repo = "gb";
|
||||||
rev = "5a94e60148628fc7796d15c53d0ed87184322053";
|
rev = "904813bf0bbce048af5795618d58c0b1953f9ff8";
|
||||||
sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm";
|
sha256 = "111jrcv4x38sc19xha5q3pd2297s13qh1maa7sa1k09hgypvgsxf";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx";
|
vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx";
|
||||||
|
|
||||||
buildInputs = [ lepton ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
checkInputs = [ lepton ];
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]}
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Gamer Backup, a super opinionated cloud backup system";
|
description = "Gamer Backup, a super opinionated cloud backup system";
|
||||||
license = licenses.agpl3Only;
|
license = licenses.agpl3Only;
|
||||||
maintainers = with maintainers; [ babbaj ];
|
maintainers = with maintainers; [ babbaj ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,20 @@
|
||||||
{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config
|
{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config
|
||||||
, lz4, lzo, xz, zlib, zstd
|
, bzip2, lz4, lzo, xz, zlib, zstd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "squashfs-tools-ng";
|
pname = "squashfs-tools-ng";
|
||||||
version = "1.1.0";
|
version = "1.1.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
|
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
|
||||||
sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi";
|
sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
|
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];
|
||||||
buildInputs = [ zlib xz lz4 lzo zstd ];
|
buildInputs = [ bzip2 zlib xz lz4 lzo zstd ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/AgentD/squashfs-tools-ng";
|
homepage = "https://github.com/AgentD/squashfs-tools-ng";
|
||||||
|
|
|
@ -2415,6 +2415,8 @@ in
|
||||||
|
|
||||||
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
|
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
|
||||||
|
|
||||||
|
earthly = callPackage ../development/tools/earthly { };
|
||||||
|
|
||||||
earlybird = callPackage ../tools/security/earlybird { };
|
earlybird = callPackage ../tools/security/earlybird { };
|
||||||
|
|
||||||
earlyoom = callPackage ../os-specific/linux/earlyoom { };
|
earlyoom = callPackage ../os-specific/linux/earlyoom { };
|
||||||
|
|
Loading…
Reference in a new issue