Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-09-18 06:05:20 +00:00 committed by GitHub
commit 81d645b6a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
46 changed files with 679 additions and 429 deletions

6
.github/labeler.yml vendored
View File

@ -270,6 +270,12 @@
- changed-files:
- any-glob-to-any-file:
- .github/**/*
- CONTRIBUTING.md
- pkgs/README.md
- nixos/README.md
- maintainers/README.md
- lib/README.md
- doc/README.md
"6.topic: printing":
- any:

View File

@ -12478,12 +12478,6 @@
githubId = 7910815;
name = "Alex McGrath";
};
lychee = {
email = "itslychee+nixpkgs@protonmail.com";
githubId = 82718618;
github = "itslychee";
name = "Lychee";
};
lyndeno = {
name = "Lyndon Sanche";
email = "lsanche@lyndeno.ca";

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "waylyrics";
version = "0.3.13";
version = "0.3.15";
src = fetchFromGitHub {
owner = "waylyrics";
repo = "waylyrics";
rev = "v${version}";
hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080=";
hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U=";
};
cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM=";
cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE=";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
buildInputs = [ openssl dbus ];

View File

@ -46,6 +46,20 @@ lib.makeScope pkgs.newScope (self:
withPgtk = true;
};
emacs30 = callPackage (self.sources.emacs30) inheritedArgs;
emacs30-gtk3 = self.emacs30.override {
withGTK3 = true;
};
emacs30-nox = self.emacs30.override {
noGui = true;
};
emacs30-pgtk = self.emacs30.override {
withPgtk = true;
};
emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;
emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;

View File

@ -75,6 +75,8 @@
, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)
, withGpm ? stdenv.isLinux
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
# Emacs 30+ has native JSON support
, withJansson ? lib.versionOlder version "30"
, withMailutils ? true
, withMotif ? false
, withNS ? stdenv.isDarwin && !(variant == "macport" || noGui)
@ -157,7 +159,9 @@ mkDerivation (finalAttrs: {
(substituteAll {
src = if lib.versionOlder finalAttrs.version "29"
then ./native-comp-driver-options-28.patch
else ./native-comp-driver-options.patch;
else if lib.versionOlder finalAttrs.version "30"
then ./native-comp-driver-options.patch
else ./native-comp-driver-options-30.patch;
backendPath = (lib.concatStringsSep " "
(builtins.map (x: ''"-B${x}"'') ([
# Paths necessary so the JIT compiler finds its libraries:
@ -212,13 +216,15 @@ mkDerivation (finalAttrs: {
] ++ lib.optionals srcRepo [
autoreconfHook
texinfo
] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3;
] ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
buildInputs = [
gettext
gnutls
harfbuzz.dev
(lib.getDev harfbuzz)
] ++ lib.optionals withJansson [
jansson
] ++ [
libxml2
ncurses
] ++ lib.optionals withAcl [

View File

@ -0,0 +1,16 @@
diff -Naur a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
--- old/lisp/emacs-lisp/comp.el 1969-12-31 21:00:01.000000000 -0300
+++ source/lisp/emacs-lisp/comp.el 2024-09-13 14:26:37.246614196 -0300
@@ -101,8 +101,10 @@
:version "28.1")
(defcustom native-comp-driver-options
- (cond ((eq system-type 'darwin) '("-Wl,-w"))
- ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
+ (append
+ (cond ((eq system-type 'darwin) '("-Wl,-w"))
+ ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
+ '(@backendPath@))
"Options passed verbatim to the native compiler's back-end driver.
Note that not all options are meaningful; typically only the options
affecting the assembler and linker are likely to be useful.

View File

@ -110,6 +110,14 @@ in
hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s=";
});
emacs30 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "30.0.91";
variant = "mainline";
rev = "30.0.91";
hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ=";
});
emacs28-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "28.2";

View File

@ -2,11 +2,11 @@
appimageTools.wrapType1 rec {
pname = "pureref";
version = "2.0.2";
version = "2.0.3";
src = runCommand "PureRef-${version}_x64.Appimage" {
nativeBuildInputs = [ curl gnugrep cacert ];
outputHash = "sha256-dCiQlYtjIkh/3x3Rt3Yzbn1KN7ip37Rxv1u8D9y+EMA=";
outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
} ''
key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.19.0";
version = "7.23.0";
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
hash = "sha256-wyXVZUuY1TDGAVq7Gx9r/cuBuoMmSk9KQttTJlIN+k8=";
hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8=";
}

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop-beta";
dir = "Signal Beta";
version = "7.23.0-beta.1";
version = "7.25.0-beta.2";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
hash = "sha256-qVPvzz5dEzff9+qmy92X2VWOhcfYdeoOsV4hX/PcJ+k=";
hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8=";
}

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.22.0";
version = "7.24.1";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-om3hhGYgrBrcNt3tV9QHZOKuhN/ljaR6SG/6S51xqOo=";
hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ=";
}

View File

@ -17,7 +17,7 @@ yarnInstallHook() {
--offline
)
local -r tmpDir="$(mktemp -d yarnInstallHook.XXXXXX)"
local -r tmpDir="$(mktemp -d)"
# yarn pack does not work at all with bundleDependencies.
# Since we are imediately unpacking, we can just remove them from package.json

View File

@ -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;
};
}

View File

@ -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
];
};
}

View File

@ -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/";

View File

@ -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 { };

View File

@ -1,12 +1,12 @@
{
lib,
stdenvNoCC,
fetchurl,
ant,
fetchurl,
jdk,
nixosTests,
stripJavaArchivesHook,
unzip,
nixosTests,
}:
stdenvNoCC.mkDerivation (finalAttrs: {

View File

@ -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";

View File

@ -78,7 +78,7 @@ buildDotnetModule rec {
meta = {
license = with lib.licenses; [ unfree mit ];
platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
maintainers = with lib.maintainers; [ lychee ];
maintainers = with lib.maintainers; [ ];
mainProgram = "Celeste64";
homepage = "https://github.com/ExOK/Celeste64";
description = "Celeste 64: Fragments of the Mountain";

View File

@ -21,20 +21,20 @@
stdenv.mkDerivation rec {
pname = "delfin";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "avery42";
repo = "delfin";
rev = "v${version}";
hash = "sha256-iqibdVMf4RBl/EuFvE6tEPDliYmRtIYCW/mO+nNKcWU=";
hash = "sha256-kCPLfGeMsWAjNrtrxUeXaLv1ZkDCfhDl0HLwYDaoMTY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-2V2jx78S0Gj4/w3oduH/s7Pd6XG/GCs4lwhFCdGVdd8=";
hash = "sha256-LOW4Gm69e0Cyif3UuzYITy0GMGEgZOHURNxrsZRLdWo=";
};
nativeBuildInputs = [

View File

@ -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";
};
}

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "kitex";
version = "0.11.0";
version = "0.11.3";
src = fetchFromGitHub {
owner = "cloudwego";
repo = "kitex";
rev = "v${version}";
hash = "sha256-SD898LbygIHL0X5YVSoJRdP1GQiB8NGfIAFAlx4Gfe8=";
hash = "sha256-FjFhbkEMxuBUVfytPk27mrBaAlGXZ9RPWeBy+m0bPV8=";
};
vendorHash = "sha256-tdtiG0jf7Ilvs1KZWggGyqBOQXAWs+zlF09AN80AoC0=";
vendorHash = "sha256-e98x8lSwO/u8lFbqDmbVNjVG57Y93/P0ls2UUgRvkH0=";
subPackages = [ "tool/cmd/kitex" ];

View File

@ -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;
};
}

View File

@ -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";
};
}

View File

@ -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
];
};
}

