Merge branch 'master' into staging-next
This commit is contained in:
commit
687d59d7e6
|
@ -7437,6 +7437,16 @@
|
|||
githubId = 667272;
|
||||
name = "Lincoln Lee";
|
||||
};
|
||||
linj = {
|
||||
name = "Lin Jian";
|
||||
email = "me@linj.tech";
|
||||
matrix = "@me:linj.tech";
|
||||
github = "jian-lin";
|
||||
githubId = 75130626;
|
||||
keys = [{
|
||||
fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8";
|
||||
}];
|
||||
};
|
||||
linquize = {
|
||||
email = "linquize@yahoo.com.hk";
|
||||
github = "linquize";
|
||||
|
@ -9605,6 +9615,12 @@
|
|||
githubId = 757752;
|
||||
name = "Jonas Heinrich";
|
||||
};
|
||||
onthestairs = {
|
||||
email = "austinplatt@gmail.com";
|
||||
github = "onthestairs";
|
||||
githubId = 915970;
|
||||
name = "Austin Platt";
|
||||
};
|
||||
ony = {
|
||||
name = "Mykola Orliuk";
|
||||
email = "virkony@gmail.com";
|
||||
|
@ -10325,6 +10341,12 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
ProducerMatt = {
|
||||
name = "Matthew Pherigo";
|
||||
email = "ProducerMatt42@gmail.com";
|
||||
github = "ProducerMatt";
|
||||
githubId = 58014742;
|
||||
};
|
||||
Profpatsch = {
|
||||
email = "mail@profpatsch.de";
|
||||
github = "Profpatsch";
|
||||
|
|
|
@ -843,7 +843,8 @@ in
|
|||
'';
|
||||
};
|
||||
searchAttributes = mkOption {
|
||||
type = types.listOf types.str;
|
||||
type = types.nullOr (types.listOf types.str);
|
||||
default = null;
|
||||
example = [ "displayName" "mail" ];
|
||||
description = ''
|
||||
LDAP attributes to search with.
|
||||
|
@ -866,6 +867,7 @@ in
|
|||
};
|
||||
tlsca = mkOption {
|
||||
type = types.str;
|
||||
default = "/etc/ssl/certs/ca-certificates.crt";
|
||||
example = "server-cert.pem,root.pem";
|
||||
description = ''
|
||||
Root CA for LDAP TLS in PEM format.
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "miniscript";
|
||||
version = "unstable-2020-12-01";
|
||||
version = "unstable-2022-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sipa";
|
||||
repo = pname;
|
||||
rev = "02682a398a35b410571b10cde7f39837141ddad6";
|
||||
sha256 = "079jz4g88cfzfm9a6ykby9haxwcs033c1288mgr8cl2hw4qd2sjl";
|
||||
rev = "ca675488c4aa9605f6ae70c0e68a148a6fb277b4";
|
||||
sha256 = "sha256-kzLIJ0os6UnC0RPEybfw6wGrZpgmRCgj3zifmZjieoU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -1,19 +1,17 @@
|
|||
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook
|
||||
, makeWrapper, cargo, pkg-config, curl, coreutils, boost179, db62, hexdump
|
||||
, libsodium, libevent, testers, utf8cpp, util-linux, withDaemon ? true
|
||||
, withMining ? true, withUtils ? true, withWallet ? true, withZmq ? true, zcash
|
||||
, zeromq
|
||||
{ autoreconfHook, boost179, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
|
||||
, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform, pkg-config
|
||||
, stdenv, testers, utf8cpp, util-linux, zcash, zeromq
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
||||
pname = "zcash";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "zcash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5PlqFs2njqNeZgmNz0VKMWcRY5lPaF9oTsoh/uLEWi8=";
|
||||
sha256 = "sha256-tU6DuWpe8Vlx0qIilAKWuO7WFp1ucbxtvOxoWLA0gdc=";
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.isAarch64 ''
|
||||
|
@ -22,12 +20,15 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
|||
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-eRRRjUbOieRC88wf+f1jAYvqGFmogBEla67NnImicEc=";
|
||||
patches = [
|
||||
./patches/fix-missing-header.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
|
||||
buildInputs = [ boost179 libevent libsodium utf8cpp ]
|
||||
++ lib.optional withWallet db62
|
||||
++ lib.optional withZmq zeromq;
|
||||
cargoSha256 = "sha256-ZWmkveDEENdXRirGmnUWSjtPNJvX0Jpgfxhzk44F7Q0=";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cargo cxx-rs hexdump makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [ boost179 db62 libevent libsodium utf8cpp zeromq ];
|
||||
|
||||
# Use the stdenv default phases (./configure; make) instead of the
|
||||
# ones from buildRustPackage.
|
||||
|
@ -42,15 +43,16 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
|||
configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy")
|
||||
'';
|
||||
|
||||
CXXFLAGS = [
|
||||
"-I${lib.getDev utf8cpp}/include/utf8cpp"
|
||||
"-I${lib.getDev cxx-rs}/include"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-tests"
|
||||
"--with-boost-libdir=${lib.getLib boost179}/lib"
|
||||
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
|
||||
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
|
||||
] ++ lib.optional (!withWallet) "--disable-wallet"
|
||||
++ lib.optional (!withDaemon) "--without-daemon"
|
||||
++ lib.optional (!withUtils) "--without-utils"
|
||||
++ lib.optional (!withMining) "--disable-mining";
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -73,6 +75,5 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
|||
homepage = "https://z.cash/";
|
||||
maintainers = with maintainers; [ rht tkerber centromere ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
--- a/src/uint256.h 2022-07-20 10:07:39.191319302 +0000
|
||||
+++ b/src/uint256.h 2022-07-20 10:07:11.809632293 +0000
|
||||
@@ -7,6 +7,7 @@
|
||||
#ifndef BITCOIN_UINT256_H
|
||||
#define BITCOIN_UINT256_H
|
||||
|
||||
+#include <array>
|
||||
#include <assert.h>
|
||||
#include <cstring>
|
||||
#include <stdexcept>
|
|
@ -90,11 +90,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.41.99";
|
||||
version = "1.41.100";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-SGh2yp6sYtamIZc5YvBwkoAQxYw0Y9KZyVLI/EGS0dg=";
|
||||
sha256 = "sha256-r5mMI7iLJ+q4dvt/IDcFlHz56sygYXsG8bb29UVxmTI=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
@ -45,15 +45,15 @@ assert with lib.strings; (
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "31.1.0";
|
||||
version = "31.1.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4=";
|
||||
sha256 = "sha256-lKD6+mXHWkNLc1XAX5mJGmwgz60P8mH+zrOi2WoOyJU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Too many cores can lead to build flakiness
|
||||
# https://forum.palemoon.org/viewtopic.php?f=5&t=28480
|
||||
export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32))
|
||||
export jobs=$(($NIX_BUILD_CORES<=20 ? $NIX_BUILD_CORES : 20))
|
||||
if [ -z "$enableParallelBuilding" ]; then
|
||||
jobs=1
|
||||
fi
|
||||
|
|
|
@ -19,7 +19,10 @@ ac_add_options --enable-jemalloc
|
|||
ac_add_options --enable-strip
|
||||
ac_add_options --enable-devtools
|
||||
ac_add_options --enable-av1
|
||||
ac_add_options --enable-phoenix-extensions
|
||||
|
||||
ac_add_options --disable-eme
|
||||
ac_add_options --disable-webrtc
|
||||
ac_add_options --disable-gamepad
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-debug
|
||||
|
@ -34,8 +37,10 @@ export MOZILLA_OFFICIAL=1
|
|||
|
||||
ac_add_options --x-libraries=@xlibs@
|
||||
|
||||
# MOZ_PKG_SPECIAL is only relevant for upstream's packaging
|
||||
|
||||
#
|
||||
# NixOS-specific adjustments
|
||||
# NixOS-specific additions
|
||||
#
|
||||
|
||||
ac_add_options --prefix=@prefix@
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.7.1";
|
||||
version = "22.7.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "9431a3315a533799525217e5ba03757b3c39e8259bf307c81330304f043b8b77";
|
||||
sha256 = "d2f0b6f62714495dd14387535ab34c0cf94d1679c5db4a257ef87bb855b7771b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
@ -24,7 +24,7 @@ mkDerivation rec {
|
|||
longDescription = "QOwnNotes is a plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration.";
|
||||
homepage = "https://www.qownnotes.org/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ dtzWill totoroot ];
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smplayer";
|
||||
version = "22.2.0";
|
||||
version = "22.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smplayer-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8=";
|
||||
hash = "sha256-vU+M5aCCGSA+IwJXTLMYvno/Qei+5Hwck3Q/Ah7N09s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
36
pkgs/data/fonts/lexend/default.nix
Normal file
36
pkgs/data/fonts/lexend/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lexend";
|
||||
version = "0.pre+date=2022-01-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = pname;
|
||||
rev = "57e6c14e2a9b457e8376044a31525c2100297e9c";
|
||||
sha256 = "sha256-+tPggQIO50a8kOSnOVN/MR9ZwX5xZqYVNZO79eog9QA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd fonts
|
||||
for f in *; do
|
||||
mkdir -p $out/share/fonts/truetype/lexend/$f
|
||||
install $f/ttf/* $out/share/fonts/truetype/lexend/$f/
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.lexend.com";
|
||||
description = "A variable font family designed to aid in reading proficiency";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
};
|
||||
}
|
72
pkgs/data/icons/colloid-icon-theme/default.nix
Normal file
72
pkgs/data/icons/colloid-icon-theme/default.nix
Normal file
|
@ -0,0 +1,72 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, jdupes
|
||||
, schemeVariants ? []
|
||||
, colorVariants ? [] # default is blue
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "colloid-icon-theme";
|
||||
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" ] schemeVariants
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2022-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0lUdsTjIfZ76Mm327jE1uudxtKVQbt17fsel6c2RdVM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gtk3
|
||||
jdupes
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
# These fixup steps are slow and unnecessary for this package.
|
||||
# Package may install almost 400 000 small files.
|
||||
dontPatchELF = true;
|
||||
dontRewriteSymlinks = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
name= ./install.sh \
|
||||
${lib.optionalString (schemeVariants != []) ("--scheme " + builtins.toString schemeVariants)} \
|
||||
${lib.optionalString (colorVariants != []) ("--theme " + builtins.toString colorVariants)} \
|
||||
--dest $out/share/icons
|
||||
|
||||
jdupes --quiet --link-soft --recurse $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Colloid icon theme";
|
||||
homepage = "https://github.com/vinceliuice/colloid-icon-theme";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
46
pkgs/data/themes/colloid-kde/default.nix
Normal file
46
pkgs/data/themes/colloid-kde/default.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "colloid-kde";
|
||||
version = "unstable-2022-07-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "eaf6844e997aa60c755af7ea560ffba798e72ff5";
|
||||
hash = "sha256-FNTG5aVvTWHqNVVR23LFG/ykPtXRD7oH5C6eyWaqc60=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh
|
||||
|
||||
substituteInPlace install.sh \
|
||||
--replace '$HOME/.local' $out \
|
||||
--replace '$HOME/.config' $out/share
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/latte
|
||||
|
||||
name= HOME="$TMPDIR" \
|
||||
./install.sh --dest $out/share/themes
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A clean and concise theme for KDE Plasma desktop";
|
||||
homepage = "https://github.com/vinceliuice/Colloid-kde-theme";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fmt_8
|
||||
, staticBuild ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
let
|
||||
generic = { version, sha256 }:
|
||||
|
@ -18,8 +20,8 @@ let
|
|||
propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
"-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
|
||||
"-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"
|
||||
"-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}"
|
||||
"-DSPDLOG_BUILD_EXAMPLE=OFF"
|
||||
"-DSPDLOG_BUILD_BENCH=OFF"
|
||||
"-DSPDLOG_BUILD_TESTS=ON"
|
||||
|
|
34
pkgs/development/python-modules/classify-imports/default.nix
Normal file
34
pkgs/development/python-modules/classify-imports/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "classify-imports";
|
||||
version = "4.1.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"classify_imports"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utilities for refactoring imports in python-like syntax";
|
||||
homepage = "https://github.com/asottile/classify-imports";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IGrWHlWkydGyyQAvagvhzd2vcLQwTZHoasrMC9M/smw=";
|
||||
hash = "sha256-T8A6vU1m7nlHpTMC62IpgsQGh3ksuBp1ty4GkjN+2T8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-videointelligence";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UqPwa3OogA2MLm0eCwl2fWSz5Pu6wc6SfiDIF/y8k9I=";
|
||||
sha256 = "sha256-d5sEMQxHUTrCmGJehsFHBPK79YhpnscTGk9ilKpwrUQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core proto-plus ];
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyAudio";
|
||||
version = "0.2.11";
|
||||
version = "0.2.12";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74";
|
||||
sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54=";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.portaudio ];
|
||||
|
|
|
@ -4,21 +4,25 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, aspy-refactor-imports
|
||||
, classify-imports
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reorder-python-imports";
|
||||
version = "3.1.0";
|
||||
version = "3.8.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = "reorder_python_imports";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ge+VQjK24TqWLMQS19DBX+FFHF3irogK21orlENJx50=";
|
||||
hash = "sha256-CLC9dfNSYqEBZB2fP34jpA/4cxm0HZzjo/e7Yn8XPFc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aspy-refactor-imports ];
|
||||
propagatedBuildInputs = [
|
||||
aspy-refactor-imports
|
||||
classify-imports
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"reorder_python_imports"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, python3
|
||||
, python
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace ./tests/unit/conftest.py --replace \
|
||||
"os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \
|
||||
"\"${placeholder "out"}/${python3.sitePackages}/reqif\""
|
||||
"\"${placeholder "out"}/${python.sitePackages}/reqif\""
|
||||
substituteInPlace pyproject.toml --replace "^" ">="
|
||||
substituteInPlace requirements.txt --replace "==" ">="
|
||||
'';
|
||||
|
|
30
pkgs/development/tools/benthos/default.nix
Normal file
30
pkgs/development/tools/benthos/default.nix
Normal file
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "benthos";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benthosdev";
|
||||
repo = "benthos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tRB9eTeyEyPkiR/sph76CMbPjJUNoDzfYuHmtFAzY7E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nnaBQ7ADdAdo/+RQzXJHBBpXgTmxny0O/ij+eWsS5YM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [
|
||||
"cmd/benthos"
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fancy stream processing made operationally mundane";
|
||||
homepage = "https://www.benthos.dev";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sagikazarmark ];
|
||||
};
|
||||
}
|
|
@ -1,17 +1,17 @@
|
|||
{
|
||||
"version": "0.1.9",
|
||||
"version": "0.1.10",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "10lirk7h0ir2k20rf0xl72642axdhik8g66lcbyn689jybj6vks6"
|
||||
"sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "10lirk7h0ir2k20rf0xl72642axdhik8g66lcbyn689jybj6vks6"
|
||||
"sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "11h471rcds0b396r6nqadzmny5dvmz8rxh1kwcj4bldss2mdcckz"
|
||||
"sha256": "0wjqrkmhk1pjf02c44nffbcgsdq5x9sswjwjfvcs33qpvc712f30"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,27 +2,27 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.20";
|
||||
version = "0.2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TlysP5xf8LJoB9MU/sdQIM6yMfsaI8SP+drRlfG+tQ4=";
|
||||
sha256 = "sha256-O2Y1F0IjsCfOvTZdOeuvRj5t7UXO9A8sUOgj/1TwuFw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pE6g5z4rOQlqmI9LZQXoI6fRmSTXDv5H8Y+pNXVIcOU=";
|
||||
vendorSha256 = "sha256-zoa17vU2049FJj+Ns3AV01XEMMWzzJ9HSpKp1Hl6CCU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Revision=${version}" ];
|
||||
ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A portable devkit for CICD pipelines";
|
||||
homepage = "https://dagger.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jfroche ];
|
||||
maintainers = with maintainers; [ jfroche sagikazarmark ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,28 +1,25 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cpm";
|
||||
version = "0.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpm-cmake";
|
||||
repo = "CPM.cmake";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Oon/5iwkUUASsUDvde69iEwLe8/CAzwYKYsyzH5K+V0=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake";
|
||||
sha256 = "sha256-CMge+NpJRU+G+c+s0tb2EN8UG6E8FE90lIvcULggYXY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p ${placeholder "out"}/share/cpm/
|
||||
cp ./cmake/CPM.cmake ${placeholder "out"}/share/cpm/
|
||||
install -Dm644 $src $out/share/cpm/CPM.cmake
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facetimehd-${version}-${kernel.version}";
|
||||
version = "unstable-2020-04-16";
|
||||
version = "0.5.18";
|
||||
|
||||
# Note: When updating this revision:
|
||||
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
|
||||
|
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
|||
# still works.
|
||||
src = fetchFromGitHub {
|
||||
owner = "patjak";
|
||||
repo = "bcwc_pcie";
|
||||
rev = "82626d4892eeb9eb704538bf0dc49a00725ff451";
|
||||
sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx";
|
||||
repo = "facetimehd";
|
||||
rev = version;
|
||||
sha256 = "sha256-UO8t2zrfdJlu4uzhhyWOuHIjJNVezIq3nUPGZeW/KJU=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -39,6 +39,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ womfoo grahamc kraem ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
broken = kernel.kernelAtLeast "5.18";
|
||||
};
|
||||
}
|
||||
|
|
34
pkgs/os-specific/linux/qc71_laptop/default.nix
Normal file
34
pkgs/os-specific/linux/qc71_laptop/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qc71_laptop";
|
||||
version = "unstable-2022-06-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pobrn";
|
||||
repo = "qc71_laptop";
|
||||
rev = "28106e0602807d78d1f5fa220ab6148dd6477c1c";
|
||||
hash = "sha256-3bhw2HbEVuxPfGMt/eE2nCuMLHzYHRY3nRWPzZxKHro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"VERSION=${version}"
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D qc71_laptop.ko -t $out/lib/modules/${kernel.modDirVersion}/extra
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux driver for QC71 laptop";
|
||||
homepage = "https://github.com/pobrn/qc71_laptop/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ aacebedo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -0,0 +1,26 @@
|
|||
From 922d3dd36ac72b29ea21c4c728a922b43b19400e Mon Sep 17 00:00:00 2001
|
||||
From: Francesco Gazzetta <fgaz@fgaz.me>
|
||||
Date: Tue, 14 Jun 2022 17:55:43 +0200
|
||||
Subject: [PATCH] Another Qt5 fix
|
||||
|
||||
---
|
||||
qtsingleapplication/qtlocalpeer.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp
|
||||
index 4a84036..e6ccc72 100644
|
||||
--- a/qtsingleapplication/qtlocalpeer.cpp
|
||||
+++ b/qtsingleapplication/qtlocalpeer.cpp
|
||||
@@ -41,6 +41,9 @@
|
||||
|
||||
#include "qtlocalpeer.h"
|
||||
#include <QCoreApplication>
|
||||
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
|
||||
+#include <QDataStream>
|
||||
+#endif
|
||||
#include <QTime>
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
--
|
||||
2.36.0
|
||||
|
|
@ -1,21 +1,35 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, qmake4Hook
|
||||
, qt4
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qremotecontrol-server";
|
||||
version = "2.4.1";
|
||||
version = "unstable-2014-11-05"; # basically 2.4.2 + qt5
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/qrc/${version}/qremotecontrol-${version}.tar.bz2";
|
||||
sha256 = "07hzc9959a56b49jgmcv8ry8b9sppklvqs9kns3qjj3v9d22nbrp";
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/qrc/gitcode";
|
||||
rev = "8f1c55eac10ac8af974c3c20157d90ef57f7308a";
|
||||
sha256 = "sha256-AfFScec5/emG/f+yc5Zn37USIEWzGP/sBifE6Kx8d0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
buildInputs = [ qt4 xorg.libXtst ];
|
||||
patches = [
|
||||
./0001-fix-qt5-build-include-QDataStream.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace QRemoteControl-Server.pro \
|
||||
|
@ -26,8 +40,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
homepage = "https://qremote.org/";
|
||||
downloadPage = "https://qremote.org/download.php#Download";
|
||||
homepage = "https://sourceforge.net/projects/qrc/";
|
||||
description = "Remote control your desktop from your mobile";
|
||||
longDescription = ''
|
||||
With QRemoteControl installed on your desktop you can easily control
|
||||
|
@ -43,4 +56,3 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
};
|
||||
}
|
||||
|
||||
|
|
22
pkgs/tools/admin/cw/default.nix
Normal file
22
pkgs/tools/admin/cw/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib, stdenv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cw";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucagrulla";
|
||||
repo = "cw";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JsWwvVEr7kSjUy0S6wVcn24Xyo4OHr5/uqmnjw6v+RI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8L4q0IAvmNk5GCAC5agNfWFtokIkddO1Dec4m6/sWfg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The best way to tail AWS CloudWatch Logs from your terminal";
|
||||
homepage = "https://github.com/lucagrulla/cw";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ onthestairs ];
|
||||
};
|
||||
}
|
23
pkgs/tools/misc/didu/default.nix
Normal file
23
pkgs/tools/misc/didu/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ lib, rustPlatform, fetchFromGitea }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "didu";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "annaaurora";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Duration conversion between units";
|
||||
homepage = "https://codeberg.org/annaaurora/didu";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ annaaurora ];
|
||||
};
|
||||
}
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eget";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyedidia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+sl98pOc3YSy7LnEWsoPQwUtmY/pgMKOX73glzu+3MM=";
|
||||
sha256 = "sha256-b1KQjYs9chx724HSSHhaMTQQBzTXx+ssrxNButJE6L0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-axJqi41Fj+MJnaLzSOnSws9/c/0dSkUAtaWkVXNmFxI=";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, unzip, curl, hwloc, gmp }:
|
||||
{ stdenv, lib, fetchurl, unzip, boost, curl, hwloc, gmp }:
|
||||
|
||||
let
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
@ -18,11 +18,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mprime";
|
||||
version = "29.8b7";
|
||||
version = "30.8b15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip";
|
||||
sha256 = "0x5dk2dcppfnq17n79297lmn6p56rd66cbwrh1ds4l8r4hmwsjaj";
|
||||
hash = "sha256-CNYorZStHV0aESGX9LfLZ4oD5PFR2UOFLN1MiLaKw58=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
buildInputs = [ curl hwloc gmp ];
|
||||
buildInputs = [ boost curl hwloc gmp ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
19
pkgs/tools/misc/tere/brokentest.patch
Normal file
19
pkgs/tools/misc/tere/brokentest.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
diff --git a/src/app_state.rs b/src/app_state.rs
|
||||
index e44acb6..713642a 100644
|
||||
--- a/src/app_state.rs
|
||||
+++ b/src/app_state.rs
|
||||
@@ -1272,7 +1272,7 @@ mod tests {
|
||||
assert_eq!(s.cursor_pos, 1);
|
||||
assert_eq!(s.scroll_pos, 2);
|
||||
}
|
||||
-
|
||||
+ /*
|
||||
#[test]
|
||||
fn test_advance_search_with_filter_search_and_scrolling2() {
|
||||
let mut s = create_test_state_with_buf(
|
||||
@@ -1302,4 +1302,5 @@ mod tests {
|
||||
assert_eq!(s.cursor_pos, 1);
|
||||
assert_eq!(s.scroll_pos, 0);
|
||||
}
|
||||
+ */
|
||||
}
|
26
pkgs/tools/misc/tere/default.nix
Normal file
26
pkgs/tools/misc/tere/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tere";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgunyho";
|
||||
repo = "tere";
|
||||
rev = "v${version}";
|
||||
sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs=";
|
||||
|
||||
# This test confirmed not working.
|
||||
# https://github.com/mgunyho/tere/issues/44
|
||||
cargoPatches = [ ./brokentest.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A faster alternative to cd + ls";
|
||||
homepage = "https://github.com/mgunyho/tere";
|
||||
license = licenses.eupl12;
|
||||
maintainers = with maintainers; [ ProducerMatt ];
|
||||
};
|
||||
}
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "boringtun";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
rev = "boringtun-cli-${version}";
|
||||
sha256 = "sha256-s7Nl95VShBMD4Zid2LeRPftSx5R2G+4tHBXgrC1I7vU=";
|
||||
sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-308zydrhOZS5h16DEp9ctrhtB2bv9Tmwutgj5+uc4Lw=";
|
||||
cargoSha256 = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lldpd";
|
||||
version = "1.0.13";
|
||||
version = "1.0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE=";
|
||||
sha256 = "sha256-p0gZIU8Ral28QHo9SQyqAbpAGiSVF6yCajdAWcEtEug=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
35
pkgs/tools/system/kanata/default.nix
Normal file
35
pkgs/tools/system/kanata/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{ fetchFromGitHub
|
||||
, lib
|
||||
, libevdev
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, withCmd ? false
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanata";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sL9hP+222i8y0sK3ZEx66yXBTgZp5ewoPUlZS4XnphY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uhN1UdwtU0C0/lpxUYoCcMLABFTPNO5wKsIGOBnFpzw=";
|
||||
|
||||
buildFeatures = lib.optional withCmd "cmd";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libevdev ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform advanced keyboard customization tool";
|
||||
homepage = "https://github.com/jtroo/kanata";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ linj ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -276,6 +276,8 @@ with pkgs;
|
|||
|
||||
bakelite = callPackage ../tools/backup/bakelite { };
|
||||
|
||||
benthos = callPackage ../development/tools/benthos {};
|
||||
|
||||
beyond-identity = callPackage ../tools/security/beyond-identity {};
|
||||
|
||||
bingo = callPackage ../development/tools/bingo {};
|
||||
|
@ -518,6 +520,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
didu = callPackage ../tools/misc/didu { };
|
||||
|
||||
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
|
||||
|
||||
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
|
||||
|
@ -1227,6 +1231,8 @@ with pkgs;
|
|||
|
||||
httm = callPackage ../tools/filesystems/httm { };
|
||||
|
||||
kanata = callPackage ../tools/system/kanata { };
|
||||
|
||||
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
|
||||
|
||||
kubevirt = callPackage ../tools/virtualization/kubevirt { };
|
||||
|
@ -1269,6 +1275,8 @@ with pkgs;
|
|||
|
||||
tauon = callPackage ../applications/audio/tauon { };
|
||||
|
||||
tere = callPackage ../tools/misc/tere { };
|
||||
|
||||
termusic = callPackage ../applications/audio/termusic { };
|
||||
|
||||
tfk8s = callPackage ../tools/misc/tfk8s { };
|
||||
|
@ -2093,6 +2101,8 @@ with pkgs;
|
|||
|
||||
crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; };
|
||||
|
||||
cw = callPackage ../tools/admin/cw { };
|
||||
|
||||
ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
|
||||
|
||||
ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
|
||||
|
@ -4045,6 +4055,8 @@ with pkgs;
|
|||
|
||||
lepton-eda = callPackage ../applications/science/electronics/lepton-eda { };
|
||||
|
||||
lexend = callPackage ../data/fonts/lexend { };
|
||||
|
||||
lexicon = callPackage ../tools/admin/lexicon { };
|
||||
|
||||
lief = callPackage ../development/libraries/lief {
|
||||
|
@ -22965,7 +22977,7 @@ with pkgs;
|
|||
|
||||
qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
|
||||
|
||||
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };
|
||||
qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
|
||||
|
||||
rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
|
||||
|
@ -24673,8 +24685,12 @@ with pkgs;
|
|||
|
||||
colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { };
|
||||
|
||||
colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { };
|
||||
|
||||
comfortaa = callPackage ../data/fonts/comfortaa {};
|
||||
|
||||
colloid-kde = callPackage ../data/themes/colloid-kde {};
|
||||
|
||||
comic-mono = callPackage ../data/fonts/comic-mono { };
|
||||
|
||||
comic-neue = callPackage ../data/fonts/comic-neue { };
|
||||
|
@ -31946,7 +31962,9 @@ with pkgs;
|
|||
boost = boost175;
|
||||
};
|
||||
|
||||
zcash = callPackage ../applications/blockchains/zcash { };
|
||||
zcash = callPackage ../applications/blockchains/zcash {
|
||||
stdenv = if stdenv.isDarwin then stdenv else llvmPackages_13.stdenv;
|
||||
};
|
||||
|
||||
lightwalletd = callPackage ../applications/blockchains/lightwalletd { };
|
||||
|
||||
|
|
|
@ -497,6 +497,8 @@ in {
|
|||
|
||||
can-isotp = callPackage ../os-specific/linux/can-isotp { };
|
||||
|
||||
qc71_laptop = callPackage ../os-specific/linux/qc71_laptop { };
|
||||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
|
||||
});
|
||||
|
|
|
@ -1720,6 +1720,8 @@ in {
|
|||
|
||||
claripy = callPackage ../development/python-modules/claripy { };
|
||||
|
||||
classify-imports = callPackage ../development/python-modules/classify-imports { };
|
||||
|
||||
cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };
|
||||
|
||||
cle = callPackage ../development/python-modules/cle { };
|
||||
|
|
Loading…
Reference in a new issue