Migrate packages to pkgs/by-name, format with nixfmt-rfc-style (#342625)
This commit is contained in:
Franz Pletz
@@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, openldap
|
||||
, libkrb5
|
||||
, libxslt
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, cyrus_sasl
|
||||
, util-linux
|
||||
, xmlto
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_43
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
autoreconfHook,
|
||||
cyrus_sasl,
|
||||
docbook_xml_dtd_43,
|
||||
docbook_xsl,
|
||||
fetchFromGitLab,
|
||||
libkrb5,
|
||||
libxslt,
|
||||
openldap,
|
||||
pkg-config,
|
||||
util-linux,
|
||||
xmlto,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -20,40 +21,40 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "realmd";
|
||||
repo = pname;
|
||||
repo = "adcli";
|
||||
rev = version;
|
||||
sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
|
||||
hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
docbook_xsl
|
||||
pkg-config
|
||||
util-linux
|
||||
xmlto
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openldap
|
||||
cyrus_sasl
|
||||
libkrb5
|
||||
libxslt
|
||||
cyrus_sasl
|
||||
openldap
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-debug" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tools/Makefile.am \
|
||||
--replace 'sbin_PROGRAMS' 'bin_PROGRAMS'
|
||||
--replace-fail 'sbin_PROGRAMS' 'bin_PROGRAMS'
|
||||
|
||||
substituteInPlace doc/Makefile.am \
|
||||
--replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
|
||||
'${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
|
||||
--replace-fail 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
|
||||
'${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
|
||||
|
||||
function patch_docbook() {
|
||||
substituteInPlace $1 \
|
||||
--replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
|
||||
"${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
|
||||
--replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
|
||||
"${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
|
||||
}
|
||||
patch_docbook doc/adcli.xml
|
||||
patch_docbook doc/adcli-devel.xml
|
||||
@@ -65,7 +66,10 @@ stdenv.mkDerivation rec {
|
||||
description = "Helper library and tools for Active Directory client operations";
|
||||
mainProgram = "adcli";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ SohamG anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
SohamG
|
||||
anthonyroussel
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
+29
-21
@@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, python3
|
||||
, installShellFiles
|
||||
, gawk
|
||||
, curl
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
bash,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
gawk,
|
||||
installShellFiles,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -19,20 +20,23 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
python3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
postInstall = ''
|
||||
install -Dm755 -t $out/bin/ ebsnvme-id
|
||||
install -Dm755 -t $out/bin/ ec2-metadata
|
||||
install -Dm755 -t $out/bin/ ec2nvme-nsid
|
||||
@@ -48,14 +52,14 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do
|
||||
substituteInPlace "$i" \
|
||||
--replace '/usr/sbin' "$out/bin" \
|
||||
--replace '/bin/awk' '${gawk}/bin/awk'
|
||||
done
|
||||
substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \
|
||||
--replace-fail '/usr/sbin' "$out/bin"
|
||||
|
||||
substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \
|
||||
--replace-fail '/bin/awk' '${gawk}/bin/awk'
|
||||
|
||||
substituteInPlace "$out/bin/ec2-metadata" \
|
||||
--replace 'curl' '${curl}/bin/curl'
|
||||
--replace-fail 'curl' '${curl}/bin/curl'
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
@@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
|
||||
description = "Contains a set of utilities and settings for Linux deployments in EC2";
|
||||
homepage = "https://github.com/amazonlinux/amazon-ec2-utils";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
ketzacoatl
|
||||
thefloweringash
|
||||
anthonyroussel
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,10 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
asouldocs,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "asouldocs";
|
||||
@@ -13,6 +19,11 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU=";
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = asouldocs;
|
||||
command = "asouldocs --version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web server for multi-language, real-time synchronization and searchable documentation";
|
||||
homepage = "https://asouldocs.dev/";
|
||||
+12
-8
@@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchPypi
|
||||
, nix-update-script
|
||||
, testers
|
||||
, aws-encryption-sdk-cli
|
||||
{
|
||||
lib,
|
||||
aws-encryption-sdk-cli,
|
||||
fetchPypi,
|
||||
nix-update-script,
|
||||
python3,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -41,8 +42,8 @@ localPython.pkgs.buildPythonApplication rec {
|
||||
attrs
|
||||
aws-encryption-sdk
|
||||
base64io
|
||||
urllib3
|
||||
setuptools # for pkg_resources
|
||||
urllib3
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@@ -59,7 +60,10 @@ localPython.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
# Upstream did not adapt to pytest 8 yet.
|
||||
pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ];
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
ant,
|
||||
fetchurl,
|
||||
jdk,
|
||||
nixosTests,
|
||||
stripJavaArchivesHook,
|
||||
unzip,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -1,13 +1,14 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, flex
|
||||
, pcsclite
|
||||
, pkg-config
|
||||
, libusb1
|
||||
, perl
|
||||
, zlib
|
||||
, gitUpdater
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
flex,
|
||||
gitUpdater,
|
||||
libusb1,
|
||||
pcsclite,
|
||||
perl,
|
||||
pkg-config,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace src/Makefile.in --replace /bin/echo echo
|
||||
substituteInPlace src/Makefile.in --replace-fail /bin/echo echo
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
@@ -39,25 +40,25 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
flex
|
||||
pkg-config
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pcsclite
|
||||
libusb1
|
||||
pcsclite
|
||||
zlib
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules
|
||||
substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
|
||||
--replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
|
||||
--replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
|
||||
'';
|
||||
|
||||
# The resulting shared object ends up outside of the default paths which are
|
||||
# usually getting stripped.
|
||||
stripDebugList = ["pcsc"];
|
||||
stripDebugList = [ "pcsc" ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://salsa.debian.org/rousseau/CCID.git";
|
||||
+37
-18
@@ -1,4 +1,15 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
jira-cli-go,
|
||||
less,
|
||||
more,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jira-cli-go";
|
||||
@@ -7,33 +18,22 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankitpokhrel";
|
||||
repo = "jira-cli";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}"
|
||||
"-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0"
|
||||
"-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = jira-cli-go;
|
||||
command = "jira version";
|
||||
inherit version;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd jira \
|
||||
--bash <($out/bin/jira completion bash) \
|
||||
@@ -44,12 +44,31 @@ buildGoModule rec {
|
||||
installManPage man/*
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
less
|
||||
more
|
||||
]; # Tests expect a pager in $PATH
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = jira-cli-go;
|
||||
command = "jira version";
|
||||
inherit version;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Feature-rich interactive Jira command line";
|
||||
homepage = "https://github.com/ankitpokhrel/jira-cli";
|
||||
changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bryanasdev000 anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
bryanasdev000
|
||||
anthonyroussel
|
||||
];
|
||||
mainProgram = "jira";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
autoconf-archive,
|
||||
autoreconfHook,
|
||||
fetchFromGitHub,
|
||||
gettext,
|
||||
libnl,
|
||||
ncurses,
|
||||
nix-update-script,
|
||||
pciutils,
|
||||
pkg-config,
|
||||
powertop,
|
||||
testers,
|
||||
xorg,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powertop";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenrus75";
|
||||
repo = "powertop";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf-archive
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libnl
|
||||
ncurses
|
||||
pciutils
|
||||
zlib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe"
|
||||
substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}"
|
||||
substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = powertop;
|
||||
command = "powertop --version";
|
||||
inherit version;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
|
||||
description = "Analyze power consumption on Intel-based laptops";
|
||||
mainProgram = "powertop";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [
|
||||
fpletz
|
||||
anthonyroussel
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,17 +1,34 @@
|
||||
{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3
|
||||
, buildPythonApplication, pycairo, pygobject3
|
||||
, gdk-pixbuf, gobject-introspection, gtk3, librsvg
|
||||
, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
|
||||
, automake, autoconf, txt2man
|
||||
{
|
||||
lib,
|
||||
alsa-utils,
|
||||
autoconf,
|
||||
automake,
|
||||
csound,
|
||||
fetchurl,
|
||||
gdk-pixbuf,
|
||||
gettext,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
librsvg,
|
||||
lilypond,
|
||||
mpg123,
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
texinfo,
|
||||
timidity,
|
||||
txt2man,
|
||||
vorbis-tools,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "solfege";
|
||||
version = "3.23.4";
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz";
|
||||
sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
|
||||
hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -27,15 +44,14 @@ buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
autoconf
|
||||
automake
|
||||
gdk-pixbuf
|
||||
gettext
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
texinfo
|
||||
txt2man
|
||||
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
@@ -44,7 +60,7 @@ buildPythonApplication rec {
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pycairo
|
||||
pygobject3
|
||||
];
|
||||
@@ -59,7 +75,11 @@ buildPythonApplication rec {
|
||||
default.config
|
||||
'';
|
||||
|
||||
format = "other";
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -68,7 +88,11 @@ buildPythonApplication rec {
|
||||
homepage = "https://www.gnu.org/software/solfege/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bjornfor orivej anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
bjornfor
|
||||
orivej
|
||||
anthonyroussel
|
||||
];
|
||||
mainProgram = "solfege";
|
||||
};
|
||||
}
|
||||
+21
-17
@@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, nixosTests
|
||||
, testers
|
||||
, sonic-server
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
rustPlatform,
|
||||
sonic-server,
|
||||
testers,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -21,9 +22,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM=";
|
||||
|
||||
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
@@ -31,19 +29,22 @@ rustPlatform.buildRustPackage rec {
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg"
|
||||
substituteInPlace src/main.rs \
|
||||
--replace-fail "./config.cfg" "$out/etc/sonic/config.cfg"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/etc/sonic config.cfg
|
||||
install -Dm444 -t $out/lib/systemd/system debian/sonic.service
|
||||
|
||||
substituteInPlace \
|
||||
$out/lib/systemd/system/sonic.service \
|
||||
--replace /usr/bin/sonic $out/bin/sonic \
|
||||
--replace /etc/sonic.cfg $out/etc/sonic/config.cfg
|
||||
substituteInPlace $out/lib/systemd/system/sonic.service \
|
||||
--replace-fail /usr/bin/sonic $out/bin/sonic \
|
||||
--replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg
|
||||
'';
|
||||
|
||||
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) sonic-server;
|
||||
@@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "sonic";
|
||||
maintainers = with maintainers; [ pleshevskiy anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
pleshevskiy
|
||||
anthonyroussel
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, go
|
||||
, nix-update-script
|
||||
, nixosTests
|
||||
, testers
|
||||
, thanos
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
go,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
testers,
|
||||
thanos,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -21,18 +22,22 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
subPackages = "cmd/thanos";
|
||||
|
||||
ldflags = let t = "github.com/prometheus/common/version"; in [
|
||||
"-X ${t}.Version=${version}"
|
||||
"-X ${t}.Revision=unknown"
|
||||
"-X ${t}.Branch=unknown"
|
||||
"-X ${t}.BuildUser=nix@nixpkgs"
|
||||
"-X ${t}.BuildDate=unknown"
|
||||
"-X ${t}.GoVersion=${lib.getVersion go}"
|
||||
];
|
||||
ldflags =
|
||||
let
|
||||
t = "github.com/prometheus/common/version";
|
||||
in
|
||||
[
|
||||
"-X ${t}.Version=${version}"
|
||||
"-X ${t}.Revision=unknown"
|
||||
"-X ${t}.Branch=unknown"
|
||||
"-X ${t}.BuildUser=nix@nixpkgs"
|
||||
"-X ${t}.BuildDate=unknown"
|
||||
"-X ${t}.GoVersion=${lib.getVersion go}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
@@ -51,6 +56,9 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "thanos";
|
||||
maintainers = with maintainers; [ basvandijk anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
basvandijk
|
||||
anthonyroussel
|
||||
];
|
||||
};
|
||||
}
|
||||
+11
-16
@@ -1,8 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, vpcs
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
vpcs,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -12,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "GNS3";
|
||||
repo = "vpcs";
|
||||
rev = "v${finalAttrs.version}";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY=";
|
||||
};
|
||||
|
||||
@@ -26,22 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postInstall = ''
|
||||
install -D -m555 vpcs $out/bin/vpcs
|
||||
install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = vpcs;
|
||||
command = "vpcs -v";
|
||||
};
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = vpcs;
|
||||
command = "vpcs -v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
+14
-8
@@ -1,4 +1,8 @@
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
let
|
||||
# Upstream versioned download links are broken
|
||||
@@ -44,13 +48,15 @@ stdenvNoCC.mkDerivation {
|
||||
pname = "win-pvdrivers";
|
||||
version = "unstable-2023-08-17";
|
||||
|
||||
srcs = map ({hash, url}: fetchurl {
|
||||
inherit hash url;
|
||||
# Wait & retry up to 3 times as archive.org can closes connection
|
||||
# when an HTTP client makes too many requests
|
||||
curlOpts = "--retry 3 --retry-delay 5";
|
||||
}) files;
|
||||
|
||||
srcs = map (
|
||||
{ hash, url }:
|
||||
fetchurl {
|
||||
inherit hash url;
|
||||
# Wait & retry up to 3 times as archive.org can closes connection
|
||||
# when an HTTP client makes too many requests
|
||||
curlOpts = "--retry 3 --retry-delay 5";
|
||||
}
|
||||
) files;
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
@@ -1,58 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, libnl
|
||||
, ncurses
|
||||
, pciutils
|
||||
, pkg-config
|
||||
, zlib
|
||||
, autoreconfHook
|
||||
, autoconf-archive
|
||||
, nix-update-script
|
||||
, testers
|
||||
, powertop
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powertop";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenrus75";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
|
||||
buildInputs = [ gettext libnl ncurses pciutils zlib ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
|
||||
substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "${lib.getExe xorg.xset}"
|
||||
substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = powertop;
|
||||
command = "powertop --version";
|
||||
inherit version;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
|
||||
description = "Analyze power consumption on Intel-based laptops";
|
||||
mainProgram = "powertop";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ fpletz anthonyroussel ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -227,8 +227,6 @@ with pkgs;
|
||||
|
||||
quickgui = callPackage ../applications/virtualization/quickgui { };
|
||||
|
||||
adcli = callPackage ../os-specific/linux/adcli { };
|
||||
|
||||
alda = callPackage ../development/interpreters/alda { };
|
||||
|
||||
align = callPackage ../tools/text/align { };
|
||||
@@ -2980,8 +2978,6 @@ with pkgs;
|
||||
|
||||
alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
|
||||
|
||||
amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { };
|
||||
|
||||
amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
|
||||
|
||||
amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell {
|
||||
@@ -3171,8 +3167,6 @@ with pkgs;
|
||||
|
||||
aliyun-cli = callPackage ../tools/admin/aliyun-cli { };
|
||||
|
||||
aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { };
|
||||
|
||||
aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { };
|
||||
|
||||
awscli = callPackage ../tools/admin/awscli { };
|
||||
@@ -6265,8 +6259,6 @@ with pkgs;
|
||||
|
||||
ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };
|
||||
|
||||
ccid = callPackage ../tools/security/ccid { };
|
||||
|
||||
ccrypt = callPackage ../tools/security/ccrypt { };
|
||||
|
||||
ccze = callPackage ../tools/misc/ccze { };
|
||||
@@ -8313,8 +8305,6 @@ with pkgs;
|
||||
|
||||
sbsigntool = callPackage ../tools/security/sbsigntool { };
|
||||
|
||||
sonic-server = callPackage ../servers/search/sonic-server { };
|
||||
|
||||
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
|
||||
|
||||
gsmlib = callPackage ../development/libraries/gsmlib
|
||||
@@ -8924,8 +8914,6 @@ with pkgs;
|
||||
jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
jira-cli-go = callPackage ../development/tools/jira-cli-go { };
|
||||
|
||||
jirafeau = callPackage ../servers/web-apps/jirafeau { };
|
||||
|
||||
jitterentropy = callPackage ../development/libraries/jitterentropy { };
|
||||
@@ -24385,8 +24373,6 @@ with pkgs;
|
||||
|
||||
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
|
||||
|
||||
asouldocs = callPackage ../servers/asouldocs { };
|
||||
|
||||
atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { };
|
||||
atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };
|
||||
atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { };
|
||||
@@ -25525,8 +25511,6 @@ with pkgs;
|
||||
|
||||
tailspin = callPackage ../tools/misc/tailspin { };
|
||||
|
||||
thanos = callPackage ../servers/monitoring/thanos { };
|
||||
|
||||
trafficserver = callPackage ../servers/http/trafficserver { };
|
||||
|
||||
inherit (callPackages ../servers/http/tomcat { })
|
||||
@@ -25558,8 +25542,6 @@ with pkgs;
|
||||
matomo_5
|
||||
matomo-beta;
|
||||
|
||||
axis2 = callPackage ../servers/http/tomcat/axis2 { };
|
||||
|
||||
inherit (callPackages ../servers/unifi { })
|
||||
unifi7
|
||||
unifi8;
|
||||
@@ -26627,8 +26609,6 @@ with pkgs;
|
||||
|
||||
dnsdist = callPackage ../servers/dns/dnsdist { };
|
||||
|
||||
powertop = callPackage ../os-specific/linux/powertop { };
|
||||
|
||||
pps-tools = callPackage ../os-specific/linux/pps-tools { };
|
||||
|
||||
procps = if stdenv.isLinux
|
||||
@@ -33736,8 +33716,6 @@ with pkgs;
|
||||
|
||||
vivictpp = callPackage ../applications/video/vivictpp { };
|
||||
|
||||
vpcs = callPackage ../applications/virtualization/vpcs { };
|
||||
|
||||
primusLib = callPackage ../tools/X11/primus/lib.nix {
|
||||
nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
|
||||
};
|
||||
@@ -34146,7 +34124,6 @@ with pkgs;
|
||||
xkbmon = callPackage ../applications/misc/xkbmon { };
|
||||
|
||||
win-spice = callPackage ../applications/virtualization/driver/win-spice { };
|
||||
win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { };
|
||||
|
||||
xfig = callPackage ../applications/graphics/xfig { };
|
||||
|
||||
@@ -38088,8 +38065,6 @@ with pkgs;
|
||||
|
||||
nvd = callPackage ../tools/package-management/nvd { };
|
||||
|
||||
solfege = python3Packages.callPackage ../misc/solfege { };
|
||||
|
||||
disnix = callPackage ../tools/package-management/disnix { };
|
||||
|
||||
dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
|
||||
|
||||
Reference in New Issue
Block a user