View File

@ -56,7 +56,6 @@ rustPlatform.buildRustPackage {
mainProgram = "soteria";
maintainers = with lib.maintainers; [
NotAShelf
lychee
];
inherit (polkit.meta) platforms;
};

View File

@ -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
];
};
}

View File

@ -1,22 +1,24 @@
{ lib
, rustPlatform
, fetchFromGitHub
, makeWrapper
, calibre
{
lib,
rustPlatform,
fetchFromGitHub,
makeWrapper,
calibre,
gitUpdater,
}:
rustPlatform.buildRustPackage rec {
pname = "unbook";
version = "0.8.2";
version = "0.9.1";
src = fetchFromGitHub {
owner = "ludios";
repo = "unbook";
rev = version;
hash = "sha256-THCPJ4zOKSXKZDa5DuqpBfBKZ96TdFEuDMVw/HmO7Eo=";
hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo=";
};
cargoHash = "sha256-EbSayNz9cPmMDQOaOiyQAYmtlnb+4jzbffm1On0BBxI=";
cargoHash = "sha256-whmp4ST89TZuxQe9fnkW98A9t3rwpTdQCej49ZsDanE=";
nativeBuildInputs = [ makeWrapper ];
@ -24,6 +26,8 @@ rustPlatform.buildRustPackage rec {
wrapProgram $out/bin/unbook --prefix PATH : ${lib.makeBinPath [ calibre ]}
'';
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Ebook to self-contained-HTML converter";
homepage = "https://unbook.ludios.org";

View File

@ -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; {

View File

@ -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

View File

@ -1,13 +1,112 @@
{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, gmp, m4, uthash, which, pkg-config }:
{
fetchFromGitHub,
lib,
stdenv,
unzip,
libxml2,
gmp,
m4,
uthash,
which,
pkg-config,
perl,
perlPackages,
fetchurl,
}:
stdenv.mkDerivation rec {
let
# Perl packages used by this project.
# TODO: put these into global perl-packages.nix once this is submitted.
ObjectTinyRW = perlPackages.buildPerlPackage {
pname = "Object-Tiny-RW";
version = "1.07";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz";
hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs=";
};
meta = {
description = "A date object with as little code as possible (and rw accessors)";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
IteratorSimple = perlPackages.buildPerlPackage {
pname = "Iterator-Simple";
version = "0.07";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz";
hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q=";
};
meta = {
description = "Simple iterator and utilities";
license = with lib.licenses; [ artistic1 gpl2Only ];
};
};
IteratorSimpleLookahead = perlPackages.buildPerlPackage {
pname = "Iterator-Simple-Lookahead";
version = "0.09";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz";
hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw=";
};
propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [
ClassAccessor
]);
meta = {
description = "Simple iterator with lookahead and unget";
license = with lib.licenses; [ artistic1 gpl2Only ];
};
};
AsmPreproc = perlPackages.buildPerlPackage {
pname = "Asm-Preproc";
version = "1.03";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz";
hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M=";
};
propagatedBuildInputs = [
IteratorSimple
IteratorSimpleLookahead
] ++ (with perlPackages; [
TextTemplate
DataDump
FileSlurp
]);
meta = {
description = "Preprocessor to be called from an assembler";
license = with lib.licenses; [ artistic1 gpl2Only ];
};
};
CPUZ80Assembler = perlPackages.buildPerlPackage {
pname = "CPU-Z80-Assembler";
version = "2.25";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz";
hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU=";
};
buildInputs = [ AsmPreproc ] ++ (with perlPackages; [
CaptureTiny
RegexpTrie
PathTiny
ClassAccessor
]);
meta = {
description = "Functions to assemble a set of Z80 assembly instructions";
license = with lib.licenses; [ artistic1 gpl2Only ];
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "z88dk";
version = "2.3";
src = fetchFromGitHub {
owner = "z88dk";
repo = "z88dk";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44=";
fetchSubmodules = true;
};
@ -16,38 +115,79 @@ stdenv.mkDerivation rec {
# we dont rely on build.sh :
export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite
export ZCCCFG=$PWD/lib/config/
# we don't want to build zsdcc since it required network (svn)
# we test in checkPhase
substituteInPlace Makefile \
--replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
--replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
# rc2014.lib not created, making corresponding tests fail. Comment out.
substituteInPlace test/suites/make.config \
--replace 'zcc +rc2014' '#zcc +rc2014' \
--replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000'
# The following tests don't pass.
rm src/z80asm/t/issue_0341.t
rm src/z80asm/t/z80asm_lib.t
'';
# Parallel building is not working yet with the upstream Makefiles.
# Explicitly switch this off for now.
enableParallelBuilding = false;
doCheck = true;
checkPhase = ''
make testsuite
# Need to build libs first, Makefile deps not fully defined
make libs $makeFlags
make testsuite $makeFlags
make -k test $makeFlags
'';
#failed on Issue_1105_function_pointer_calls
doCheck = stdenv.hostPlatform.system != "aarch64-linux";
#_FORTIFY_SOURCE requires compiling with optimization (-O)
env.NIX_CFLAGS_COMPILE = "-O";
short_rev = builtins.substring 0 7 src.rev;
short_rev = builtins.substring 0 7 finalAttrs.src.rev;
makeFlags = [
"git_rev=${short_rev}"
"version=${version}"
"DESTDIR=$(out)"
"git_rev=${finalAttrs.short_rev}"
"version=${finalAttrs.version}"
"PREFIX=$(out)"
"git_count=0"
];
nativeBuildInputs = [ which makeWrapper unzip pkg-config ];
buildInputs = [ libxml2 m4 uthash gmp ];
nativeBuildInputs = [
which
unzip
m4
perl
pkg-config
# Local perl packages
AsmPreproc
CPUZ80Assembler
ObjectTinyRW
] ++ (with perlPackages; [
CaptureTiny
DataHexDump
ModernPerl
PathTiny
RegexpCommon
TestHexDifferences
TextDiff
RegexpTrie
]);
buildInputs = [
libxml2
uthash
gmp
];
preInstall = ''
mkdir -p $out/{bin,share}
'';
installTargets = [ "libs" "install" ];
installTargets = [
"libs"
"install"
];
meta = with lib; {
homepage = "https://www.z88dk.org";
@ -56,4 +196,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.siraben ];
platforms = platforms.unix;
};
}
})

