Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
db0a71076b
@ -10480,6 +10480,12 @@
|
||||
githubId = 2487922;
|
||||
name = "Lars Jellema";
|
||||
};
|
||||
ludat = {
|
||||
email = "lucas6246@gmail.com";
|
||||
github = "ludat";
|
||||
githubId = 4952044;
|
||||
name = "Lucas David Traverso";
|
||||
};
|
||||
ludo = {
|
||||
email = "ludo@gnu.org";
|
||||
github = "civodul";
|
||||
|
||||
@ -90,7 +90,7 @@ in
|
||||
description = mdDoc ''
|
||||
Group policies to install.
|
||||
|
||||
See [Mozilla's documentation](https://github.com/mozilla/policy-templates/blob/master/README.md)
|
||||
See [Mozilla's documentation](https://mozilla.github.io/policy-templates/)
|
||||
for a list of available options.
|
||||
|
||||
This can be used to install extensions declaratively! Check out the
|
||||
|
||||
@ -6,8 +6,6 @@ let
|
||||
|
||||
cfg = config.security.sudo;
|
||||
|
||||
inherit (pkgs) sudo;
|
||||
|
||||
toUserString = user: if (isInt user) then "#${toString user}" else "${user}";
|
||||
toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}";
|
||||
|
||||
@ -247,7 +245,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ sudo ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
security.pam.services.sudo = { sshAgentAuth = true; usshAuth = true; };
|
||||
|
||||
|
||||
@ -181,7 +181,18 @@ in {
|
||||
# required to update the firmware of disks
|
||||
services.udisks2.enable = true;
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd = {
|
||||
packages = [ cfg.package ];
|
||||
|
||||
# fwupd-refresh expects a user that we do not create, so just run with DynamicUser
|
||||
# instead and ensure we take ownership of /var/lib/fwupd
|
||||
services.fwupd-refresh.serviceConfig = {
|
||||
DynamicUser = true;
|
||||
StateDirectory = "fwupd";
|
||||
};
|
||||
|
||||
timers.fwupd-refresh.wantedBy = [ "timers.target" ];
|
||||
};
|
||||
|
||||
security.polkit.enable = true;
|
||||
};
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jpeginfo";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-3JhQg0SNlwfULkm+2CaiR8Db2mkTyHDppdm/fHSTllk=";
|
||||
sha256 = "sha256-J09r4j/Qib2ehxW2dkOmbKL2OlAwKL3qPlcSKNULZp4=";
|
||||
};
|
||||
|
||||
buildInputs = [ libjpeg ];
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, callPackage
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, python3
|
||||
, substituteAll
|
||||
, nix-update-script
|
||||
@ -16,6 +17,30 @@ let
|
||||
self = py;
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
|
||||
[
|
||||
(
|
||||
# Due to flask > 2.3 the login will not work
|
||||
self: super: {
|
||||
werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.2.3";
|
||||
format = "setuptools";
|
||||
src = fetchPypi {
|
||||
pname = "Werkzeug";
|
||||
inherit version;
|
||||
hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4=";
|
||||
};
|
||||
});
|
||||
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.2.5";
|
||||
format = "setuptools";
|
||||
src = fetchPypi {
|
||||
pname = "Flask";
|
||||
inherit version;
|
||||
hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA=";
|
||||
};
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Built-in dependency
|
||||
(
|
||||
self: super: {
|
||||
|
||||
@ -1,38 +1,57 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, automake, autoconf, libtool }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, zlib
|
||||
, kssd
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kssd";
|
||||
version = "1.1";
|
||||
version = "2.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhg926";
|
||||
repo = "public_kssd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-D/s1jL2oKE0rSdRMVljskYFsw5UPOv1L95Of+K+e17w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream patch for -fno-common toolchain support:
|
||||
# https://github.com/yhg926/public_kssd/pull/9
|
||||
# https://github.com/yhg926/public_kssd/pull/11
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/yhg926/public_kssd/commit/cdd1e8aae256146f5913a3b4c723b638d53bdf27.patch";
|
||||
sha256 = "sha256-HhaTRqPfKR+ouh0PwEH6u22pbuqbX2OypRzw8BXm0W4=";
|
||||
name = "allocate-enough-memory.patch";
|
||||
url = "https://github.com/yhg926/public_kssd/commit/b1e66bbcc04687bc3201301cd742a0b26a87cb5d.patch";
|
||||
hash = "sha256-yFyJetpsGKeu+H6Oxrmn5ea4ESVtblb3YJDja4JEAEM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
buildInputs = [ zlib libtool ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
installPhase = ''
|
||||
install -vD kssd $out/bin/kssd
|
||||
runHook preInstall
|
||||
|
||||
install -vD kssd $out/bin/kssd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
simple = runCommand "${finalAttrs.pname}-test" { } ''
|
||||
mkdir $out
|
||||
${lib.getExe kssd} dist -L ${kssd.src}/shuf_file/L3K10.shuf -r ${kssd.src}/test_fna/seqs1 -o $out/reference
|
||||
${lib.getExe kssd} dist -L ${kssd.src}/shuf_file/L3K10.shuf -o $out/query ${kssd.src}/test_fna/seqs2
|
||||
${lib.getExe kssd} dist -r $out/reference -o $out/distout $out/query
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "K-mer substring space decomposition";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/yhg926/public_kssd";
|
||||
maintainers = with maintainers; [ unode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "kssd";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "debianutils";
|
||||
version = "5.13";
|
||||
version = "5.14";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "debianutils";
|
||||
rev = "debian/${finalAttrs.version}";
|
||||
hash = "sha256-h6swRil0sldRaZT7/LMEmV6Ah3zoppiHeGO3xTJlrac=";
|
||||
hash = "sha256-gbqtBFWq6KtmGLvGkmhpSHkpoDglfAT1KjDoZ4Y0SbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
43
pkgs/by-name/do/dotbot/package.nix
Normal file
43
pkgs/by-name/do/dotbot/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "dotbot";
|
||||
version = "1.20.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anishathalye";
|
||||
repo = "dotbot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gy+LVGG/BAqXoM6GDuKBkGKxxAkmoYtBRA33y/ihdRE=";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs bin/dotbot
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ pyyaml ];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool that bootstraps your dotfiles";
|
||||
longDescription = ''
|
||||
Dotbot is designed to be lightweight and self-contained, with no external
|
||||
dependencies and no installation required. Dotbot can also be a drop-in
|
||||
replacement for any other tool you were using to manage your dotfiles, and
|
||||
Dotbot is VCS-agnostic -- it doesn't make any attempt to manage your
|
||||
dotfiles.
|
||||
'';
|
||||
homepage = "https://github.com/anishathalye/dotbot";
|
||||
changelog =
|
||||
"https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ludat ];
|
||||
};
|
||||
}
|
||||
83
pkgs/by-name/ei/eiwd/package.nix
Normal file
83
pkgs/by-name/ei/eiwd/package.nix
Normal file
@ -0,0 +1,83 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, python3Packages # for tests
|
||||
, openssl # for tests
|
||||
, enableManpages ? true
|
||||
, docutils # for manpages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eiwd";
|
||||
version = "2.8-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "illiliti";
|
||||
repo = "eiwd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-SD/RJFuGBwFT4G73f93VrWO/6mGKQxjVhmNrpKRA/WY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out" "doc"
|
||||
] ++ lib.optionals enableManpages [
|
||||
"man"
|
||||
] ++ lib.optionals finalAttrs.doCheck [
|
||||
"test"
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
] ++ lib.optionals enableManpages [
|
||||
docutils # only for the man pages
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
python3Packages.python
|
||||
(lib.getBin openssl)
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-dbus"
|
||||
] ++ lib.optionals (!enableManpages) [
|
||||
"--disable-manual-pages"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# override this to false if you don't want to build python3
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
|
||||
# prevent the `install-data-local` Makefile rule from running;
|
||||
# all it does is attempt to `mkdir` the `localstatedir`.
|
||||
preInstall = ''
|
||||
mkdir install-data-local
|
||||
substituteInPlace Makefile --replace \
|
||||
'$(MKDIR_P) -m 700 $(DESTDIR)$(daemon_storagedir)' \
|
||||
'true'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $doc/share/doc
|
||||
cp -a doc $doc/share/doc/iwd
|
||||
cp -a README AUTHORS TODO $doc/share/doc/iwd
|
||||
'' + lib.optionalString finalAttrs.doCheck ''
|
||||
mkdir -p $test/bin
|
||||
cp -a test/* $test/bin/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/illiliti/eiwd/";
|
||||
description = "Fork of iwd (wifi daemon) which does not require dbus";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }:
|
||||
{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, firefox-unwrapped, zip, pkg-config, npapi_sdk, bash, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adoptopenjdk-icedtea-web";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config bc ];
|
||||
buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ];
|
||||
buildInputs = [ cargo rustc glib firefox-unwrapped zip npapi_sdk ];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray+=("BIN_BASH=${bash}/bin/bash")
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kquickimageeditor";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "libraries";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I=";
|
||||
sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "kuserfeedback";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-dqrJIrFTJJsnRoCm9McsI47xTj3wS60Ay2QVixBj8mQ=";
|
||||
hash = "sha256-JSMIuCLdRpDqhasWiMmw2lUSl4rGtDX3ell5/B0v/RM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ buildPecl, lib, rabbitmq-c, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.11.0";
|
||||
version = "2.1.1";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "amqp";
|
||||
@ -10,7 +10,7 @@ in buildPecl {
|
||||
owner = "php-amqp";
|
||||
repo = "php-amqp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CDhNDk78D15MtljbtyYj8euPnCruLZnc2NEHqXDX8HY=";
|
||||
sha256 = "sha256-QHiQL3INd0zQpmCOcJx7HhN770m9ql0Cs63OTOLOrNQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ rabbitmq-c ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPecl rec {
|
||||
pname = "phalcon";
|
||||
version = "5.3.1";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phalcon";
|
||||
repo = "cphalcon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FxGibpGlbNLqWDplCv4T4yUPg5US020niLfC7tHfkCU=";
|
||||
hash = "sha256-svw+cYL5ISKk6jEvdFmLcC4hEzrFw3kIbDJsymt2tEs=";
|
||||
};
|
||||
|
||||
internalDeps = [ php.extensions.session php.extensions.pdo ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "php-cs-fixer";
|
||||
version = "3.34.1";
|
||||
version = "3.37.1";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
|
||||
sha256 = "sha256-wVqGINDvVr11QDamo1SHmkwKuDqu8GRDFBNsk3C7mt8=";
|
||||
sha256 = "sha256-zKPkxHPF8StDgs1DC+WKVvo3VGzs+lJElRHliKUXtcw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "phpcbf";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
|
||||
sha256 = "sha256-yTwOg8vaIcIfhJzPD0tCl50gAEpaYXLtDqJw7Keub6g=";
|
||||
sha256 = "sha256-TspzKpl98IpMl+QyZuuBIvkW05uwAqAAYA/dU5P07+E=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ buildPecl, lib, php, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
in buildPecl {
|
||||
inherit version;
|
||||
pname = "redis";
|
||||
@ -10,7 +10,7 @@ in buildPecl {
|
||||
repo = "phpredis";
|
||||
owner = "phpredis";
|
||||
rev = version;
|
||||
hash = "sha256-0by0TC4TNFIzgMjoyuJG4EavMhkYqmn8TtRaVmgepfc=";
|
||||
hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M=";
|
||||
};
|
||||
|
||||
internalDeps = with php.extensions; [
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, numpy
|
||||
, pandas
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "prometheus-pandas";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zysdlYPjvhextAfW4vvGN6mSPVUbWLV+AvQ1hGWCAbw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pandas
|
||||
];
|
||||
|
||||
# There are no tests. :(
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"prometheus_pandas"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dcoles/prometheus-pandas";
|
||||
license = licenses.mit;
|
||||
description = "Pandas integration for Prometheus";
|
||||
maintainers = with maintainers; [ viktornordling ];
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.6.0";
|
||||
version = "2.9.0";
|
||||
|
||||
completion = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar";
|
||||
hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg=";
|
||||
hash = "sha256-r2t8zCHtCQfLUE21oFnw4SAReQWmAXv91Ddc7jyT2GQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
@ -611,12 +611,12 @@ in rec {
|
||||
tmux-fzf = mkTmuxPlugin {
|
||||
pluginName = "tmux-fzf";
|
||||
rtpFilePath = "main.tmux";
|
||||
version = "unstable-2023-07-06";
|
||||
version = "unstable-2023-10-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "tmux-fzf";
|
||||
rev = "51081a2688579228d860b3cb410f4437e857fc6e";
|
||||
sha256 = "sha256-qElRHAbnZ+qRasvkfo+lKNahRHklvLOH0BmbQ1oyN6A=";
|
||||
rev = "d62b6865c0e7c956ad1f0396823a6f34cf7452a7";
|
||||
hash = "sha256-hVkSQYvBXrkXbKc98V9hwwvFp6z7/mX1K4N3N9j4NN4=";
|
||||
};
|
||||
postInstall = ''
|
||||
find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g'
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iotop-c";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tomas-M";
|
||||
repo = "iotop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oSKNP/WY0Ivhj5LgyeerzZbleMcUn8ho0aqsiunqvyU=";
|
||||
sha256 = "sha256-ZIvWdNxGSUmQtMKB/MVHEZ0fJ8b//zSXz+1r/P9ZDkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -11,9 +11,9 @@ let
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.5.9"; #lqx
|
||||
suffix = "lqx2"; #lqx
|
||||
sha256 = "12l6z4bgrx5pf4fpcqsnzascr7f43cg1vwpayhgcwd7zimlbz1mg"; #lqx
|
||||
version = "6.5.10"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "10bny5x2a3brfamyajvnl75h7s64vvmymgnvwgaq82q4bmsfcdd1"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ergo";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ergochat";
|
||||
repo = "ergo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LBKGwtprhtDHaghnU6YPQ4Pf2fqD8VN7OV9gzvFgLPY=";
|
||||
sha256 = "sha256-n7GJpR/zUsHxTeVmHfBTjMcMAN7ri3FDvJSkKMzPe2I=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "1.4.1";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xc9qdzdJYg12twjLAGw1GEkfkFsk8UBgzSyOSg/FB20=";
|
||||
hash = "sha256-PLLpWr1cc+JY2N1PwlKmHw5J3F7txM4uXcu/vjGhp8o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-e1XG3DZGDBKKcEpMBi0vqKo3f9TnXdFKOUzZ7KZhPAw=";
|
||||
vendorHash = "sha256-fQQW52xog1L31wSIlnyHPyO1nEpjqrn+PtO2B9CWZH0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
|
||||
@ -981,6 +981,7 @@ mapAliases ({
|
||||
xineLib = xine-lib; # Added 2021-04-27
|
||||
xineUI = xine-ui; # Added 2021-04-27
|
||||
xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25
|
||||
xulrunner = firefox-unwrapped; # Added 2023-11-03
|
||||
xvfb_run = xvfb-run; # Added 2021-05-07
|
||||
|
||||
### Y ###
|
||||
|
||||
@ -41692,8 +41692,6 @@ with pkgs;
|
||||
|
||||
tora = libsForQt5.callPackage ../development/tools/tora { };
|
||||
|
||||
xulrunner = firefox-unwrapped;
|
||||
|
||||
xrq = callPackage ../applications/misc/xrq { };
|
||||
|
||||
pynitrokey = callPackage ../tools/security/pynitrokey { };
|
||||
|
||||
@ -9105,6 +9105,8 @@ self: super: with self; {
|
||||
|
||||
prodict = callPackage ../development/python-modules/prodict { };
|
||||
|
||||
prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { };
|
||||
|
||||
prophet = callPackage ../development/python-modules/prophet { };
|
||||
|
||||
propka = callPackage ../development/python-modules/propka { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user