Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b08c9b444b
30 changed files with 599 additions and 342 deletions
16
nixos/modules/hardware/keyboard/teck.nix
Normal file
16
nixos/modules/hardware/keyboard/teck.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.hardware.keyboard.teck;
|
||||
in
|
||||
{
|
||||
options.hardware.keyboard.teck = {
|
||||
enable = mkEnableOption "non-root access to the firmware of TECK keyboards";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.teck-udev-rules ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -49,6 +49,7 @@
|
|||
./hardware/i2c.nix
|
||||
./hardware/sensor/hddtemp.nix
|
||||
./hardware/sensor/iio.nix
|
||||
./hardware/keyboard/teck.nix
|
||||
./hardware/keyboard/zsa.nix
|
||||
./hardware/ksm.nix
|
||||
./hardware/ledger.nix
|
||||
|
|
|
|||
|
|
@ -90,11 +90,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.21.77";
|
||||
version = "1.23.71";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "Q7paeGAvdmc4+FP28ASLlJhN1ui7M5fDpxnrh+gbEm4=";
|
||||
sha256 = "17ajn1vx5xwlp2yvjf1hr8vw3b7hiribv5gaipyb37zrhkff241h";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.5-k3s1" }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.6-k3s1" }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.4.1";
|
||||
|
||||
excludedPackages = "tools";
|
||||
version = "4.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u9P+7qNomamd4BkqWBxA6rDom0hF6t10QfDTjqOMGeE=";
|
||||
sha256 = "sha256-6BDetNPWyAVZOsnCWs90HljVpfUlAytFDPQ/SqPxwgg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
excludedPackages = "\\(tools\\|docgen\\)";
|
||||
|
||||
preBuild = let t = "github.com/rancher/k3d/v4/version"; in
|
||||
''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}")
|
||||
|
|
|
|||
|
|
@ -26,23 +26,25 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zNEjhBya2loqFYS8Rjs8CMCfvie2/UbxreF8CUwDWWk=";
|
||||
sha256 = "sha256-500Qlxpqkf+9D/jrzkrYkkFwxs0soLG/I5mgFV1UOc8=";
|
||||
};
|
||||
|
||||
jmpDist = fetchzip {
|
||||
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-1/dist.zip";
|
||||
sha256 = "sha256-oTZyIh2m9z55sNIeKtHxVijBMcTtJgpojG5HUToMYoA=";
|
||||
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-2/dist.zip";
|
||||
sha256 = "sha256-9oxOcSCV1Gm8WLpwVLanyUlhPx5PWUrkkWvKmwND94g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# the webclient-files are not copied in the regular build script. Copy them just like the linux build
|
||||
./fix-osx-resources.patch
|
||||
# disable update notifications since the end user can't simply download the release artifacts to update
|
||||
./disable-update-notifications.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json
|
||||
index 20fff81..9979de5 100644
|
||||
--- a/resources/settings/settings_description.json
|
||||
+++ b/resources/settings/settings_description.json
|
||||
@@ -118,7 +118,7 @@
|
||||
},
|
||||
{
|
||||
"value": "checkForUpdates",
|
||||
- "default": true
|
||||
+ "default": false
|
||||
},
|
||||
{
|
||||
"value": "enableInputRepeat",
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, breeze-icons
|
||||
|
|
@ -8,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luna-icons";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15";
|
||||
sha256 = "0kjnmclil21m9vgybk958nzzlbwryp286rajlgxg05wgjnby4cxk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplacebo";
|
||||
version = "3.120.1";
|
||||
version = "3.120.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "code.videolan.org";
|
||||
owner = "videolan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0x7jyzsdf884jrky4yci151pk4nzsz1w88wz8sk0cqing7bpaq16";
|
||||
sha256 = "0wh5w7bx789ynnzr27xi0csql4jaxq80csawg6znabw3ld54wb86";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
|
||||
"-Wno-error=format"
|
||||
"-Wno-error=format-truncation"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nanopb";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0nqfi1b0szjmm1z8wd3ks64h10jblv9ip01kfggxgz6qjjfwgvq7";
|
||||
sha256 = "0cjfkwwzi018kc0b7lia7z2jdfgibqc99mf8rvj2xq2pfapp9kf1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ];
|
||||
|
|
|
|||
|
|
@ -241,6 +241,10 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
teck-programmer = super.teck-programmer.override {
|
||||
buildInputs = [ pkgs.libusb ];
|
||||
};
|
||||
|
||||
vega-cli = super.vega-cli.override {
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
buildInputs = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@
|
|||
, "json-server"
|
||||
, "jsonlint"
|
||||
, "kaput-cli"
|
||||
, "katex"
|
||||
, "karma"
|
||||
, "lcov-result-merger"
|
||||
, "leetcode-cli"
|
||||
|
|
@ -220,6 +221,7 @@
|
|||
, "svgo"
|
||||
, "swagger"
|
||||
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
|
||||
, "teck-programmer"
|
||||
, "tern"
|
||||
, "textlint"
|
||||
, "textlint-plugin-latex"
|
||||
|
|
|
|||
138
pkgs/development/node-packages/node-packages.nix
generated
138
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -40385,6 +40385,15 @@ let
|
|||
sha512 = "Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==";
|
||||
};
|
||||
};
|
||||
"node-addon-api-3.0.2" = {
|
||||
name = "node-addon-api";
|
||||
packageName = "node-addon-api";
|
||||
version = "3.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz";
|
||||
sha512 = "+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==";
|
||||
};
|
||||
};
|
||||
"node-addon-api-3.1.0" = {
|
||||
name = "node-addon-api";
|
||||
packageName = "node-addon-api";
|
||||
|
|
@ -45797,6 +45806,15 @@ let
|
|||
sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==";
|
||||
};
|
||||
};
|
||||
"prebuild-install-5.3.6" = {
|
||||
name = "prebuild-install";
|
||||
packageName = "prebuild-install";
|
||||
version = "5.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
|
||||
sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
|
||||
};
|
||||
};
|
||||
"prebuild-install-6.1.1" = {
|
||||
name = "prebuild-install";
|
||||
packageName = "prebuild-install";
|
||||
|
|
@ -59820,6 +59838,15 @@ let
|
|||
sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6";
|
||||
};
|
||||
};
|
||||
"usb-1.7.0" = {
|
||||
name = "usb";
|
||||
packageName = "usb";
|
||||
version = "1.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/usb/-/usb-1.7.0.tgz";
|
||||
sha512 = "LHm9d389NCzZSMd0DnilxT5Lord4P2E3ETwP1LeuJcEBmI5uLJv8Sd18z/9bairUMbDnnNqX+Hi5Xkl93Kvdmw==";
|
||||
};
|
||||
};
|
||||
"use-3.1.1" = {
|
||||
name = "use";
|
||||
packageName = "use";
|
||||
|
|
@ -88881,6 +88908,27 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
katex = nodeEnv.buildNodePackage {
|
||||
name = "katex";
|
||||
packageName = "katex";
|
||||
version = "0.13.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/katex/-/katex-0.13.2.tgz";
|
||||
sha512 = "u/KhjFDhyPr+70aiBn9SL/9w/QlLagIXBi2NZSbNnBUp2tR8dCjQplyEMkEzniem5gOeSCBjlBUg4VaiWs1JJg==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."commander-6.2.1"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Fast math typesetting for the web.";
|
||||
homepage = "https://katex.org";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
karma = nodeEnv.buildNodePackage {
|
||||
name = "karma";
|
||||
packageName = "karma";
|
||||
|
|
@ -109967,6 +110015,96 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
teck-programmer = nodeEnv.buildNodePackage {
|
||||
name = "teck-programmer";
|
||||
packageName = "teck-programmer";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/teck-programmer/-/teck-programmer-1.1.1.tgz";
|
||||
sha1 = "bd2b3b1e3b88ad3c7471bdc8a5244255564b69e1";
|
||||
};
|
||||
dependencies = [
|
||||
sources."ansi-regex-2.1.1"
|
||||
sources."aproba-1.2.0"
|
||||
sources."are-we-there-yet-1.1.5"
|
||||
sources."base64-js-1.5.1"
|
||||
sources."bindings-1.5.0"
|
||||
(sources."bl-4.1.0" // {
|
||||
dependencies = [
|
||||
sources."readable-stream-3.6.0"
|
||||
];
|
||||
})
|
||||
sources."buffer-5.7.1"
|
||||
sources."chownr-1.1.4"
|
||||
sources."code-point-at-1.1.0"
|
||||
sources."console-control-strings-1.1.0"
|
||||
sources."core-util-is-1.0.2"
|
||||
sources."decompress-response-4.2.1"
|
||||
sources."deep-extend-0.6.0"
|
||||
sources."delegates-1.0.0"
|
||||
sources."detect-libc-1.0.3"
|
||||
sources."end-of-stream-1.4.4"
|
||||
sources."expand-template-2.0.3"
|
||||
sources."file-uri-to-path-1.0.0"
|
||||
sources."fs-constants-1.0.0"
|
||||
sources."gauge-2.7.4"
|
||||
sources."github-from-package-0.0.0"
|
||||
sources."has-unicode-2.0.1"
|
||||
sources."ieee754-1.2.1"
|
||||
sources."inherits-2.0.4"
|
||||
sources."ini-1.3.8"
|
||||
sources."is-fullwidth-code-point-1.0.0"
|
||||
sources."isarray-1.0.0"
|
||||
sources."mimic-response-2.1.0"
|
||||
sources."minimist-1.2.5"
|
||||
sources."mkdirp-classic-0.5.3"
|
||||
sources."napi-build-utils-1.0.2"
|
||||
sources."node-abi-2.21.0"
|
||||
sources."node-addon-api-3.0.2"
|
||||
sources."noop-logger-0.1.1"
|
||||
sources."npmlog-4.1.2"
|
||||
sources."number-is-nan-1.0.1"
|
||||
sources."object-assign-4.1.1"
|
||||
sources."once-1.4.0"
|
||||
sources."prebuild-install-5.3.6"
|
||||
sources."process-nextick-args-2.0.1"
|
||||
sources."pump-3.0.0"
|
||||
sources."q-1.5.1"
|
||||
sources."rc-1.2.8"
|
||||
sources."readable-stream-2.3.7"
|
||||
sources."safe-buffer-5.1.2"
|
||||
sources."semver-5.7.1"
|
||||
sources."set-blocking-2.0.0"
|
||||
sources."signal-exit-3.0.3"
|
||||
sources."simple-concat-1.0.1"
|
||||
sources."simple-get-3.1.0"
|
||||
sources."string-width-1.0.2"
|
||||
sources."string_decoder-1.1.1"
|
||||
sources."strip-ansi-3.0.1"
|
||||
sources."strip-json-comments-2.0.1"
|
||||
sources."tar-fs-2.1.1"
|
||||
(sources."tar-stream-2.2.0" // {
|
||||
dependencies = [
|
||||
sources."readable-stream-3.6.0"
|
||||
];
|
||||
})
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."usb-1.7.0"
|
||||
sources."util-deprecate-1.0.2"
|
||||
sources."which-pm-runs-1.0.0"
|
||||
sources."wide-align-1.1.3"
|
||||
sources."wrappy-1.0.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Programmer for TECK keyboards.";
|
||||
homepage = "https://github.com/m-ou-se/teck-programmer";
|
||||
license = "GPL-3.0+";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
tern = nodeEnv.buildNodePackage {
|
||||
name = "tern";
|
||||
packageName = "tern";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
py = python;
|
||||
in buildPythonPackage rec {
|
||||
pname = "mysql-connector";
|
||||
version = "8.0.23";
|
||||
version = "8.0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mysql";
|
||||
repo = "mysql-connector-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-YVtcHbDsW1mTjbCY1YhqgtqWv4keKlLExn2AhlOzNEw=";
|
||||
sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
|
||||
|
|
@ -20,6 +20,8 @@ in buildPythonPackage rec {
|
|||
# But the library should be working as expected.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "mysql" ];
|
||||
|
||||
meta = {
|
||||
description = "A MySQL driver";
|
||||
longDescription = ''
|
||||
|
|
@ -28,7 +30,7 @@ in buildPythonPackage rec {
|
|||
'';
|
||||
homepage = "https://github.com/mysql/mysql-connector-python";
|
||||
changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt";
|
||||
license = [ lib.licenses.gpl2 ];
|
||||
maintainers = with lib.maintainers; [ primeos ];
|
||||
license = [ lib.licenses.gpl2Only ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scapy";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "secdev";
|
||||
repo = "scapy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wpx7gps3g8q5ykbfcd67mxwcs416zg37b53fwfzzlc1m58vhk3p";
|
||||
sha256 = "0nxci1v32h5517gl9ic6zjq8gc8drwr0n5pz04c91yl97xznnw94";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -44,6 +44,7 @@ buildPythonPackage rec {
|
|||
patchShebangs .
|
||||
.config/ci/test.sh
|
||||
'';
|
||||
pythonImportsCheck = [ "scapy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python-based network packet manipulation program and library";
|
||||
|
|
@ -70,7 +71,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
homepage = "https://scapy.net/";
|
||||
changelog = "https://github.com/secdev/scapy/releases/tag/v${version}";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ primeos bjornfor ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "0.8.4";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K8jeX1/Wn6mbf48GIR2wRAwiwg1rxtbtCPjjH+4dPYw=";
|
||||
sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-a9SBeX3oesdoC5G+4dK2tbt+W7VA4jPqCM9tOAex4DI=";
|
||||
cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2021-04-12";
|
||||
cargoSha256 = "1mnx0mnfkvz6gmzy2jcl0wrdwd1mgfnrny4xf9wkd5vd4ks4k338";
|
||||
version = "2021-04-19";
|
||||
cargoSha256 = "sha256-CXkI3CQ/v6RBMM2Dpp2u+qnRwba+nqzeaPSJGBiQUoY=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "1rg20aswbh9palwr3qfcnscsvzmbmhghn4k0nl11m9j7z6hva6bg";
|
||||
sha256 = "sha256-W/cUwZEvlUXzqQ/futeNFwDWR/cTL/RLZaW2srIs83Q=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
|
||||
sha256 = "1d94072yns2xrjpagw1mqq7iyywhwz7vn3lgjdwmbgjy79jzcs1k";
|
||||
sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -287,6 +287,7 @@ kshenoy/vim-signature
|
|||
kyazdani42/nvim-tree.lua
|
||||
kyazdani42/nvim-web-devicons
|
||||
lambdalisue/fern.vim
|
||||
lambdalisue/gina.vim
|
||||
lambdalisue/vim-gista
|
||||
lambdalisue/vim-manpager
|
||||
lambdalisue/vim-pager
|
||||
|
|
@ -483,6 +484,8 @@ prabirshrestha/vim-lsp
|
|||
preservim/nerdcommenter
|
||||
preservim/nerdtree
|
||||
preservim/tagbar
|
||||
preservim/vim-pencil
|
||||
preservim/vim-wordy
|
||||
preservim/vimux
|
||||
psliwka/vim-smoothie
|
||||
ptzz/lf.vim
|
||||
|
|
@ -501,8 +504,6 @@ Raimondi/delimitMate
|
|||
rakr/vim-one
|
||||
rbgrouleff/bclose.vim
|
||||
rbong/vim-flog
|
||||
reedes/vim-pencil
|
||||
reedes/vim-wordy
|
||||
rhysd/committia.vim
|
||||
rhysd/devdocs.vim
|
||||
rhysd/git-messenger.vim
|
||||
|
|
|
|||
|
|
@ -279,6 +279,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
editorconfig.editorconfig = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "EditorConfig";
|
||||
publisher = "EditorConfig";
|
||||
version = "0.16.4";
|
||||
sha256 = "0fa4h9hk1xq6j3zfxvf483sbb4bd17fjl5cdm3rll7z9kaigdqwg";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/EditorConfig.EditorConfig/changelog";
|
||||
description = "EditorConfig Support for Visual Studio Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig";
|
||||
homepage = "https://github.com/editorconfig/editorconfig-vscode";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dbirks ];
|
||||
};
|
||||
};
|
||||
|
||||
edonet.vscode-command-runner = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-command-runner";
|
||||
|
|
@ -525,6 +542,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
iciclesoft.workspacesort = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "workspacesort";
|
||||
publisher = "iciclesoft";
|
||||
version = "1.6.0";
|
||||
sha256 = "1pbk8kflywll6lqhmffz9yjf01dn8xq8sk6rglnfn2kl2ildfhh6";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/iciclesoft.workspacesort/changelog";
|
||||
description = "Sort workspace-folders alphabetically rather than in chronological order";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=iciclesoft.workspacesort";
|
||||
homepage = "https://github.com/iciclesoft/workspacesort-for-VSCode";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dbirks ];
|
||||
};
|
||||
};
|
||||
|
||||
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, makeWrapper, cmake, llvmPackages, kernel
|
||||
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
|
||||
, systemtap, bash
|
||||
, systemtap, bash, libbpf
|
||||
}:
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -10,9 +10,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
disabled = !stdenv.isLinux;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
|
||||
sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg";
|
||||
};
|
||||
format = "other";
|
||||
|
||||
|
|
@ -20,6 +22,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
llvm clang-unwrapped kernel
|
||||
elfutils luajit netperf iperf
|
||||
systemtap.stapBuild flex bash
|
||||
libbpf
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -38,6 +41,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"-DREVISION=${version}"
|
||||
"-DENABLE_USDT=ON"
|
||||
"-DENABLE_CPP_API=ON"
|
||||
"-DCMAKE_USE_LIBBPF_PACKAGE=ON"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,26 +7,26 @@
|
|||
},
|
||||
"4.19": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.186-hardened1.patch",
|
||||
"sha256": "01f8scgr3shjxl6w7jqyvb38idrs0m53cafpplvz1q69axaf9gy6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.186-hardened1/linux-hardened-4.19.186-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.187-hardened1.patch",
|
||||
"sha256": "1vw05qff7hvzl7krcf5kh0ynyy5gljps8qahr4jm0hsd69lmn0qk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.187-hardened1/linux-hardened-4.19.187-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.29-hardened1.patch",
|
||||
"sha256": "0aj46a6bhfgn8czpmaqpnggmxzfqz29kmh9kif4v3a546q5mrq7n",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.29-hardened1/linux-hardened-5.10.29-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.30-hardened1.patch",
|
||||
"sha256": "0sxxzrhj41pxk01s2bcfwb47aab2by1zc7yyx9859rslq7dg5aly",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.30-hardened1/linux-hardened-5.10.30-hardened1.patch"
|
||||
},
|
||||
"5.11": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.11.13-hardened1.patch",
|
||||
"sha256": "008izyg6a2dycxczfixykshll5hq5gff216fhgl1azr4ymiicywy",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.13-hardened1/linux-hardened-5.11.13-hardened1.patch"
|
||||
"name": "linux-hardened-5.11.14-hardened1.patch",
|
||||
"sha256": "1j8saj1dyflah3mjs07rvxfhhpwhxk65r1y2bd228gp5nm6305px",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.14-hardened1/linux-hardened-5.11.14-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.111-hardened1.patch",
|
||||
"sha256": "1zvhdyhvmzi58g07bsg8140nf9k29dzxlbqvha2sylnlj99sjjfd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.111-hardened1/linux-hardened-5.4.111-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.112-hardened1.patch",
|
||||
"sha256": "1l9igc68dq22nlnlls4x3zfz1h2hb6dqy7vr5r4jvbk22330m12j",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.112-hardened1/linux-hardened-5.4.112-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.186";
|
||||
version = "4.19.187";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0cg6ja7plry1l2mg6hx16lsw0gzn4xpj7xdrrs2hwl8l8a2dgifq";
|
||||
sha256 = "1hx0jw11xmj57v9a8w34729vgrandaing2n9qkhx5dq4mhy04k50";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.29";
|
||||
version = "5.10.30";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1v79wylb2kd9gadiqf7dr7jcgynr970bbga09mdn940sq536g30m";
|
||||
sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.11.13";
|
||||
version = "5.11.14";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0yvgkc1fmmd4g06sydn51q4l3g5785q9yaaq04lv3kgj4hyijqgs";
|
||||
sha256 = "1ia4wzh44lkvrbvnhdnnjcdyvqx2ihpbwkih7wqm1n5prhq38ql7";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.111";
|
||||
version = "5.4.112";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "00qs4y4d9adffwysdh8sly81hxc3rw7bi9vs3fs4rhwdclr62qi1";
|
||||
sha256 = "190cq97pm0r6s115ay66rjra7fnyn7m4rak89inwhm223931sdmq";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
|
||||
|
|
|
|||
22
pkgs/os-specific/linux/teck-udev-rules/default.nix
Normal file
22
pkgs/os-specific/linux/teck-udev-rules/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, stdenv, teck-programmer }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "teck-udev-rules";
|
||||
version = lib.getVersion teck-programmer;
|
||||
|
||||
inherit (teck-programmer) src;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install 40-teck.rules -D -t $out/etc/udev/rules.d/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "udev rules for TECK keyboards";
|
||||
inherit (teck-programmer.meta) license;
|
||||
maintainers = [ lib.maintainers.lourkeur ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8679,6 +8679,8 @@ in
|
|||
|
||||
tea = callPackage ../tools/misc/tea { };
|
||||
|
||||
inherit (nodePackages) teck-programmer;
|
||||
|
||||
ted = callPackage ../tools/typesetting/ted { };
|
||||
|
||||
teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { };
|
||||
|
|
@ -20775,6 +20777,8 @@ in
|
|||
# FIXME: `tcp-wrapper' is actually not OS-specific.
|
||||
tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
|
||||
|
||||
teck-udev-rules = callPackage ../os-specific/linux/teck-udev-rules { };
|
||||
|
||||
tiptop = callPackage ../os-specific/linux/tiptop { };
|
||||
|
||||
tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue