gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-06 12:05:32 +00:00
committed by GitHub
parent 9760071a02 74a4041036
commit 82c7130388
8 changed files with 52 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/gs/gsl-lite/package.nix
+16 -31
View File
@@ -2,53 +2,38 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
ninja,
installCompatHeader ? false,
installLegacyHeaders ? false,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gsl-lite";
version = "0.41.0";
version = "0.42.0";
src = fetchFromGitHub {
owner = "gsl-lite";
repo = "gsl-lite";
rev = "v${version}";
hash = "sha256-cuuix302bVA7dWa7EJoxJ+otf1rSzjWQK8DHJsVkQio=";
tag = "v${finalAttrs.version}";
hash = "sha256-4CQG+sX/UTQ4zICmDR6YBfapuh0hSqkWk5skZAVAy2o=";
};
patches = [
(fetchpatch {
name = "type-limits-cast-fix.patch";
url = "https://github.com/gsl-lite/gsl-lite/commit/13475be0e5bf5f464c398f4a07ef5c7684bc57c5.patch";
hash = "sha256-rSz7OBmgQ3KcQ971tS3Z3QNC+U4XmrPjgmuOyG7J6Bo=";
})
];
nativeBuildInputs = [
cmake
ninja
];
cmakeFlags =
lib.mapAttrsToList (name: value: ''-DGSL_LITE_OPT_${name}:BOOL=${if value then "ON" else "OFF"}'')
{
INSTALL_COMPAT_HEADER = installCompatHeader;
INSTALL_LEGACY_HEADERS = installLegacyHeaders;
BUILD_TESTS = doCheck;
};
cmakeFlags = [
(lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "GSL_LITE_OPT_INSTALL_COMPAT_HEADER" installCompatHeader)
(lib.cmakeBool "GSL_LITE_OPT_INSTALL_LEGACY_HEADERS" installLegacyHeaders)
];
# Building tests is broken on Darwin.
doCheck = !stdenv.hostPlatform.isDarwin;
meta = with lib; {
description = ''
A single-file header-only version of ISO C++ Guidelines Support Library
(GSL) for C++98, C++11, and later
'';
meta = {
description = "Single-file header-only version of ISO C++ GSL";
longDescription = ''
gsl-lite is a single-file header-only implementation of the C++ Core
Guidelines Support Library originally based on Microsoft GSL and adapted
@@ -56,9 +41,9 @@ stdenv.mkDerivation rec {
C++20.
'';
homepage = "https://github.com/gsl-lite/gsl-lite";
changelog = "https://github.com/gsl-lite/gsl-lite/blob/${src.rev}/CHANGES.txt";
license = licenses.mit;
maintainers = with maintainers; [ azahi ];
platforms = platforms.all;
changelog = "https://github.com/gsl-lite/gsl-lite/blob/${finalAttrs.src.rev}/CHANGES.txt";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.azahi ];
platforms = lib.platforms.all;
};
}
})
pkgs/by-name/ki/kismet/package.nix
+27 -14
View File
@@ -4,7 +4,7 @@
autoreconfHook,
binutils,
elfutils,
fetchurl,
fetchFromGitHub,
glib,
libcap,
libmicrohttpd,
@@ -14,7 +14,8 @@
libwebsockets,
lm_sensors,
networkmanager,
pcre,
nix-update-script,
pcre2,
pkg-config,
openssl,
protobuf,
@@ -27,20 +28,22 @@
zlib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalPackage: {
pname = "kismet";
version = "2023-07-R1";
version = "2023-07-R2";
src = fetchurl {
url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
hash = "sha256-8IVI4mymX6HlZ7Heu+ocpNDnIGvduWpPY5yQFxhz6Pc=";
src = fetchFromGitHub {
owner = "kismetwireless";
repo = "kismet";
tag = "kismet-${finalPackage.version}";
hash = "sha256-QwTjjZHnrlATFvHK9PLDTt76UjfZdzCmV6uXVgIMIYg=";
};
postPatch = ''
substituteInPlace Makefile.in \
--replace "-m 4550" ""
--replace-fail "-m 4550" ""
substituteInPlace configure.ac \
--replace "pkg-config" "$PKG_CONFIG"
--replace-fail "pkg-config" "$PKG_CONFIG"
'';
postConfigure = ''
@@ -81,7 +84,7 @@ stdenv.mkDerivation rec {
openssl
libusb1
libwebsockets
pcre
pcre2
protobuf
protobufc
sqlite
@@ -111,10 +114,20 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
passthru = {
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^kismet-(\\d+-\\d+-.+)$"
];
};
};
meta = {
description = "Wireless network sniffer";
homepage = "https://www.kismetwireless.net/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ numinit ];
};
}
})
pkgs/by-name/pl/pls/package.nix
+5 -5
View File
@@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "pls";
version = "0.0.1-beta.8";
version = "0.0.1-beta.9";
src = fetchFromGitHub {
owner = "pls-rs";
repo = "pls";
rev = "v${version}";
hash = "sha256-gJufm2krZSTdBbbfZ+355M9e3MJQbDEpSPf0EbZEayQ=";
tag = "v${version}";
hash = "sha256-ofwdhGpqYlADDY2BLe0SkoHWqSeRNtQaXK61zWVFXzw=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-q6tLSq9MkWOT+XUmtv123C9VwncJ7ljTnaGEZOZqLjk=";
cargoHash = "sha256-P+4jRuakDUPaICJPsNJ6nXfhm09K/GC/VA9bsTXIMvc=";
meta = {
changelog = "https://github.com/pls-rs/pls/releases/tag/${src.rev}";
changelog = "https://github.com/pls-rs/pls/releases/tag/${src.tag}";
description = "Prettier and powerful ls";
homepage = "http://pls.cli.rs";
license = lib.licenses.gpl3Plus;
pkgs/tools/misc/torrenttools/default.nix
-105
View File
@@ -1,105 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
bencode,
catch2,
cli11,
cmake,
ctre,
expected-lite,
fmt,
gsl-lite,
howard-hinnant-date,
yaml-cpp,
ninja,
nlohmann_json,
openssl,
re2,
sigslot,
}:
stdenv.mkDerivation rec {
pname = "torrenttools";
version = "0.6.2";
srcs = [
(fetchFromGitHub rec {
owner = "fbdtemme";
repo = "torrenttools";
rev = "v${version}";
hash = "sha256-3rAxw4JM5ruOn0ccKnpdCnUWUPTQOUvRYz8OKU/FpJ8=";
name = repo;
})
(fetchFromGitHub rec {
owner = "fbdtemme";
repo = "cliprogress";
rev = "a887519e360e44c1ef88ea4ef7df652ea049c502";
hash = "sha256-nVvzez5GB57qSj2SLaxdYlkSX8rRM06H2NnLQGCDWMg=";
name = repo;
})
(fetchFromGitHub rec {
owner = "fbdtemme";
repo = "dottorrent";
rev = "38ac810d6bb3628fd3ce49150c9fb641bb5e78cd";
hash = "sha256-0H9h0Hud0Fd64lY0pxQ96coDOEDr5wh8v1sNT1lBxb0=";
name = repo;
})
(fetchFromGitHub rec {
owner = "fbdtemme";
repo = "termcontrol";
rev = "c53eec4efe0e163871d9eb54dc074c25cd01abf0";
hash = "sha256-0j78QtEkhlssVivPl709o5Pf36TzhOZ6VHaqDiH0L0I=";
name = repo;
})
];
sourceRoot = "torrenttools";
patches = [
./fmt-9.patch
];
postUnpack = ''
cp -pr cliprogress torrenttools/external/cliprogress
cp -pr dottorrent torrenttools/external/dottorrent
cp -pr termcontrol torrenttools/external/termcontrol
chmod -R u+w -- "$sourceRoot"
'';
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
bencode
catch2
cli11
ctre
expected-lite
fmt
gsl-lite
howard-hinnant-date
yaml-cpp
nlohmann_json
openssl
re2
sigslot
];
cmakeFlags = [
"-DTORRENTTOOLS_BUILD_TESTS:BOOL=ON"
"-DTORRENTTOOLS_TBB:BOOL=OFF" # Our TBB doesn't expose a CMake module.
];
doCheck = true;
meta = with lib; {
description = "CLI tool for creating, inspecting and modifying BitTorrent metafiles";
homepage = "https://github.com/fbdtemme/torrenttools";
license = licenses.mit;
maintainers = with maintainers; [ azahi ];
platforms = platforms.unix;
mainProgram = "torrenttools";
};
}
pkgs/tools/misc/torrenttools/fmt-9.patch
-29
View File
@@ -1,29 +0,0 @@
diff --git a/include/file_matcher.hpp b/include/file_matcher.hpp
index c10c7be405..b67baec0ef 100644
--- a/include/file_matcher.hpp
+++ b/include/file_matcher.hpp
@@ -47,7 +47,7 @@
}
std::string error;
- std::string pattern = ".*.{}$"_format(extension);
+ std::string pattern = fmt::format(".*.{}$", extension);
file_include_list_.Add(pattern, &error);
file_include_list_empty_ = false;
Ensures(error.empty());
@@ -62,7 +62,7 @@
}
std::string error;
- std::string pattern = ".*\\.{}$"_format(extension);
+ std::string pattern = fmt::format(".*\\.{}$", extension);
file_exclude_list_.Add(pattern, &error);
file_exclude_list_empty_ = false;
Ensures(error.empty());
@@ -243,4 +243,4 @@
};
-} // namespace torrenttools
\ No newline at end of file
+} // namespace torrenttools
pkgs/tools/security/iaito/default.nix
+3 -3
View File
@@ -14,13 +14,13 @@
let
pname = "iaito";
version = "5.9.6";
version = "5.9.9";
main_src = fetchFromGitHub rec {
owner = "radareorg";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-rkL7qH1BLXw3eXdCoVuan2C6k05pE5LOIOTbIEtfUbE=";
tag = version;
hash = "sha256-y8Mfd7BmnMFJ9mpGKVL3i4VRxrzJ1gXaSsUQIFB9Wd4=";
name = repo;
};
pkgs/top-level/aliases.nix
+1
View File
@@ -1706,6 +1706,7 @@ mapAliases {
tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07
tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
torrenttools = throw "torrenttools has been removed due to lack of maintanance upstream"; # Added 2025-04-06
torq = throw "torq has been removed because the project went closed source"; # Added 2024-11-24
transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10
transmission-gtk = lib.warnOnInstantiate (transmission3Warning {
pkgs/top-level/all-packages.nix
-4
View File
@@ -16429,10 +16429,6 @@ with pkgs;
inherit (linuxPackages) x86_energy_perf_policy;
};
torrenttools = callPackage ../tools/misc/torrenttools {
fmt = fmt_9;
};
tony = libsForQt5.callPackage ../applications/audio/tony { };
trustedqsl = tqsl; # Alias added 2019-02-10