View File

@ -16,19 +16,23 @@
buildPythonPackage rec {
pname = "gpy";
version = "1.13.1";
version = "1.13.2";
pyproject = true;
disabled = pythonOlder "3.9";
# 1.13.0 not on PyPI yet
src = fetchFromGitHub {
owner = "SheffieldML";
repo = "GPy";
rev = "refs/tags/v${version}";
hash = "sha256-ykoGdXy1uagKrP9Nqn74mDESZwKVPq6wQgnHlCznevM=";
hash = "sha256-kggXePDKJcgw8qwLIBTxbwhiLw2H4dkx7082FguKP0Y=";
};
pythonRelaxDeps = [
"paramz"
"scipy"
];
nativeBuildInputs = [ setuptools ];
buildInputs = [ cython ];
propagatedBuildInputs = [
@ -47,14 +51,18 @@ buildPythonPackage rec {
done
'';
disabledTests = lib.optionals (stdenv.isDarwin && stdenv.hostPlatform.isx86_64) [
# Rounding difference break comparison
"TestGradientMultiOutputGPModel"
];
pythonImportsCheck = [ "GPy" ];
meta = with lib; {
description = "Gaussian process framework in Python";
homepage = "https://sheffieldml.github.io/GPy";
changelog = "https://github.com/SheffieldML/GPy/releases/tag/v.${version}";
changelog = "https://github.com/SheffieldML/GPy/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547
};
}

View File

@ -35,6 +35,6 @@ buildPythonPackage rec {
psfl
];
mainProgram = "import-expression";
maintainers = with lib.maintainers; [ lychee ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -65,7 +65,7 @@ buildPythonPackage rec {
description = "Debugging and testing cog for discord.py bots";
homepage = "https://jishaku.readthedocs.io/en/latest";
changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}";
maintainers = with lib.maintainers; [ lychee ];
maintainers = with lib.maintainers; [ ];
mainProgram = "jishaku";
license = lib.licenses.mit;
};

View File

@ -12,29 +12,29 @@ let
"unknown";
# These files can be found in src/evaluate.h
nnueBigFile = "nn-b1a57edbea57.nnue";
nnueBigFile = "nn-1111cefa1111.nnue";
nnueBig = fetchurl {
name = nnueBigFile;
url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
sha256 = "sha256-saV+2+pXTKi4jWg3RzhFeRvrU9iF+H+G1czdVln787I=";
sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
};
nnueSmallFile = "nn-baff1ede1f90.nnue";
nnueSmallFile = "nn-37f18f62d772.nnue";
nnueSmall = fetchurl {
name = nnueSmallFile;
url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
sha256 = "sha256-uv8e3h+Qwd0bT3cvHv8phIghgB6BhjRdp/DrQSG9b2M=";
sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
};
in
stdenv.mkDerivation rec {
pname = "stockfish";
version = "16.1";
version = "17";
src = fetchFromGitHub {
owner = "official-stockfish";
repo = "Stockfish";
rev = "sf_${version}";
sha256 = "sha256-xTtjfJgEHF0SQT9Fw/9RLZA0Quh00jrIbihr7IYCm2U=";
sha256 = "sha256-oXvLaC5TEUPlHjhm7tOxpNPY88QxYHFw+Cev3Q8NEeQ=";
};
postUnpack = ''
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
Stockfish is one of the strongest chess engines in the world. It is also
much stronger than the best human chess grandmasters.
'';
maintainers = with maintainers; [ luispedro siraben ];
maintainers = with maintainers; [ luispedro siraben thibaultd ];
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
license = licenses.gpl3Only;
};

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
version = "24.31.30508.7";
version = "24.35.30872.22";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
hash = "sha256-8oerVjEeqouOT0+9YgNYxK2200XyUSPu5hDnZg+Ong4=";
hash = "sha256-OI1pyH6g4U6FI2zE63oU9y8e39VgZUO0tSIOsOOon88=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -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;
};
}

