Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -90,6 +90,49 @@ in
|
||||
""
|
||||
"${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${validateConfig configFile}"
|
||||
];
|
||||
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_SYS_TIME"
|
||||
"CAP_NET_BIND_SERVICE"
|
||||
];
|
||||
AmbientCapabilities = [
|
||||
"CAP_SYS_TIME"
|
||||
"CAP_NET_BIND_SERVICE"
|
||||
];
|
||||
LimitCORE = 0;
|
||||
LimitNOFILE = 65535;
|
||||
LockPersonality = true;
|
||||
MemorySwapMax = 0;
|
||||
MemoryZSwapMax = 0;
|
||||
PrivateTmp = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "10s";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
"AF_NETLINK"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"@resources"
|
||||
"@network-io"
|
||||
"@clock"
|
||||
];
|
||||
NoNewPrivileges = true;
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -103,6 +146,44 @@ in
|
||||
""
|
||||
"${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${validateConfig configFile}"
|
||||
];
|
||||
|
||||
CapabilityBoundingSet = [ ];
|
||||
LimitCORE = 0;
|
||||
LimitNOFILE = 65535;
|
||||
LockPersonality = true;
|
||||
MemorySwapMax = 0;
|
||||
MemoryZSwapMax = 0;
|
||||
PrivateTmp = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
PrivateDevices = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"@network-io"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
"~@mount"
|
||||
];
|
||||
NoNewPrivileges = true;
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "genesis-plus-gx";
|
||||
version = "0-unstable-2025-07-18";
|
||||
version = "0-unstable-2025-08-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "Genesis-Plus-GX";
|
||||
rev = "0cfb7a22b129f42feb3b48095871c122acf45158";
|
||||
hash = "sha256-Fonxi2RQJ/iqSLAfun2anHCzVnM7TkJFkc8PtWkNsQY=";
|
||||
rev = "a69c81e44a3a25e5a9254a18652eae2dad875003";
|
||||
hash = "sha256-vjh8NxoQgGU/u8XZLLQslYSlJdlMqU5quOjyWnUm3Ig=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "33.8.0";
|
||||
version = "33.8.1.2";
|
||||
|
||||
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
|
||||
|
||||
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
gtk3 = fetchzip {
|
||||
urls = urlRegionVariants "gtk3";
|
||||
hash = "sha256-cdPFMYlVEr6D+0mH7Mg5nGpf0KvePGLm3Y/ZytdFHHA=";
|
||||
hash = "sha256-qgabtZ/8nBaOGP0pIXd/byd9XCxulT8w+7uczJE4SAg=";
|
||||
};
|
||||
gtk2 = fetchzip {
|
||||
urls = urlRegionVariants "gtk2";
|
||||
hash = "sha256-dgWKmkHl5B1ri3uev63MNz/+E767ip9wJ/YzSog8vdQ=";
|
||||
hash = "sha256-qeA8EYRY9STsezWrvlVt73fgxPB0mynkxtTV71HFMgU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
let
|
||||
drv = stdenv.mkDerivation rec {
|
||||
pname = "controller-topology-project";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = "controller-topology-project";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0h2Qbnym8XxUVao7aEN25uIKSIreutH272OiqtG4Obc=";
|
||||
sha256 = "sha256-9NqupL/LAshME7GlzKAT6i3kx2MPEBU7Jw2nPele1W8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2025-07-06";
|
||||
version = "0-unstable-2025-08-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "339bee6f2de3de8e866c23b210baf6cabf153549";
|
||||
hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k=";
|
||||
rev = "80576999c92af3eb88ea2008d4a18d29393ed579";
|
||||
hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
commit 46479c52695cc5f8c01370fd2594468666c45c8e
|
||||
Author: rnhmjoj <rnhmjoj@inventati.org>
|
||||
Date: Sun Aug 3 00:18:47 2025 +0200
|
||||
|
||||
Fix the modules path at build time
|
||||
|
||||
The location of the modules is determined by reading the `module_path`
|
||||
setting, which is set to "$out/lib/baresip/modules" when the
|
||||
configuration file is generated during the first run. If the package is
|
||||
updated and the store path changes, baresip breaks completely, forcing
|
||||
the user to manually fix the configuration.
|
||||
|
||||
This patch fixes the location of the modules at build time, ignoring the
|
||||
`module_path` setting, to avoid this issue.
|
||||
|
||||
diff --git a/src/module.c b/src/module.c
|
||||
index 9f2135c6..b62d0bdd 100644
|
||||
--- a/src/module.c
|
||||
+++ b/src/module.c
|
||||
@@ -141,8 +141,7 @@ int module_init(const struct conf *conf)
|
||||
if (!conf)
|
||||
return EINVAL;
|
||||
|
||||
- if (conf_get(conf, "module_path", &path))
|
||||
- pl_set_str(&path, ".");
|
||||
+ pl_set_str(&path, MOD_PATH);
|
||||
|
||||
err = conf_apply(conf, "module", module_handler, &path);
|
||||
if (err)
|
||||
@@ -29,21 +29,29 @@
|
||||
zlib,
|
||||
dbusSupport ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.10.1";
|
||||
version = "3.24.0";
|
||||
pname = "baresip";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "baresip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
|
||||
hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-modules-path.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
|
||||
''
|
||||
+ lib.optionalString (!dbusSupport) ''
|
||||
substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -102,72 +110,75 @@ stdenv.mkDerivation rec {
|
||||
-D__need_timeval -D__need_timespec -D__need_time_t
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
# CMake feature detection is prone to breakage between upgrades:
|
||||
# spot-check that the optional modules we care about were compiled
|
||||
postInstallCheck = lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
|
||||
"account"
|
||||
"alsa"
|
||||
"aubridge"
|
||||
"auconv"
|
||||
"aufile"
|
||||
"auresamp"
|
||||
"ausine"
|
||||
"avcodec"
|
||||
"avfilter"
|
||||
"avformat"
|
||||
"cons"
|
||||
"contact"
|
||||
"ctrl_dbus"
|
||||
"ctrl_tcp"
|
||||
"debug_cmd"
|
||||
"dtls_srtp"
|
||||
"ebuacip"
|
||||
"echo"
|
||||
"evdev"
|
||||
"fakevideo"
|
||||
"g711"
|
||||
"g722"
|
||||
"g726"
|
||||
"gst"
|
||||
"gtk"
|
||||
"httpd"
|
||||
"httpreq"
|
||||
"ice"
|
||||
"l16"
|
||||
"menu"
|
||||
"mixausrc"
|
||||
"mixminus"
|
||||
"multicast"
|
||||
"mwi"
|
||||
"natpmp"
|
||||
"netroam"
|
||||
"pcp"
|
||||
"pipewire"
|
||||
"plc"
|
||||
"portaudio"
|
||||
"presence"
|
||||
"rtcpsummary"
|
||||
"sdl"
|
||||
"selfview"
|
||||
"serreg"
|
||||
"snapshot"
|
||||
"sndfile"
|
||||
"srtp"
|
||||
"stdio"
|
||||
"stun"
|
||||
"swscale"
|
||||
"syslog"
|
||||
"turn"
|
||||
"uuid"
|
||||
"v4l2"
|
||||
"vidbridge"
|
||||
"vidinfo"
|
||||
"vp8"
|
||||
"vp9"
|
||||
"vumeter"
|
||||
"x11"
|
||||
];
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
${lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
|
||||
"account"
|
||||
"alsa"
|
||||
"aubridge"
|
||||
"auconv"
|
||||
"aufile"
|
||||
"auresamp"
|
||||
"ausine"
|
||||
"avcodec"
|
||||
"avfilter"
|
||||
"avformat"
|
||||
"cons"
|
||||
"contact"
|
||||
"ctrl_dbus"
|
||||
"ctrl_tcp"
|
||||
"debug_cmd"
|
||||
"dtls_srtp"
|
||||
"ebuacip"
|
||||
"echo"
|
||||
"evdev"
|
||||
"fakevideo"
|
||||
"g711"
|
||||
"g722"
|
||||
"g726"
|
||||
"gst"
|
||||
"gtk"
|
||||
"httpd"
|
||||
"httpreq"
|
||||
"ice"
|
||||
"l16"
|
||||
"menu"
|
||||
"mixausrc"
|
||||
"mixminus"
|
||||
"multicast"
|
||||
"mwi"
|
||||
"natpmp"
|
||||
"netroam"
|
||||
"pcp"
|
||||
"pipewire"
|
||||
"plc"
|
||||
"portaudio"
|
||||
"presence"
|
||||
"rtcpsummary"
|
||||
"sdl"
|
||||
"selfview"
|
||||
"serreg"
|
||||
"snapshot"
|
||||
"sndfile"
|
||||
"srtp"
|
||||
"stdio"
|
||||
"stun"
|
||||
"swscale"
|
||||
"syslog"
|
||||
"turn"
|
||||
"uuid"
|
||||
"v4l2"
|
||||
"vidbridge"
|
||||
"vidinfo"
|
||||
"vp8"
|
||||
"vp9"
|
||||
"vumeter"
|
||||
"x11"
|
||||
]}
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Modular SIP User-Agent with audio and video support";
|
||||
@@ -175,6 +186,7 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
ehmry
|
||||
rnhmjoj
|
||||
];
|
||||
mainProgram = "baresip";
|
||||
license = lib.licenses.bsd3;
|
||||
|
||||
@@ -16,20 +16,20 @@ let
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/x64/Cursor-1.3.8-x86_64.AppImage";
|
||||
hash = "sha256-qR1Wu3H0JUCKIoUP/QFC1YyYiRaQ9PVN7ZT9TjHwn1k=";
|
||||
url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/x64/Cursor-1.3.9-x86_64.AppImage";
|
||||
hash = "sha256-0kkTL6ZCnLxGBQSVoZ7UEOBNtTZVQolVAk/2McCV0Rw=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/arm64/Cursor-1.3.8-aarch64.AppImage";
|
||||
hash = "sha256-UrUstEFP8W8Y9WUCR5kt3434bKCBBK/NaSu2UK8+gII=";
|
||||
url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/arm64/Cursor-1.3.9-aarch64.AppImage";
|
||||
hash = "sha256-5g26fm+tpm8xQTutygI20TcUHL08gKlG0uZSHixK2Ao=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-FGjqbOdr1HSjVlDYP/+vp4bVQoqdJww3U4t59QLg1kk=";
|
||||
url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-IJV35JNpoUybArz2NhvX8IzDUmvzN+GVq/MyDtXgVeI=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-tsVPS48APst7kbEh7cjhJ2zYKcKBDdjH+NXMpAe4Ixs=";
|
||||
url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-TYdv8UKoBtv0WUHWBqJtpG9vHDkEBBPLS/7BZhdxR1M=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = finalCommandLineArgs;
|
||||
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
pname = "cursor";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"codebuff": "^1.0.441"
|
||||
"codebuff": "^1.0.451"
|
||||
}
|
||||
},
|
||||
"node_modules/chownr": {
|
||||
@@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/codebuff": {
|
||||
"version": "1.0.441",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.441.tgz",
|
||||
"integrity": "sha512-2/u30sGXiEd1caB+doYWy34lbv8DJhQ2SomHXpCmmeEKITUgd9ckdVMLaaEgrR/FIUHyFBcu7aCVzmwsBEfnuQ==",
|
||||
"version": "1.0.451",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.451.tgz",
|
||||
"integrity": "sha512-LYzX+cu1zMnU/qntnRMQzQ+iPT436OYphFyIrEvx5DarfEEns5UIMDyWp0E9PWxbU4WsJfHJnL6srYxC/T8hUg==",
|
||||
"cpu": [
|
||||
"x64",
|
||||
"arm64"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "codebuff";
|
||||
version = "1.0.441";
|
||||
version = "1.0.451";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
|
||||
hash = "sha256-l57ZQTvvIR8mpFJGJeF6AqE6sbjIUkQdjlvdQ4UAQ9g=";
|
||||
hash = "sha256-98NiHDb0PrK71I28y7DwDJf2i+mKTQBp22PY4WJh5ig=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/LiXKA0HdFg3K7xyioL0SKjWicktCpih1oJkEPLDzIA=";
|
||||
npmDepsHash = "sha256-qtBi5OT7UBsCIriO6Fk33gLOFNp5Ae0bT9qN+37b2sg=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
+4
-8
@@ -1,13 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
requests,
|
||||
requests-cache,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "cryptop";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
@@ -17,7 +13,7 @@ buildPythonApplication rec {
|
||||
sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
requests
|
||||
requests-cache
|
||||
@@ -29,7 +25,7 @@ buildPythonApplication rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/huwwp/cryptop";
|
||||
description = "Command line Cryptocurrency Portfolio";
|
||||
license = with lib.licenses; [ mit ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bhipple ];
|
||||
mainProgram = "cryptop";
|
||||
};
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "gh-gei";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-gei";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mV7lqwC8S5ms79IIcmgDIsUlPKaLSWElXZ00Tm8qs4Y=";
|
||||
hash = "sha256-AMmeuobgJ+DSRG4zS7RP5l3/BraqQxXB+ygLDc3XnOs=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gosmee";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "gosmee";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MoSfEnciYn+Lv695aZUl27o8VtmmKf0KbELLJb06hqY=";
|
||||
hash = "sha256-RJYa6bpd3OUhHhj1vECy8LKSyfIdl2SHedhGgsJclSo=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hdrhistogram_c";
|
||||
version = "0.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HdrHistogram";
|
||||
repo = "HdrHistogram_c";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TFlrC4bgK8o5KRZcLMlYU5EO9Oqaqe08PjJgmsUl51M=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "C port or High Dynamic Range (HDR) Histogram";
|
||||
homepage = "https://github.com/HdrHistogram/HdrHistogram_c";
|
||||
changelog = "https://github.com/HdrHistogram/HdrHistogram_c/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = with lib.maintainers; [ jherland ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
heimdall,
|
||||
}:
|
||||
|
||||
heimdall.override {
|
||||
enableGUI = true;
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ip2asn";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x123";
|
||||
repo = "ip2asn";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2wuxBwllrkPdmmBCt7DPQ38E2k3igAjbICun51bhopY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fYg0aIU8usueMg6cMWUcwMIFCinHdm6H7k9ywZGYfg8=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"ip2asn-cli"
|
||||
];
|
||||
|
||||
# disable network based tests that download data
|
||||
cargoTestFlags = [
|
||||
"-p"
|
||||
"ip2asn-cli"
|
||||
"--"
|
||||
"--skip"
|
||||
"auto_update_tests::test_auto_update_triggers_download"
|
||||
"--skip"
|
||||
"auto_update_tests::test_auto_update_skips_check_for_recent_cache"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for mapping IP addresses to Autonomous System information";
|
||||
homepage = "https://github.com/x123/ip2asn/tree/master/ip2asn-cli";
|
||||
changelog = "https://github.com/x123/ip2asn/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ x123 ];
|
||||
mainProgram = "ip2asn";
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.10.0";
|
||||
version = "3.24.0";
|
||||
pname = "libre";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "re";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4=";
|
||||
sha256 = "sha256-wcntgFKpVxDlRMF8a7s9UxeXihguiGxTL/PGv9ImB80=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
php83.buildComposerProject2 (finalAttrs: {
|
||||
pname = "n98-magerun2";
|
||||
version = "9.0.1";
|
||||
version = "9.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netz98";
|
||||
repo = "n98-magerun2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Lq9TEwhcsoO4Cau2S7i/idEZYIzBeI0iXX1Ol7LnbAo=";
|
||||
hash = "sha256-v6Be9yODeac4ZLYfHXZTLMcfzjKGDXD7jz7kmI/z8wo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JxUVqQjSBh8FYW1JbwooHHkzDRtMRaCuVO6o45UMzOk=";
|
||||
vendorHash = "sha256-vaRRxtHu/ZFc+Z38KJjm0iUncFYUfRLkk7A3+T1p4+I=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "r2modman";
|
||||
version = "3.2.1";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebkr";
|
||||
repo = "r2modmanPlus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-l1xrp+Gl26kiWqh5pIKp4QiETrzr5mTrUP10T0DhUCw=";
|
||||
hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.6";
|
||||
version = "3.16.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QrJGRXmyOz7sAxDeefZ/vdeX07RwNqX00WPuw6KOnsI=";
|
||||
hash = "sha256-GLQLaiWBVdRatbq6OaydAddDREHPlHs/kr1QvQp/n1g=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yFLgoFQapDPGqzGpuLUD9j2Ygekd2vA4TWknll8rQhw=";
|
||||
hash = "sha256-+RwICnJRlt33T+q9YlAmb0Zul/wW3+Iadiz2vGvrPss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
click,
|
||||
future,
|
||||
httpretty,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
@@ -28,7 +27,6 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
future
|
||||
requests
|
||||
requests-kerberos
|
||||
six
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smp";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JPHutchins";
|
||||
repo = "smp";
|
||||
tag = version;
|
||||
hash = "sha256-TjucQm07nbfuFrVOHGOVA/f1rQRQfU8ws8VVC+U/kp8=";
|
||||
hash = "sha256-klMFJOKGSy6s16M+9wQhSvLSWdNPO/IMNdY5RW+wyFc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Simple Management Protocol (SMP) for remotely managing MCU firmware";
|
||||
homepage = "https://github.com/JPHutchins/smp";
|
||||
changelog = "https://github.com/JPHutchins/smp/releases/tag/${version}";
|
||||
changelog = "https://github.com/JPHutchins/smp/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ otavio ];
|
||||
};
|
||||
|
||||
@@ -3202,8 +3202,6 @@ with pkgs;
|
||||
|
||||
heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { };
|
||||
|
||||
heimdall-gui = heimdall.override { enableGUI = true; };
|
||||
|
||||
headscale = callPackage ../servers/headscale { };
|
||||
|
||||
highlight = callPackage ../tools/text/highlight {
|
||||
@@ -13126,6 +13124,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
|
||||
palemoon-gtk2-bin = palemoon-bin.override { withGTK3 = false; };
|
||||
|
||||
pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
|
||||
|
||||
@@ -14178,8 +14177,6 @@ with pkgs;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
|
||||
|
||||
elements = libsForQt5.callPackage ../applications/blockchains/elements {
|
||||
withGui = true;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
|
||||
Reference in New Issue
Block a user