mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 01:24:47 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7c846b760d
@ -6738,6 +6738,8 @@
|
||||
};
|
||||
gm6k = {
|
||||
email = "nix@quidecco.pl";
|
||||
github = "zeuner";
|
||||
githubId = 2545850;
|
||||
name = "Isidor Zeuner";
|
||||
};
|
||||
gmemstr = {
|
||||
@ -18546,6 +18548,8 @@
|
||||
};
|
||||
tomkoid = {
|
||||
email = "tomaszierl@outlook.com";
|
||||
github = "Tomkoid";
|
||||
githubId = 67477750;
|
||||
name = "Tomkoid";
|
||||
};
|
||||
tomodachi94 = {
|
||||
|
||||
@ -74,7 +74,7 @@ let
|
||||
fi
|
||||
'';
|
||||
provisionConfDir = pkgs.runCommand "grafana-provisioning" { nativeBuildInputs = [ pkgs.xorg.lndir ]; } ''
|
||||
mkdir -p $out/{datasources,dashboards,notifiers,alerting}
|
||||
mkdir -p $out/{alerting,datasources,dashboards,notifiers,plugins}
|
||||
${ln { src = datasourceFileOrDir; dir = "datasources"; filename = "datasource"; }}
|
||||
${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashboard"; }}
|
||||
${ln { src = notifierFileOrDir; dir = "notifiers"; filename = "notifier"; }}
|
||||
@ -1831,7 +1831,7 @@ in
|
||||
set -o errexit -o pipefail -o nounset -o errtrace
|
||||
shopt -s inherit_errexit
|
||||
|
||||
exec ${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir} -config ${configFile}
|
||||
exec ${cfg.package}/bin/grafana server -homepath ${cfg.dataDir} -config ${configFile}
|
||||
'';
|
||||
serviceConfig = {
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
|
||||
@ -198,6 +198,7 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
services.netdata.configDir.".opt-out-from-anonymous-statistics" = mkIf (!cfg.enableAnalyticsReporting) (pkgs.writeText ".opt-out-from-anonymous-statistics" "");
|
||||
environment.etc."netdata/netdata.conf".source = configFile;
|
||||
environment.etc."netdata/conf.d".source = configDirectory;
|
||||
|
||||
|
||||
@ -61,7 +61,9 @@ let
|
||||
pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql";
|
||||
|
||||
# https://github.com/nextcloud/documentation/pull/11179
|
||||
ocmProviderIsNotAStaticDirAnymore = versionAtLeast cfg.package.version "27.1.2";
|
||||
ocmProviderIsNotAStaticDirAnymore = versionAtLeast cfg.package.version "27.1.2"
|
||||
|| (versionOlder cfg.package.version "27.0.0"
|
||||
&& versionAtLeast cfg.package.version "26.0.8");
|
||||
|
||||
in {
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
in {
|
||||
name = "mongodb";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ bluescreen303 offline rvl phile314 ];
|
||||
maintainers = [ bluescreen303 offline phile314 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -15,9 +15,6 @@ let
|
||||
name ? mkTestName package
|
||||
}: makeTest {
|
||||
name = "${name}-backup";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ rvl ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
master = { pkgs, ... }: {
|
||||
|
||||
@ -72,6 +72,5 @@ in buildPythonApplication rec {
|
||||
homepage = "https://www.nongnu.org/sonata/";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texstudio";
|
||||
version = "4.6.3";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "texstudio-org";
|
||||
repo = "texstudio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-L8N7T7FFfjT801HxbQiiC0ewW7vde4S0RVmNT2CWiWY=";
|
||||
hash = "sha256-Qpt1CiQ+vG7uT8rpuWgYdjug2iigXQDKHIhrquSny6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1h2s90h1a4b4r9rqafd5fj95mx21xqlp3msv8fxfjd2kkfl8bdcl";
|
||||
x86_64-darwin = "1cprq4cy01cmyqrvv5p9f09k7h5p4nj9jbk4lrlnyj1z2xvhcls1";
|
||||
aarch64-linux = "0g9j14vnan10r014309s6mdkizjfpbd83bf1kxx2kk625n87xszc";
|
||||
aarch64-darwin = "10rw2dy3khpxa292zygxi67amxd6s351ha8nxvav5m9xfxlgd2qn";
|
||||
armv7l-linux = "0bw0hfhvwv7wbh2daxgxaxm34v5z5ak4nmmk45ksxc4xsmjc5v23";
|
||||
x86_64-linux = "0153vsb62r3g3cck70n05wkxxkh9w53zhnra7hzfy4m19v8xinzm";
|
||||
x86_64-darwin = "1xqf0s05ns1yqd6qz4633c5xgb0l0nm2n1kfvxv7wqhgf94x80fm";
|
||||
aarch64-linux = "1hfg01w9k60lf30chvj7mrjb1m3p5czv42cf7zj97j5pkhpg2lmi";
|
||||
aarch64-darwin = "0vzayy1akh9hzs32cyxvvfnsbg9601jrs7bsvql3728dy9wkc8w2";
|
||||
armv7l-linux = "0cc9b47dziqizcs37yci48ymyg176lwsyh7w7b9imh1s658vgikv";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.84.2.23317";
|
||||
version = "1.84.2.23319";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
686
pkgs/applications/misc/mission-center/Cargo.lock
generated
686
pkgs/applications/misc/mission-center/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -16,8 +16,8 @@
|
||||
, blueprint-compiler
|
||||
, cairo
|
||||
, cmake
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, dmidecode
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, glib
|
||||
@ -31,25 +31,27 @@
|
||||
, sqlite
|
||||
, udev
|
||||
, wayland
|
||||
, dmidecode
|
||||
, vulkan-loader
|
||||
}:
|
||||
|
||||
let
|
||||
nvtop = fetchFromGitHub {
|
||||
owner = "Syllo";
|
||||
repo = "nvtop";
|
||||
rev = "be47f8c560487efc6e6a419d59c69bfbdb819324";
|
||||
hash = "sha256-MdaZYLxCuVX4LvbwBYNfHHoJWqZAy4J8NBK7Guh2whc=";
|
||||
rev = "45a1796375cd617d16167869bb88e5e69c809468";
|
||||
hash = "sha256-1P9pWXhgTHogO0DztxOsFKNwvTRRfDL3nzGmMANMC9w=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mission-center";
|
||||
version = "0.3.3";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mission-center-devs";
|
||||
repo = "mission-center";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xLyCLKUk21MvswtPUKm41Hr34vTzCMVQNTaAkuhSGLc=";
|
||||
hash = "sha256-RENB5rD+DZrmE6awWRT9PGed2bJFDEAEqHh1tBjqWrY=";
|
||||
};
|
||||
|
||||
cargoDeps = symlinkJoin {
|
||||
@ -58,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
(rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"pathfinder_canvas-0.5.0" = "sha256-k2Sj69hWA0UzRfv91aG1TAygVIuOX3gmipcDbuZxxc8=";
|
||||
"pathfinder_canvas-0.5.0" = "sha256-qEp16TVggPtvFvDuUyWsS6rH6MeO6FW0K6BnACghaCg=";
|
||||
};
|
||||
})
|
||||
(rustPlatform.importCargoLock {
|
||||
@ -86,8 +88,8 @@ stdenv.mkDerivation rec {
|
||||
blueprint-compiler
|
||||
cairo
|
||||
cmake
|
||||
dbus
|
||||
desktop-file-utils
|
||||
dmidecode
|
||||
gdk-pixbuf
|
||||
gettext
|
||||
glib
|
||||
@ -104,14 +106,23 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.rs \
|
||||
substituteInPlace src/sys_info_v2/gatherer.rs \
|
||||
--replace '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"'
|
||||
|
||||
substituteInPlace src/sys_info_v2/mem_info.rs \
|
||||
--replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"'
|
||||
|
||||
substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \
|
||||
--replace "libGL.so.1" "${libGL}/lib/libGL.so.1"
|
||||
|
||||
substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \
|
||||
--replace '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"'
|
||||
|
||||
SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer
|
||||
SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop
|
||||
|
||||
substituteInPlace $SRC_GATHERER_NVTOP/nvtop.json \
|
||||
--replace "nvtop-be47f8c560487efc6e6a419d59c69bfbdb819324" "nvtop-src"
|
||||
--replace "nvtop-45a1796375cd617d16167869bb88e5e69c809468" "nvtop-src"
|
||||
|
||||
GATHERER_BUILD_DEST=$NIX_BUILD_TOP/source/build/src/sys_info_v2/gatherer/src/debug/build/native
|
||||
mkdir -p $GATHERER_BUILD_DEST
|
||||
@ -128,10 +139,6 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs data/hwdb/generate_hwdb.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/missioncenter --prefix PATH : $out/bin:${dmidecode}/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Monitor your CPU, Memory, Disk, Network and GPU usage";
|
||||
homepage = "https://gitlab.com/mission-center-devs/mission-center";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,14 +18,14 @@ let
|
||||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "rtfm";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugopl";
|
||||
repo = "rtfm";
|
||||
rev = "v${version}";
|
||||
name = "rtfm";
|
||||
hash = "sha256-SmQq3hG94oV346dHtqTHC0xE4cWB3rspD3XXu+mSI8Q=";
|
||||
hash = "sha256-ulv5US5EBBb0rK/Qaw8ZpHI4QwEQGlzscmAoe17946k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec {
|
||||
wrapGAppsHook4
|
||||
gobject-introspection
|
||||
gi-crystal
|
||||
] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
|
||||
] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk_6_0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- a/Makefile 2023-07-17 17:18:28.000000000 +0300
|
||||
+++ b/Makefile 2023-07-19 12:13:44.627168135 +0300
|
||||
--- a/Makefile 2023-12-07 23:37:38.984501858 +0300
|
||||
+++ b/Makefile 2023-12-07 23:47:52.884456064 +0300
|
||||
@@ -4,8 +4,7 @@
|
||||
all: configure .WAIT rtfm docsets
|
||||
|
||||
@ -10,16 +10,7 @@
|
||||
|
||||
rtfm:
|
||||
shards build --release -s rtfm
|
||||
@@ -29,13 +28,15 @@
|
||||
install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml
|
||||
# docsets
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
|
||||
- cp -rv data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
|
||||
- cp -rv data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
|
||||
+ cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
|
||||
+ cp -r data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
|
||||
# License
|
||||
install -D -m0644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/rtfm/LICENSE
|
||||
@@ -36,6 +35,8 @@
|
||||
# Changelog
|
||||
install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md
|
||||
gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md
|
||||
@ -27,4 +18,4 @@
|
||||
+ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)$(PREFIX)/bin/rtfm
|
||||
rm -f $(DESTDIR)$(PREFIX)/bin/rtfm
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
};
|
||||
gio = {
|
||||
url = "https://github.com/hugopl/gio.cr.git";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8";
|
||||
rev = "v0.2.1";
|
||||
sha256 = "0vl5lpvhhdi9pvyl12smag0i3dwj1jjz1zzilc8ai0wjrnbnwlxs";
|
||||
};
|
||||
gtk4 = {
|
||||
url = "https://github.com/hugopl/gtk4.cr.git";
|
||||
rev = "v0.15.0";
|
||||
sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1";
|
||||
rev = "v0.16.0";
|
||||
sha256 = "1bnnfy07246vwbjfwhziv2yw1g52pzhhrr25660fp3qcnw8q513w";
|
||||
};
|
||||
harfbuzz = {
|
||||
url = "https://github.com/hugopl/harfbuzz.cr.git";
|
||||
@ -26,13 +26,13 @@
|
||||
};
|
||||
libadwaita = {
|
||||
url = "https://github.com/geopjr/libadwaita.cr.git";
|
||||
rev = "23ce21d6400af7563ede0b53deea6d1f77436985";
|
||||
sha256 = "09jz6r0yp4qsm47qcknzgkjxavr5j3dkxf2yjbw0jkaz1an58pfw";
|
||||
rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446";
|
||||
sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3";
|
||||
};
|
||||
pango = {
|
||||
url = "https://github.com/hugopl/pango.cr.git";
|
||||
rev = "v0.2.0";
|
||||
sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "1dg5bcbq11zww4xh68dq4ivnsz89yqsnxz81ggp4j9c9d6dhx0m4";
|
||||
};
|
||||
sqlite3 = {
|
||||
url = "https://github.com/crystal-lang/crystal-sqlite3.git";
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.6.0-beta2";
|
||||
version = "1.6.0-beta3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zUMRjUcFIgLgNcUp+I48dDyncI4cjup4+HMXxxJdXU4=";
|
||||
hash = "sha256-71QJ6rhzFAE78v6RxO1nSroyjF0vrlKC3UIp9ksZolk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "starboard";
|
||||
version = "0.15.17";
|
||||
version = "0.15.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RzwLc29f+u/m1x5R199M8XQQ5nn33ofYi3AyMCimMtA=";
|
||||
sha256 = "sha256-tQRnqc8VL3QmFzWlf4YHhtLxVAQDkb+U+2ynqmpGffQ=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-dUqcg9/kJfKWIygem0rmtgOiYOHpfWOdH4YV0mYhxeQ=";
|
||||
vendorHash = "sha256-VOnftPcsgpmvmfjEc+vdbUOyn6t9QlVRkuxs/Ahy548=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.53.8";
|
||||
version = "0.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qjtyzwcpkZ1+jfwbpYGEXPLeh5+7iNNRRmn8VvZBIEo=";
|
||||
hash = "sha256-PcQuPV0wZa+CgikI9grdsGqNwXlXnu/kM+h4KfPW7SU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Eu4BOi9ClzNps20OT4L/AXxKZ5zL9ipSmfDunO6CxNs=";
|
||||
vendorHash = "sha256-OIkrDvNk4XD11j/+BdOkzbw86cYUj0Vz7pZ5/vIZopY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -33,7 +33,7 @@ mkDerivation rec {
|
||||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PtWg9IMwZU0HG2pVHdRKgPQH8i2e72Fbs+q5wCwBsfo=";
|
||||
sha256 = "sha256-sysWDjJSlXRjtv9eiCTkXb29ZYs3YC7sr/UMMPCt5wA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yEW7+0MnJlW0WeZ6UItaCDrihPLA52mLcu15tJwZx9w=";
|
||||
hash = "sha256-9m8GmVIZgHETkemzElXOfVxaZlzJwZaT2sJcTU7vZ2g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xA9SDq1Kc0u8qFEPFFCic9uwE2Y/BXJzUHBCs1Czxtw=";
|
||||
cargoHash = "sha256-g1gdFGj0nzczR2yyjCdjpCGtFlmX7yrdAQIa3sQRATg=";
|
||||
|
||||
cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
|
||||
useNextest = true; # nextest is the upstream integration framework
|
||||
|
||||
@ -14,21 +14,24 @@
|
||||
{ callPackage, lib, stdenv }:
|
||||
let
|
||||
inherit (lib) recurseIntoAttrs;
|
||||
references = callPackage ./references {};
|
||||
in
|
||||
recurseIntoAttrs {
|
||||
concat = callPackage ./concat-test.nix {};
|
||||
linkFarm = callPackage ./link-farm.nix {};
|
||||
overriding = callPackage ../test-overriding.nix {};
|
||||
# VM test not supported beyond linux yet
|
||||
references =
|
||||
# VM test not supported beyond linux yet
|
||||
if stdenv.hostPlatform.isLinux
|
||||
then callPackage ./references.nix {}
|
||||
else null;
|
||||
then references
|
||||
else {};
|
||||
writeCBin = callPackage ./writeCBin.nix {};
|
||||
writeShellApplication = callPackage ./writeShellApplication.nix {};
|
||||
writeScriptBin = callPackage ./writeScriptBin.nix {};
|
||||
writeShellScript = callPackage ./write-shell-script.nix {};
|
||||
writeShellScriptBin = callPackage ./writeShellScriptBin.nix {};
|
||||
writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix {};
|
||||
writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix {
|
||||
inherit (references) samples;
|
||||
};
|
||||
writeTextFile = callPackage ./write-text-file.nix {};
|
||||
}
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
{ pkgs ? import ../../../.. { config = {}; overlays = []; } }:
|
||||
pkgs.lib.mapAttrs
|
||||
(k: v: pkgs.writeDirectReferencesToFile v)
|
||||
(import ./sample.nix { inherit pkgs; })
|
||||
@ -1,4 +0,0 @@
|
||||
{ pkgs ? import ../../../.. { config = {}; overlays = []; } }:
|
||||
pkgs.lib.mapAttrs
|
||||
(k: v: pkgs.writeReferencesToFile v)
|
||||
(import ./sample.nix { inherit pkgs; })
|
||||
@ -1,62 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# trivial-builders test
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# This file can be run independently (quick):
|
||||
#
|
||||
# $ pkgs/build-support/trivial-builders/references-test.sh
|
||||
#
|
||||
# or in the build sandbox with a ~20s VM overhead
|
||||
#
|
||||
# $ nix-build -A tests.trivial-builders.references
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
|
||||
# strict bash
|
||||
set -euo pipefail
|
||||
|
||||
# debug
|
||||
# set -x
|
||||
# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
|
||||
|
||||
cd "$(dirname ${BASH_SOURCE[0]})" # nixpkgs root
|
||||
|
||||
if [[ -z ${SAMPLE:-} ]]; then
|
||||
echo "Running the script directly is currently not supported."
|
||||
echo "If you need to iterate, remove the raw path, which is not returned by nix-build."
|
||||
exit 1
|
||||
# sample=( `nix-build --no-out-link sample.nix` )
|
||||
# directRefs=( `nix-build --no-out-link invoke-writeDirectReferencesToFile.nix` )
|
||||
# references=( `nix-build --no-out-link invoke-writeReferencesToFile.nix` )
|
||||
# echo "sample: ${#sample[@]}"
|
||||
# echo "direct: ${#directRefs[@]}"
|
||||
# echo "indirect: ${#references[@]}"
|
||||
else
|
||||
# Injected by Nix (to avoid evaluating in a derivation)
|
||||
# turn them into arrays
|
||||
sample=($SAMPLE)
|
||||
directRefs=($DIRECT_REFS)
|
||||
references=($REFERENCES)
|
||||
fi
|
||||
|
||||
echo >&2 Testing direct references...
|
||||
for i in "${!sample[@]}"; do
|
||||
echo >&2 Checking '#'$i ${sample[$i]} ${directRefs[$i]}
|
||||
diff -U3 \
|
||||
<(sort <${directRefs[$i]}) \
|
||||
<(nix-store -q --references ${sample[$i]} | sort)
|
||||
done
|
||||
|
||||
echo >&2 Testing closure...
|
||||
for i in "${!sample[@]}"; do
|
||||
echo >&2 Checking '#'$i ${sample[$i]} ${references[$i]}
|
||||
diff -U3 \
|
||||
<(sort <${references[$i]}) \
|
||||
<(nix-store -q --requisites ${sample[$i]} | sort)
|
||||
done
|
||||
|
||||
echo 'OK!'
|
||||
@ -1,52 +0,0 @@
|
||||
{ lib, testers, pkgs, writeText, hello, figlet, stdenvNoCC }:
|
||||
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# trivial-builders test
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# This file can be run independently (quick):
|
||||
#
|
||||
# $ pkgs/build-support/trivial-builders/references-test.sh
|
||||
#
|
||||
# or in the build sandbox with a ~20s VM overhead
|
||||
#
|
||||
# $ nix-build -A tests.trivial-builders.references
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
|
||||
let
|
||||
invokeSamples = file:
|
||||
lib.concatStringsSep " " (
|
||||
lib.attrValues (import file { inherit pkgs; })
|
||||
);
|
||||
in
|
||||
testers.nixosTest {
|
||||
name = "nixpkgs-trivial-builders";
|
||||
nodes.machine = { ... }: {
|
||||
virtualisation.writableStore = true;
|
||||
|
||||
# Test runs without network, so we don't substitute and prepare our deps
|
||||
nix.settings.substituters = lib.mkForce [];
|
||||
environment.etc."pre-built-paths".source = writeText "pre-built-paths" (
|
||||
builtins.toJSON [hello figlet stdenvNoCC]
|
||||
);
|
||||
environment.variables = {
|
||||
SAMPLE = invokeSamples ./sample.nix;
|
||||
REFERENCES = invokeSamples ./invoke-writeReferencesToFile.nix;
|
||||
DIRECT_REFS = invokeSamples ./invoke-writeDirectReferencesToFile.nix;
|
||||
};
|
||||
};
|
||||
testScript =
|
||||
''
|
||||
machine.succeed("""
|
||||
${./references-test.sh} 2>/dev/console
|
||||
""")
|
||||
'';
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
roberth
|
||||
];
|
||||
};
|
||||
}
|
||||
124
pkgs/build-support/trivial-builders/test/references/default.nix
Normal file
124
pkgs/build-support/trivial-builders/test/references/default.nix
Normal file
@ -0,0 +1,124 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, testers
|
||||
, callPackage
|
||||
, writeText
|
||||
# nativeBuildInputs
|
||||
, shellcheck-minimal
|
||||
# Samples
|
||||
, samples ? cleanSamples (callPackage ./samples.nix { })
|
||||
# Filter out the non-string-like attributes such as <pkg>.override added by
|
||||
# callPackage.
|
||||
, cleanSamples ? lib.filterAttrs (n: lib.isStringLike)
|
||||
# Test targets
|
||||
, writeDirectReferencesToFile
|
||||
, writeReferencesToFile
|
||||
}:
|
||||
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# trivial-builders test
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# Execute this build script directly (quick):
|
||||
#
|
||||
# * Classic
|
||||
# $ NIX_PATH="nixpkgs=$PWD" nix-shell -p tests.trivial-builders.references.testScriptBin --run references-test
|
||||
#
|
||||
# * Flake-based
|
||||
# $ nix run .#tests.trivial-builders.references.testScriptBin
|
||||
#
|
||||
# or in the build sandbox with a ~20s VM overhead:
|
||||
#
|
||||
# * Classic
|
||||
# $ nix-build --no-out-link -A tests.trivial-builders.references
|
||||
#
|
||||
# * Flake-based
|
||||
# $ nix build -L --no-link .#tests.trivial-builders.references
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
|
||||
let
|
||||
# Map each attribute to an element specification of Bash associative arrary
|
||||
# and concatenate them with white spaces, to be used to define a
|
||||
# one-line Bash associative array.
|
||||
samplesToString = attrs:
|
||||
lib.concatMapStringsSep " " (name: "[${name}]=${lib.escapeShellArg "${attrs.${name}}"}") (builtins.attrNames attrs);
|
||||
|
||||
references = lib.mapAttrs (n: v: writeReferencesToFile v) samples;
|
||||
directReferences = lib.mapAttrs (n: v: writeDirectReferencesToFile v) samples;
|
||||
|
||||
testScriptBin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "references-test";
|
||||
|
||||
src = ./references-test.sh;
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/bin"
|
||||
substitute "$src" "$out/bin/${finalAttrs.meta.mainProgram}" \
|
||||
--replace "@SAMPLES@" ${lib.escapeShellArg (samplesToString samples)} \
|
||||
--replace "@REFERENCES@" ${lib.escapeShellArg (samplesToString references)} \
|
||||
--replace "@DIRECT_REFS@" ${lib.escapeShellArg (samplesToString directReferences)}
|
||||
runHook postInstall
|
||||
chmod +x "$out/bin/${finalAttrs.meta.mainProgram}"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
shellcheck-minimal
|
||||
];
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
shellcheck "$out/bin/${finalAttrs.meta.mainProgram}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit
|
||||
directReferences
|
||||
references
|
||||
samples
|
||||
;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "references-test";
|
||||
};
|
||||
});
|
||||
in
|
||||
testers.nixosTest {
|
||||
name = "nixpkgs-trivial-builders";
|
||||
nodes.machine = { ... }: {
|
||||
virtualisation.writableStore = true;
|
||||
|
||||
# Test runs without network, so we don't substitute and prepare our deps
|
||||
nix.settings.substituters = lib.mkForce [ ];
|
||||
environment.etc."pre-built-paths".source = writeText "pre-built-paths" (
|
||||
builtins.toJSON [ testScriptBin ]
|
||||
);
|
||||
};
|
||||
testScript =
|
||||
''
|
||||
machine.succeed("""
|
||||
${lib.getExe testScriptBin} 2>/dev/console
|
||||
""")
|
||||
'';
|
||||
passthru = {
|
||||
inherit
|
||||
directReferences
|
||||
references
|
||||
samples
|
||||
testScriptBin
|
||||
;
|
||||
};
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
roberth
|
||||
ShamrockLee
|
||||
];
|
||||
};
|
||||
}
|
||||
61
pkgs/build-support/trivial-builders/test/references/references-test.sh
Executable file
61
pkgs/build-support/trivial-builders/test/references/references-test.sh
Executable file
@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# trivial-builders test
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
#
|
||||
# Execute this build script directly (quick):
|
||||
#
|
||||
# * Classic
|
||||
# $ NIX_PATH="nixpkgs=$PWD" nix-shell -p tests.trivial-builders.references.testScriptBin --run references-test
|
||||
#
|
||||
# * Flake-based
|
||||
# $ nix run .#tests.trivial-builders.references.testScriptBin
|
||||
#
|
||||
# or in the build sandbox with a ~20s VM overhead:
|
||||
#
|
||||
# * Classic
|
||||
# $ nix-build --no-out-link -A tests.trivial-builders.references
|
||||
#
|
||||
# * Flake-based
|
||||
# $ nix build -L --no-link .#tests.trivial-builders.references
|
||||
#
|
||||
# -------------------------------------------------------------------------- #
|
||||
|
||||
# strict bash
|
||||
set -euo pipefail
|
||||
|
||||
# debug
|
||||
# set -x
|
||||
# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")" # nixpkgs root
|
||||
|
||||
# Injected by Nix (to avoid evaluating in a derivation)
|
||||
# turn them into arrays
|
||||
# shellcheck disable=SC2206 # deliberately unquoted
|
||||
declare -A samples=( @SAMPLES@ )
|
||||
# shellcheck disable=SC2206 # deliberately unquoted
|
||||
declare -A directRefs=( @DIRECT_REFS@ )
|
||||
# shellcheck disable=SC2206 # deliberately unquoted
|
||||
declare -A references=( @REFERENCES@ )
|
||||
|
||||
echo >&2 Testing direct references...
|
||||
for i in "${!samples[@]}"; do
|
||||
echo >&2 Checking "$i" "${samples[$i]}" "${directRefs[$i]}"
|
||||
diff -U3 \
|
||||
<(sort <"${directRefs[$i]}") \
|
||||
<(nix-store -q --references "${samples[$i]}" | sort)
|
||||
done
|
||||
|
||||
echo >&2 Testing closure...
|
||||
for i in "${!samples[@]}"; do
|
||||
echo >&2 Checking "$i" "${samples[$i]}" "${references[$i]}"
|
||||
diff -U3 \
|
||||
<(sort <"${references[$i]}") \
|
||||
<(nix-store -q --requisites "${samples[$i]}" | sort)
|
||||
done
|
||||
|
||||
echo 'OK!'
|
||||
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, runCommand
|
||||
, writeText
|
||||
, emptyFile
|
||||
, emptyDirectory
|
||||
, figlet
|
||||
, hello
|
||||
, zlib
|
||||
}:
|
||||
{
|
||||
inherit
|
||||
figlet
|
||||
hello
|
||||
zlib
|
||||
;
|
||||
zlib-dev = zlib.dev;
|
||||
norefs = writeText "hi" "hello";
|
||||
norefsDup = writeText "hi" "hello";
|
||||
helloRef = writeText "hi" "hello ${hello}";
|
||||
helloRefDup = writeText "hi" "hello ${hello}";
|
||||
path = ./samples.nix;
|
||||
pathLike.outPath = ./samples.nix;
|
||||
helloFigletRef = writeText "hi" "hello ${hello} ${figlet}";
|
||||
selfRef = runCommand "self-ref-1" { } "echo $out >$out";
|
||||
selfRef2 = runCommand "self-ref-2" { } ''echo "${figlet}, $out" >$out'';
|
||||
inherit
|
||||
emptyFile
|
||||
emptyDirectory
|
||||
;
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{ pkgs ? import ../../../.. { config = { }; overlays = [ ]; } }:
|
||||
let
|
||||
inherit (pkgs)
|
||||
figlet
|
||||
zlib
|
||||
hello
|
||||
writeText
|
||||
runCommand
|
||||
;
|
||||
in
|
||||
{
|
||||
hello = hello;
|
||||
figlet = figlet;
|
||||
zlib = zlib;
|
||||
zlib-dev = zlib.dev;
|
||||
norefs = writeText "hi" "hello";
|
||||
norefsDup = writeText "hi" "hello";
|
||||
helloRef = writeText "hi" "hello ${hello}";
|
||||
helloRefDup = writeText "hi" "hello ${hello}";
|
||||
path = ./invoke-writeReferencesToFile.nix;
|
||||
pathLike.outPath = ./invoke-writeReferencesToFile.nix;
|
||||
helloFigletRef = writeText "hi" "hello ${hello} ${figlet}";
|
||||
selfRef = runCommand "self-ref-1" {} "echo $out >$out";
|
||||
selfRef2 = runCommand "self-ref-2" {} ''echo "${figlet}, $out" >$out'';
|
||||
inherit (pkgs)
|
||||
emptyFile
|
||||
emptyDirectory
|
||||
;
|
||||
}
|
||||
@ -1,14 +1,13 @@
|
||||
{ callPackage, lib, pkgs, runCommand, writeText, writeStringReferencesToFile }:
|
||||
{ callPackage, lib, pkgs, runCommand, samples, writeText, writeStringReferencesToFile }:
|
||||
let
|
||||
sample = import ./sample.nix { inherit pkgs; };
|
||||
samplePaths = lib.unique (lib.attrValues sample);
|
||||
samplePaths = lib.unique (lib.attrValues samples);
|
||||
stri = x: "${x}";
|
||||
sampleText = writeText "sample-text" (lib.concatStringsSep "\n" (lib.unique (map stri samplePaths)));
|
||||
stringReferencesText =
|
||||
writeStringReferencesToFile
|
||||
((lib.concatMapStringsSep "fillertext"
|
||||
stri
|
||||
(lib.attrValues sample)) + ''
|
||||
(lib.attrValues samples)) + ''
|
||||
STORE=${builtins.storeDir};\nsystemctl start bar-foo.service
|
||||
'');
|
||||
in
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "convco";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "convco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qf04mtxBqZy9kpFsqz8lVtyUzNtCYE8cNiVJVQ+sCn0=";
|
||||
hash = "sha256-x01fkicoAH8NaJJqIF5jjbZ53TitnXBCdKEbr8xVCyE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A1z8ccdsaBC9gY4rD/0NnuQHm7x4eVlMPBvkMKGHK54=";
|
||||
cargoHash = "sha256-j2xuaAkycWp5sCAmVJLYfqH1ZGxIGU/a/97WpGyQcvU=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3bar-river";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaxVerevkin";
|
||||
repo = "i3bar-river";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AXa+K+njXkrJeqABD04WHpmvAzAL1Mw11ZhCfFNJxhY=";
|
||||
hash = "sha256-wtyC8cGK408KZYpWniW2y4XI1ScTSBZJJlUt6b2Z5KA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tNuv+D75wox3HlUZSJJ67KEBKmGJXBkXHfvDsNHeM6A=";
|
||||
cargoHash = "sha256-PdSMDsV3yFy3kSNS6OBxFdrZsIn70gXOTd2AhyU4a9o=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pango ];
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "steamguard-cli";
|
||||
version = "0.12.3";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dyc3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qfyo63u6gBkGNxVBmFsz9YXs6duRU/VnFly40C13vI8=";
|
||||
hash = "sha256-YjJhCEg87xuUFjHD6cBN4dhQhx/c4F/XewyMYeA06+U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B8/WCSHC905wDxYGLYVMT0QxgMiGR0/VMVzOlyTKPss=";
|
||||
cargoHash = "sha256-Z1KWU7Z9iGs5yjuWilMSYhfIilSW8ng+pq5ENfunINo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
|
||||
2754
pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock
generated
Normal file
2754
pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
61
pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
Normal file
61
pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, mesa
|
||||
, libglvnd
|
||||
, libxkbcommon
|
||||
, pipewire
|
||||
, wayland
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xdg-desktop-portal-cosmic";
|
||||
version = "unstable-2023-12-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "23b3e5a1b9fa76e30266f29949d54e97c2fadf6e";
|
||||
hash = "sha256-AqwJ3bV8Xz0MpY/ZmWgE9vNJIACX5SVeIYbSewyG/Bs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
|
||||
"cosmic-protocols-0.1.0" = "sha256-AEgvF7i/OWPdEMi8WUaAg99igBwE/AexhAXHxyeJMdc=";
|
||||
"ashpd-0.7.0" = "sha256-jBuxKJ2ADBvkJPPv4gzmFlZFybrfZBkCjerzeKe2Tt4=";
|
||||
"libspa-0.7.2" = "sha256-QWOcNWzEyxfTdjUIB33s9dpWJ7Fsfmb5jd70CXOP/bw=";
|
||||
};
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ];
|
||||
buildInputs = [ libglvnd libxkbcommon mesa pipewire wayland ];
|
||||
|
||||
# Force linking to libEGL, which is always dlopen()ed, and to
|
||||
# libwayland-client, which is always dlopen()ed except by the
|
||||
# obscure winit backend.
|
||||
RUSTFLAGS = map (a: "-C link-arg=${a}") [
|
||||
"-Wl,--push-state,--no-as-needed"
|
||||
"-lEGL"
|
||||
"-lwayland-client"
|
||||
"-Wl,--pop-state"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{dbus-1/services,xdg-desktop-portal/portals}
|
||||
cp data/*.service $out/share/dbus-1/services/
|
||||
cp data/cosmic.portal $out/share/xdg-desktop-portal/portals/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic";
|
||||
description = "XDG Desktop Portal for the COSMIC Desktop Environment";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ nyanbinary ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20231201183121";
|
||||
version = "20231208065009";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-BOq4hT8K+m/bdAj6f1TbT3BvAn05bH3EdphcaWqFYFk=";
|
||||
hash = "sha256-Z5yUtkumr/JuKzq47QdPuHSJOSxD2XsK9sYE1hUhoyY=";
|
||||
};
|
||||
vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ=";
|
||||
meta = with lib; {
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-pomodoro";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Yn0lDCFpc8o25iiPib1n1NEBeodNAdTzRWcnLbXUA5g=";
|
||||
hash = "sha256-Ml3znMz1Q9593rMgfAST8k9QglxMG9ocFD7W8kaFWCw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -19,21 +19,22 @@ stdenv.mkDerivation rec {
|
||||
# Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
|
||||
patches = lib.optional (!waylandSupport) ./x11.patch;
|
||||
|
||||
propagatedBuildInputs = [ (if stdenv.isDarwin then OpenGL else libGL) ];
|
||||
propagatedBuildInputs =
|
||||
lib.optionals stdenv.isDarwin [ OpenGL ]
|
||||
++ lib.optionals stdenv.isLinux [ libGL ];
|
||||
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames
|
||||
++ lib.optional waylandSupport extra-cmake-modules;
|
||||
|
||||
buildInputs =
|
||||
if waylandSupport
|
||||
then [ wayland wayland-protocols libxkbcommon ]
|
||||
else [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ];
|
||||
lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]
|
||||
++ lib.optionals (stdenv.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon ]
|
||||
++ lib.optionals (stdenv.isLinux && !waylandSupport) [ libX11 libXrandr libXinerama libXcursor libXi libXext ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [
|
||||
"-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'"
|
||||
] ++ lib.optionals waylandSupport [
|
||||
"-DGLFW_USE_WAYLAND=ON"
|
||||
@ -50,6 +51,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.glfw.org/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ marcweber twey ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdatachannel";
|
||||
version = "0.19.3";
|
||||
version = "0.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paullouisageneau";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0=";
|
||||
hash = "sha256-XtD46tEV6RU1xbQgGA/nP6zWMgnZkOffVPdl8t/hIiA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "paho.mqtt.cpp";
|
||||
version = "1.3.0";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "paho.mqtt.cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QV6r4GzSVghgVQtF8OQ1a23PtCdjg7PeuGRBdA+WbE0=";
|
||||
hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -49,6 +49,5 @@ buildPythonPackage rec {
|
||||
description = "A helper to mock/fake web requests in python aiohttp package";
|
||||
homepage = "https://github.com/pnuckowski/aioresponses";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.79";
|
||||
version = "0.2.83";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-boz4CiAmB9guhM9irW3m2ZRlt4mmcopWD+/3Y6O/Mxk=";
|
||||
hash = "sha256-tpncBgKUf2jRmvcHgi2fudTGdCEv0AhHUWD1sPO98/I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -22,6 +22,5 @@ buildPythonPackage rec {
|
||||
description = "CFFI bindings around Google Chromium's embedded compact language detection library (CLD2)";
|
||||
homepage = "https://github.com/GregBowyer/cld2-cffi";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -38,6 +38,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/cmcqueen/cobs-python/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ teams.ororatech ];
|
||||
maintainers = teams.ororatech.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "5.1.1";
|
||||
version = "5.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-M3aR3lCNtPIve1o16QLSnxrULhtXkuOXNYtOv2FmPMQ=";
|
||||
hash = "sha256-xgHS2QRzzn6pSremZ8gO4SZxD3qSea9oKDJv4Tk6+VQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -31,6 +31,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://dronecan.github.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ teams.ororatech ];
|
||||
maintainers = teams.ororatech.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,6 +39,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ICRAR/ijson";
|
||||
changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
, numpy
|
||||
, poppler_utils
|
||||
, pytestCheckHook
|
||||
, runCommand
|
||||
, scipy
|
||||
}:
|
||||
|
||||
@ -41,7 +42,10 @@ buildPythonPackage rec {
|
||||
srgbProfile = if stdenv.isDarwin then
|
||||
"/System/Library/ColorSync/Profiles/sRGB Profile.icc"
|
||||
else
|
||||
"${colord}/share/color/icc/colord/sRGB.icc";
|
||||
# break runtime dependency chain all of colord dependencies
|
||||
runCommand "sRGC.icc" { } ''
|
||||
cp ${colord}/share/color/icc/colord/sRGB.icc $out
|
||||
'';
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
|
||||
|
||||
@ -62,6 +62,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/karpierz/libpcap/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ teams.ororatech ];
|
||||
maintainers = teams.ororatech.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
description = "A Python client module for the Music Player Daemon";
|
||||
homepage = "https://github.com/Mic92/python-mpd2";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ rvl mic92 hexa ];
|
||||
maintainers = with maintainers; [ mic92 hexa ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -70,6 +70,5 @@ buildPythonPackage rec {
|
||||
description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification";
|
||||
homepage = "https://github.com/p1c2u/openapi-spec-validator";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -54,6 +54,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/karpierz/pkg_about/";
|
||||
changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst";
|
||||
license = licenses.zlib;
|
||||
maintainers = [ teams.ororatech ];
|
||||
maintainers = teams.ororatech.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -44,6 +44,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://opencyphal.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ teams.ororatech ];
|
||||
maintainers = teams.ororatech.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -47,6 +47,5 @@ buildPythonPackage rec {
|
||||
description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
|
||||
homepage = "https://github.com/wmayner/pyemd";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -39,6 +39,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/Kozea/Pyphen";
|
||||
changelog = "https://github.com/Kozea/Pyphen/releases/tag/${version}";
|
||||
license = with licenses; [gpl2 lgpl21 mpl20];
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyschlage";
|
||||
version = "2023.11.0";
|
||||
version = "2023.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "dknowles2";
|
||||
repo = "pyschlage";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-18kVXGpklfvCGOy2jBOG9BAAzE0ZVQ3LONjiwo9YnjU=";
|
||||
hash = "sha256-arodPjiigEx90W8ycneD8Ho6SLQaB9FfFtdV74fZp2w=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -75,7 +75,6 @@ let
|
||||
description = "Models for the spaCy NLP library";
|
||||
homepage = "https://github.com/explosion/spacy-models";
|
||||
license = licenses.${license};
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -68,6 +68,5 @@ buildPythonPackage rec {
|
||||
description = "Higher-level text processing, built on spaCy";
|
||||
homepage = "https://textacy.readthedocs.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -85,6 +85,5 @@ buildPythonPackage rec {
|
||||
description = "Python SOAP client";
|
||||
homepage = "http://docs.python-zeep.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -46,6 +46,6 @@ buildPythonApplication rec {
|
||||
'';
|
||||
homepage = "https://github.com/OpenCyphal/yakut/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ teams.ororatech ];
|
||||
maintainers = teams.ororatech.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "railway";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XzDxfjXY7Mu6qDZ66r3c0/RDBQF7wCONZTpfQ0j1B1c=";
|
||||
hash = "sha256-QlynZgmDd7m7m17J5lUTmejkKdQlfjiqcXg4ZMFp0vc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J/ecoC8efv0IfAta7Ug0g7N/2jGV+DOACgbhXVfNK3k=";
|
||||
cargoHash = "sha256-TOuxJL2UtMA9mZLHZVQDD6lyL9VWy/HBNfezhOGbSG8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, testers, sq }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }:
|
||||
|
||||
buildGo121Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "sq";
|
||||
version = "0.42.1";
|
||||
version = "0.46.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neilotoole";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3Hu0vMulGWyNWgNlekYuTRxxxBbRkWj2RE0MWZzNXFk=";
|
||||
hash = "sha256-TjJ3XDyHHZWMAYV5bJQffH4a9AheZWraov3d4HB/yno=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qEwK40BcUetsQOIefdjM/dgjTNuHO1EZgVk53/dfOlc=";
|
||||
vendorHash = "sha256-DIYSUIUHEiRv+pPZ2hE/2X4GmT3lvdWd/mkl1wbjID4=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@ let
|
||||
# NOTE: When updating these, please also take a look at the changes done to
|
||||
# kernel config in the xanmod version commit
|
||||
ltsVariant = {
|
||||
version = "6.1.63";
|
||||
hash = "sha256-WBMKJCLYexWJuTpli8vjvdms2ZYPXIS0yUxTgAL00io=";
|
||||
version = "6.1.65";
|
||||
hash = "sha256-/KJCUAti/p48KTIvRdGeD4aXfhiBdjZUIKD45Hu2d1g=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.5.12";
|
||||
hash = "sha256-zG9+d+hKg0S0qCX2hOc02CowC6s9u82MB45+X1bGYpE=";
|
||||
version = "6.6.4";
|
||||
hash = "sha256-f/McwYD/4849GwtHml+AMSF5/gHuDrrlbz8gYZghaw0=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, installShellFiles
|
||||
}:
|
||||
let
|
||||
version = "2.7.5";
|
||||
version = "2.7.6";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
@ -23,10 +23,10 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0IZZ7mkEzZI2Y8ed//m0tbBQZ0YcCXA0/b10ntNIXUk=";
|
||||
hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YNcQtjPGQ0XMSog+sWlH4lG/QdbdI0Lyh/fUGqQUFaY=";
|
||||
vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek=";
|
||||
|
||||
subPackages = [ "cmd/caddy" ];
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "guacamole-client";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war";
|
||||
hash = "sha256-FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE=";
|
||||
hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guacamole-server";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "guacamole-server";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8VPhaZ+XnbDElF5MOpbA8MDDTUkou9O2z4NUdWwW4FM=";
|
||||
hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, abootimg
|
||||
, acl
|
||||
, apksigcopier
|
||||
, apksigner
|
||||
, apktool
|
||||
@ -78,11 +79,11 @@
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "252";
|
||||
version = "253";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-NmYv5htZT2v04vVksIWGuaPI1rXfNmrVSmErT/faBbQ=";
|
||||
hash = "sha256-xI+SIEUPKFxz7sk9qqE1ibSJX0WRPnJEpco0Mqv7Wp8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -112,16 +113,20 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
|
||||
#
|
||||
# Still missing these tools:
|
||||
# Android-specific tools:
|
||||
# aapt2
|
||||
# dexdump
|
||||
# docx2txt
|
||||
# getfacl
|
||||
# Darwin-specific tools:
|
||||
# lipo
|
||||
# otool
|
||||
# r2pipe
|
||||
# Other tools:
|
||||
# docx2txt <- makes tests broken:
|
||||
# > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range
|
||||
# > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError
|
||||
#
|
||||
# We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
|
||||
pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([
|
||||
acl
|
||||
binutils-unwrapped-all-targets
|
||||
bzip2
|
||||
cdrkit
|
||||
@ -209,6 +214,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
guestfs
|
||||
h5py
|
||||
pdfminer-six
|
||||
# docx2txt, breaks the tests.
|
||||
])
|
||||
# oggvideotools is broken on Darwin, please put it back when it will be fixed?
|
||||
++ lib.optionals stdenv.isLinux [ oggvideotools ]
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mongo-tools";
|
||||
version = "100.9.1";
|
||||
version = "100.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-c+pzpDUDx6xqpELLM32z0T5mGlF0qk6wqyS1OU9NkRs=";
|
||||
sha256 = "sha256-l3A7ykkQCkT34EdgpcSJpFsZq1gE9GII9gzaXJaUwEk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Bx/ryoftrhDExugtvviRU4f4pIlerV2ehJWAJUGizvs=";
|
||||
hash = "sha256-/oTZIjLWLOUSzv36qa57Q1YpIJEz0fIaLsYkuuQ2Y6o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r5m9yvdy7Bnh9QvcrAwwO6od2C7JCcxwFx4p+W8qlMY=";
|
||||
vendorHash = "sha256-e7iaR1u1EubWrq9Ktkz4b3GJGDdvnLfguym+r2qAYS0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/nuclei/"
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinentry-rofi";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plattfot";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H9Y7oPLpDuKtIy80HLS8/iXpOq8ZKiy8ZIH2NwguetY=";
|
||||
sha256 = "sha256-6dhzzxjE3GE5JZTirMLeMh91BS2wzDZoubgf4Wefe1o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# Don't forget to update go.d.plugin.nix as well
|
||||
version = "1.43.2";
|
||||
version = "1.44.0";
|
||||
pname = "netdata";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
|
||||
repo = "netdata";
|
||||
rev = "v${version}";
|
||||
hash = if withCloudUi
|
||||
then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74="
|
||||
else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek=";
|
||||
then "sha256-8kkOpMfcYPcHI3GuevZ2NYjJjlZvrvBgIs883Zsztgw="
|
||||
else "sha256-Kui3sV8OzBri4h47qD10snQgdvdi6yi/2z4cXWREcxE=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# Remove v2 dashboard distributed under NCUL1. Make sure an empty
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGo121Module rec {
|
||||
pname = "netdata-go-plugins";
|
||||
version = "0.56.4";
|
||||
version = "0.57.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "go.d.plugin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7dR1TL2Ycb+7yHoFklrKdXXxIG4Tx+fAG5ScAAtbVRw=";
|
||||
hash = "sha256-Qtk1/sQxWAGPHid6tPlwylyHvhxwWTJMT8TwCd/gazk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Faa+7tT3sPxlT6eQEmFotOJnt9b49ffDPEHt5V7tQa0=";
|
||||
vendorHash = "sha256-SFXf99cSA8sncAzZqj2eiiJFhyD4TXQipGAeM2Hivak=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
|
||||
index 2aec3dd3e..27385ec28 100644
|
||||
--- a/collectors/Makefile.am
|
||||
+++ b/collectors/Makefile.am
|
||||
@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
|
||||
diff --git c/collectors/Makefile.am i/collectors/Makefile.am
|
||||
index 1bbb2e0ef..96c400d33 100644
|
||||
--- c/collectors/Makefile.am
|
||||
+++ i/collectors/Makefile.am
|
||||
@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
|
||||
usergoconfigdir=$(configdir)/go.d
|
||||
|
||||
# Explicitly install directories to avoid permission issues due to umask
|
||||
@ -11,10 +11,10 @@ index 2aec3dd3e..27385ec28 100644
|
||||
$(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
|
||||
$(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
|
||||
|
||||
diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
|
||||
index 03c7f0a94..01985db01 100644
|
||||
--- a/collectors/charts.d.plugin/Makefile.am
|
||||
+++ b/collectors/charts.d.plugin/Makefile.am
|
||||
diff --git c/collectors/charts.d.plugin/Makefile.am i/collectors/charts.d.plugin/Makefile.am
|
||||
index f82992fd4..4cac1ae4f 100644
|
||||
--- c/collectors/charts.d.plugin/Makefile.am
|
||||
+++ i/collectors/charts.d.plugin/Makefile.am
|
||||
@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \
|
||||
$(NULL)
|
||||
|
||||
@ -24,10 +24,10 @@ index 03c7f0a94..01985db01 100644
|
||||
$(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
|
||||
|
||||
chartsconfigdir=$(libconfigdir)/charts.d
|
||||
diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am
|
||||
diff --git c/collectors/ebpf.plugin/Makefile.am i/collectors/ebpf.plugin/Makefile.am
|
||||
index 2d5f92a6b..8b11c7502 100644
|
||||
--- a/collectors/ebpf.plugin/Makefile.am
|
||||
+++ b/collectors/ebpf.plugin/Makefile.am
|
||||
--- c/collectors/ebpf.plugin/Makefile.am
|
||||
+++ i/collectors/ebpf.plugin/Makefile.am
|
||||
@@ -9,7 +9,7 @@ SUFFIXES = .in
|
||||
userebpfconfigdir=$(configdir)/ebpf.d
|
||||
|
||||
@ -37,10 +37,10 @@ index 2d5f92a6b..8b11c7502 100644
|
||||
$(INSTALL) -d $(DESTDIR)$(userebpfconfigdir)
|
||||
|
||||
dist_noinst_DATA = \
|
||||
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
|
||||
diff --git c/collectors/python.d.plugin/Makefile.am i/collectors/python.d.plugin/Makefile.am
|
||||
index ca49c1c02..1b9bcc446 100644
|
||||
--- a/collectors/python.d.plugin/Makefile.am
|
||||
+++ b/collectors/python.d.plugin/Makefile.am
|
||||
--- c/collectors/python.d.plugin/Makefile.am
|
||||
+++ i/collectors/python.d.plugin/Makefile.am
|
||||
@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \
|
||||
$(NULL)
|
||||
|
||||
@ -50,10 +50,10 @@ index ca49c1c02..1b9bcc446 100644
|
||||
$(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
|
||||
|
||||
pythonconfigdir=$(libconfigdir)/python.d
|
||||
diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
|
||||
diff --git c/collectors/statsd.plugin/Makefile.am i/collectors/statsd.plugin/Makefile.am
|
||||
index c8144c137..f8aaa89b6 100644
|
||||
--- a/collectors/statsd.plugin/Makefile.am
|
||||
+++ b/collectors/statsd.plugin/Makefile.am
|
||||
--- c/collectors/statsd.plugin/Makefile.am
|
||||
+++ i/collectors/statsd.plugin/Makefile.am
|
||||
@@ -19,5 +19,5 @@ dist_userstatsdconfig_DATA = \
|
||||
$(NULL)
|
||||
|
||||
@ -61,10 +61,10 @@ index c8144c137..f8aaa89b6 100644
|
||||
-install-exec-local:
|
||||
+no-install-exec-local:
|
||||
$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
|
||||
diff --git a/health/Makefile.am b/health/Makefile.am
|
||||
index 20e000860..add0137b3 100644
|
||||
--- a/health/Makefile.am
|
||||
+++ b/health/Makefile.am
|
||||
diff --git c/health/Makefile.am i/health/Makefile.am
|
||||
index 7d7bca4cc..3086876dd 100644
|
||||
--- c/health/Makefile.am
|
||||
+++ i/health/Makefile.am
|
||||
@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
|
||||
$(NULL)
|
||||
|
||||
@ -74,11 +74,24 @@ index 20e000860..add0137b3 100644
|
||||
$(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
|
||||
|
||||
healthconfigdir=$(libconfigdir)/health.d
|
||||
diff --git a/system/Makefile.am b/system/Makefile.am
|
||||
index 54e9278c8..e7cc7acea 100644
|
||||
--- a/system/Makefile.am
|
||||
+++ b/system/Makefile.am
|
||||
@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc
|
||||
diff --git c/logsmanagement/Makefile.am i/logsmanagement/Makefile.am
|
||||
index 33f08d556..1f08cbae9 100644
|
||||
--- c/logsmanagement/Makefile.am
|
||||
+++ i/logsmanagement/Makefile.am
|
||||
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
userlogsmanagconfigdir=$(configdir)/logsmanagement.d
|
||||
|
||||
# Explicitly install directories to avoid permission issues due to umask
|
||||
-install-exec-local:
|
||||
+no-install-exec-local:
|
||||
$(INSTALL) -d $(DESTDIR)$(userlogsmanagconfigdir)
|
||||
|
||||
dist_libconfig_DATA = \
|
||||
diff --git c/system/Makefile.am i/system/Makefile.am
|
||||
index 1e96f6f4f..98122ecdc 100644
|
||||
--- c/system/Makefile.am
|
||||
+++ i/system/Makefile.am
|
||||
@@ -22,12 +22,9 @@ include $(top_srcdir)/build/subst.inc
|
||||
SUFFIXES = .in
|
||||
|
||||
dist_config_SCRIPTS = \
|
||||
@ -91,7 +104,7 @@ index 54e9278c8..e7cc7acea 100644
|
||||
$(NULL)
|
||||
|
||||
libconfigvnodesdir=$(libconfigdir)/vnodes
|
||||
@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit
|
||||
@@ -47,7 +44,7 @@ libsysrunitdir=$(libsysdir)/runit
|
||||
libsyssystemddir=$(libsysdir)/systemd
|
||||
|
||||
# Explicitly install directories to avoid permission issues due to umask
|
||||
@ -100,10 +113,10 @@ index 54e9278c8..e7cc7acea 100644
|
||||
$(INSTALL) -d $(DESTDIR)$(configdir)
|
||||
$(INSTALL) -d $(DESTDIR)$(libsysdir)
|
||||
$(INSTALL) -d $(DESTDIR)$(libsyscrondir)
|
||||
diff --git a/web/Makefile.am b/web/Makefile.am
|
||||
diff --git c/web/Makefile.am i/web/Makefile.am
|
||||
index be2c545c3..55f373114 100644
|
||||
--- a/web/Makefile.am
|
||||
+++ b/web/Makefile.am
|
||||
--- c/web/Makefile.am
|
||||
+++ i/web/Makefile.am
|
||||
@@ -13,7 +13,7 @@ SUBDIRS = \
|
||||
usersslconfigdir=$(configdir)/ssl
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user