View File

@ -1,15 +1,32 @@
{ lib, python3Packages, fetchzip }:
{
lib,
python3Packages,
fetchzip,
writeScript,
}:
python3Packages.buildPythonApplication {
python3Packages.buildPythonApplication rec {
pname = "pdf-parser";
version = "0.7.4";
version = "0.7.9";
pyproject = false;
src = fetchzip {
url = "https://didierstevens.com/files/software/pdf-parser_V0_7_4.zip";
sha256 = "1j39yww2yl4cav8xgd4zfl5jchbbkvffnrynkamkzvz9dd5np2mh";
url = "https://didierstevens.com/files/software/pdf-parser_V${
lib.replaceStrings [ "." ] [ "_" ] version
}.zip";
hash = "sha256-1mFThtTe1LKkM/MML44RgskGv3FZborNVBsTqSKanks=";
};
format = "other";
postPatch = ''
# quote regular expressions correctly
substituteInPlace pdf-parser.py \
--replace-fail \
"re.sub('" \
"re.sub(r'" \
--replace-fail \
"re.match('" \
"re.match(r'"
'';
installPhase = ''
install -Dm555 pdf-parser.py $out/bin/pdf-parser.py
@ -17,19 +34,31 @@ python3Packages.buildPythonApplication {
preFixup = ''
substituteInPlace $out/bin/pdf-parser.py \
--replace '/usr/bin/python' '${python3Packages.python}/bin/python'
--replace-fail '/usr/bin/python' '${python3Packages.python}/bin/python'
'';
meta = with lib; {
passthru.updateScript = writeScript "update-pdf-parser" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl pcre2
set -eu -o pipefail
version="$(curl -s https://blog.didierstevens.com/programs/pdf-tools/ |
pcre2grep -O '$1.$2.$3' '\bpdf-parser_V(\d+)_(\d+)_(\d+)\.zip\b.*')"
update-source-version "$UPDATE_NIX_ATTR_PATH" "$version"
'';
meta = {
description = "Parse a PDF document";
longDescription = ''
This tool will parse a PDF document to identify the fundamental elements used in the analyzed file.
It will not render a PDF document.
'';
homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
license = licenses.publicDomain;
maintainers = [ maintainers.lightdiscord ];
platforms = platforms.all;
license = lib.licenses.publicDomain;
maintainers = [ lib.maintainers.lightdiscord ];
platforms = lib.platforms.all;
mainProgram = "pdf-parser.py";
};
}

View File

@ -1,13 +1,19 @@
{ lib
, fetchFromGitHub
, mkYarnPackage
, buildGoModule
, makeWrapper
, v2ray
, v2ray-geoip
, v2ray-domain-list-community
, symlinkJoin
, fetchYarnDeps
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
fetchYarnDeps,
symlinkJoin,
yarnConfigHook,
yarnBuildHook,
nodejs,
makeWrapper,
v2ray,
v2ray-geoip,
v2ray-domain-list-community,
}:
let
pname = "v2raya";
@ -16,52 +22,44 @@ let
src = fetchFromGitHub {
owner = "v2rayA";
repo = "v2rayA";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-tXVyroQ2yXwLe+OulvVQYgfd9EcC87S0L8d7w5gLnMI=";
postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
};
guiSrc = "${src}/gui";
web = mkYarnPackage {
inherit pname version;
web = stdenv.mkDerivation {
inherit pname version src;
src = guiSrc;
packageJSON = ./package.json;
sourceRoot = "${src.name}/gui";
offlineCache = fetchYarnDeps {
yarnLock = "${guiSrc}/yarn.lock";
sha256 = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw=";
yarnLock = "${src}/gui/yarn.lock";
hash = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw=";
};
buildPhase = ''
runHook preBuild
OUTPUT_DIR=$out yarn --offline build
runHook postBuild
'';
env.OUTPUT_DIR = placeholder "out";
configurePhase = ''
runHook preConfigure
cp -r $node_modules node_modules
chmod +w node_modules
runHook postConfigure
'';
distPhase = "true";
dontInstall = true;
dontFixup = true;
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
nodejs
];
};
assetsDir = symlinkJoin {
name = "assets";
paths = [ v2ray-geoip v2ray-domain-list-community ];
paths = [
v2ray-geoip
v2ray-domain-list-community
];
};
in
buildGoModule {
inherit pname version;
inherit pname version src;
sourceRoot = "${src.name}/service";
src = "${src}/service";
vendorHash = "sha256-8MSNTKeN0N2/yaHnXsKmxzw9vRy+E5q60IpwLycqC2I=";
ldflags = [
@ -73,15 +71,16 @@ buildGoModule {
subPackages = [ "." ];
nativeBuildInputs = [ makeWrapper ];
preBuild = ''
cp -a ${web} server/router/web
'';
postInstall = ''
install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications
install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps
install -Dm 444 ../install/universal/v2raya.desktop -t $out/share/applications
install -Dm 444 ../install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps
substituteInPlace $out/share/applications/v2raya.desktop \
--replace 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya'
--replace-fail 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya'
wrapProgram $out/bin/v2rayA \
--prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \

View File

@ -1,59 +0,0 @@
{
"name": "v2raya",
"version": "0.1.0",
"private": true,
"license": "GPL-3.0",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"resolutions": {
"@achrinza/node-ipc": "^10",
"@achrinza/event-pubsub": "^5"
},
"dependencies": {
"@achrinza/node-ipc": "^10.1.10",
"@mdi/font": "^5.8.55",
"@nuintun/qrcode": "^3.3.0",
"@vue/babel-preset-app": "^4.2.2",
"axios": "^0.21.1",
"buefy": "^0.9.22",
"clipboard": "^2.0.4",
"dayjs": "^1.10.6",
"js-base64": "^2.5.1",
"nanoid": "^3.1.23",
"normalize.css": "^8.0.1",
"pace-js": "^1.2.4",
"qrcode": "^1.4.2",
"register-service-worker": "^1.6.2",
"vue": "^2.7.14",
"vue-i18n": "^8.15.3",
"vue-router": "^3.0.6",
"vue-virtual-scroller": "^1.0.10",
"vuex": "^3.0.1",
"webpack-iconfont-plugin-nodejs": "^1.0.16"
},
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-plugin-vuex": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/eslint-config-prettier": "^5.0.0",
"compression-webpack-plugin": "^10.0.0",
"css-loader": "^5.2.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^8.0.3",
"highlight.js": "^11.4.0",
"prettier": "^2.4.1",
"sass": "^1.19.0",
"sass-loader": "^8.0.0",
"terser-webpack-plugin": "^5.3.6",
"urijs": "^1.19.11"
}
}

View File

@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "bfs";
version = "3.1.3";
version = "4.0.2";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
hash = "sha256-/thPPueNrYzbxxZYAqlxZ2GEsceCzd+LkI84S8AS1mo=";
hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY=";
};
buildInputs = [ oniguruma ] ++
lib.optionals stdenv.isLinux [ acl attr libcap liburing ];
configureFlags = [ "--enable-release" ];
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "release" ]; # "release" enables compiler optimizations
meta = with lib; {
description = "Breadth-first version of the UNIX find command";

View File

@ -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 { };
@ -6263,8 +6257,6 @@ with pkgs;
ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };
ccid = callPackage ../tools/security/ccid { };
ccrypt = callPackage ../tools/security/ccrypt { };
ccze = callPackage ../tools/misc/ccze { };
@ -8311,8 +8303,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
@ -8922,8 +8912,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
@ -29252,10 +29232,17 @@ with pkgs;
emacs28-gtk2
emacs28-gtk3
emacs28-nox
emacs29
emacs29-gtk3
emacs29-nox
emacs29-pgtk
emacs30
emacs30-gtk3
emacs30-nox
emacs30-pgtk
emacs28-macport
emacs29-macport
;
@ -33729,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; };
};
@ -34139,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 { };
@ -38037,7 +38021,9 @@ with pkgs;
nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
nix-serve = callPackage ../tools/package-management/nix-serve { };
nix-serve = callPackage ../tools/package-management/nix-serve {
nix = nixVersions.nix_2_18;
};
nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;
@ -38081,8 +38067,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 {