ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-07 21:18:05 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-02-20 18:01:48 +00:00 committed by GitHub
commit bd9c664746
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
102 changed files with 26421 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
maintainers/maintainer-list.nix
View File

@ -2551,6 +2551,12 @@
githubId = 185443;
name = "Alexey Lebedeff";
};
binarycat = {
email = "binarycat@envs.net";
github = "lolbinarycat";
githubId = 19915050;
name = "binarycat";
};
binsky = {
email = "timo@binsky.org";
github = "binsky08";
@ -20839,6 +20845,13 @@
githubId = 31734358;
name = "Xavier Groleau";
};
xgwq = {
name = "XGWQ";
email = "nixos@xnee.de";
matrix = "@xgwq:nerdberg.de";
github = "peterablehmann";
githubId = 36541313;
};
xiorcale = {
email = "quentin.vaucher@pm.me";
github = "xiorcale";

4
nixos/modules/services/misc/atuin.nix
View File

@ -8,6 +8,8 @@ in
services.atuin = {
enable = lib.mkEnableOption (mdDoc "Atuin server for shell history sync");
package = lib.mkPackageOption pkgs "atuin" { };
openRegistration = mkOption {
type = types.bool;
default = false;
@ -85,7 +87,7 @@ in
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.atuin}/bin/atuin server start";
ExecStart = "${lib.getExe cfg.package} server start";
RuntimeDirectory = "atuin";
RuntimeDirectoryMode = "0700";
DynamicUser = true;

65
nixos/tests/geoserver.nix
View File

@ -1,4 +1,18 @@
{ pkgs, lib, ... }: {
{ pkgs, lib, ... }:
let
geoserver = pkgs.geoserver;
geoserverWithImporterExtension = pkgs.geoserver.withExtensions (ps: with ps; [ importer ]);
# Blacklisted extensions:
# - wps-jdbc needs a running (Postrgres) db server.
blacklist = [ "wps-jdbc" ];
blacklistedToNull = n: v: if ! builtins.elem n blacklist then v else null;
getNonBlackistedExtensionsAsList = ps: builtins.filter (x: x != null) (lib.attrsets.mapAttrsToList blacklistedToNull ps);
geoserverWithAllExtensions = pkgs.geoserver.withExtensions (ps: getNonBlackistedExtensionsAsList ps);
in
{
name = "geoserver";
meta = {
@ -9,16 +23,57 @@
machine = { pkgs, ... }: {
virtualisation.diskSize = 2 * 1024;
environment.systemPackages = [ pkgs.geoserver ];
environment.systemPackages = [
geoserver
geoserverWithImporterExtension
geoserverWithAllExtensions
];
};
};
testScript = ''
from contextlib import contextmanager
curl_cmd = "curl --fail --connect-timeout 2"
curl_cmd_rest = f"{curl_cmd} -u admin:geoserver -X GET"
base_url = "http://localhost:8080/geoserver"
log_file = "./log.txt"
@contextmanager
def running_geoserver(pkg):
try:
print(f"Launching geoserver from {pkg}...")
machine.execute(f"{pkg}/bin/geoserver-startup > {log_file} 2>&1 &")
machine.wait_until_succeeds(f"{curl_cmd} {base_url} 2>&1", timeout=60)
yield
finally:
# We need to wait a little bit to make sure the server is properly
# shutdown before launching a new instance.
machine.execute(f"{pkg}/bin/geoserver-shutdown; sleep 1")
start_all()
machine.execute("${pkgs.geoserver}/bin/geoserver-startup > /dev/null 2>&1 &")
machine.wait_until_succeeds("curl --fail --connect-timeout 2 http://localhost:8080/geoserver", timeout=60)
with running_geoserver("${geoserver}"):
machine.succeed(f"{curl_cmd} {base_url}/ows?service=WMS&version=1.3.0&request=GetCapabilities")
# No extensions yet.
machine.fail(f"{curl_cmd_rest} {base_url}/rest/imports")
machine.fail(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv")
with running_geoserver("${geoserverWithImporterExtension}"):
machine.succeed(f"{curl_cmd_rest} {base_url}/rest/imports")
machine.fail(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv")
with running_geoserver("${geoserverWithAllExtensions}"):
machine.succeed(f"{curl_cmd_rest} {base_url}/rest/imports")
machine.succeed(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv")
_, stdout = machine.execute(f"cat {log_file}")
print(stdout.replace("\\n", "\n"))
assert "GDAL Native Library loaded" in stdout, "gdal"
assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo"
assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf"
assert "Unable to load library 'netcdf'" not in stdout, "netcdf"
machine.succeed("curl --fail --connect-timeout 2 http://localhost:8080/geoserver/ows?service=WMS&version=1.3.0&request=GetCapabilities")
'';
}

4
pkgs/applications/audio/stochas/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "stochas";
version = "1.3.9";
version = "1.3.10";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AnYViWterLBsTtd0wohff1CEwrSYA4CvOLGhJnPFUt8=";
sha256 = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg=";
fetchSubmodules = true;
};

6
pkgs/applications/editors/molsketch/default.nix
View File

@ -19,6 +19,10 @@ mkDerivation rec {
hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ=";
};
patches = [
./openbabel.patch
];
# uses C++17 APIs like std::transform_reduce
postPatch = ''
substituteInPlace molsketch/CMakeLists.txt \
@ -34,7 +38,7 @@ mkDerivation rec {
'';
postFixup = ''
mv $out/lib/molsketch/* $out/lib
ln -s $out/lib/molsketch/* $out/lib/.
'';
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];

12
pkgs/applications/editors/molsketch/openbabel.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/obabeliface/obabeliface.cpp b/obabeliface/obabeliface.cpp
index 98a9020..a168803 100644
--- a/obabeliface/obabeliface.cpp
+++ b/obabeliface/obabeliface.cpp
@@ -196,6 +196,7 @@ namespace Molsketch
// TODO should be const, but OpenBabel iterator methods do not support const
bool hasCoordinates(OpenBabel::OBMol &molecule) {
+ using namespace OpenBabel;
FOR_ATOMS_OF_MOL(obatom, molecule) {
if (obatom->GetVector() != OpenBabel::VZero)
return true;

312
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -677,6 +677,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/";
};
astrotheme = buildVimPlugin {
pname = "astrotheme";
version = "2024-01-27";
src = fetchFromGitHub {
owner = "AstroNvim";
repo = "astrotheme";
rev = "415d0030a86dc52371925483a823eb04d483447b";
sha256 = "16brpfp5kdgdlpij72kl02gzql04cyhswsaw93qm2svfvr9q2v9x";
};
meta.homepage = "https://github.com/AstroNvim/astrotheme/";
};
async-vim = buildVimPlugin {
pname = "async.vim";
version = "2022-04-04";
@ -929,6 +941,18 @@ final: prev:
meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
};
aylin-vim = buildVimPlugin {
pname = "aylin.vim";
version = "2022-08-13";
src = fetchFromGitHub {
owner = "AhmedAbdulrahman";
repo = "aylin.vim";
rev = "d9532f02f5ea8f396fc62c50bb34c348b4a9aa02";
sha256 = "1fqi0y49ac7ix39l8c27j7zysl4g9sm0akkmhpbznccc74kb6r7w";
};
meta.homepage = "https://github.com/AhmedAbdulrahman/aylin.vim/";
};
ayu-vim = buildVimPlugin {
pname = "ayu-vim";
version = "2020-05-29";
@ -965,6 +989,18 @@ final: prev:
meta.homepage = "https://github.com/m00qek/baleia.nvim/";
};
bamboo-nvim = buildVimPlugin {
pname = "bamboo.nvim";
version = "2024-01-30";
src = fetchFromGitHub {
owner = "ribru17";
repo = "bamboo.nvim";
rev = "b79d540b251a2085d439f5a7c0fe12b9ed54bab6";
sha256 = "1qs0fw9f17x7xyqgx0911q3szrnqfrn77q2ja5pcf8vhq1hk4f1y";
};
meta.homepage = "https://github.com/ribru17/bamboo.nvim/";
};
barbar-nvim = buildVimPlugin {
pname = "barbar.nvim";
version = "2024-02-06";
@ -1121,6 +1157,30 @@ final: prev:
meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/";
};
bluloco-nvim = buildVimPlugin {
pname = "bluloco.nvim";
version = "2024-01-22";
src = fetchFromGitHub {
owner = "uloco";
repo = "bluloco.nvim";
rev = "e97a9d61fad847a8d98c280181dde1c228be422b";
sha256 = "04qbp7chz009kma6lv2zvqkj9z5hv3c45h0zzyc0w145450isqv7";
};
meta.homepage = "https://github.com/uloco/bluloco.nvim/";
};
boo-colorscheme-nvim = buildVimPlugin {
pname = "boo-colorscheme-nvim";
version = "2023-12-26";
src = fetchFromGitHub {
owner = "rockerBOO";
repo = "boo-colorscheme-nvim";
rev = "f329950b54d2a9462dd8169bb9cf0adbddef70b4";
sha256 = "0939nxp2g0d6nzfhk0r5bvn4g3bs5bg8pjnc4z1f1qsnpvk6vyml";
};
meta.homepage = "https://github.com/rockerBOO/boo-colorscheme-nvim/";
};
boole-nvim = buildVimPlugin {
pname = "boole.nvim";
version = "2023-07-08";
@ -1337,6 +1397,18 @@ final: prev:
meta.homepage = "https://github.com/projekt0n/circles.nvim/";
};
citruszest-nvim = buildVimPlugin {
pname = "citruszest.nvim";
version = "2024-01-30";
src = fetchFromGitHub {
owner = "zootedb0t";
repo = "citruszest.nvim";
rev = "6c090d537c4fcc5d187632e7e47943e41a218ba8";
sha256 = "0x09gz17436fmybr40l69ph0r8k6abxi5jaksn058gh0s6wiq8ic";
};
meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/";
};
clang_complete = buildVimPlugin {
pname = "clang_complete";
version = "2023-11-05";
@ -1985,6 +2057,18 @@ final: prev:
meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
};
cobalt2-nvim = buildVimPlugin {
pname = "cobalt2.nvim";
version = "2024-01-13";
src = fetchFromGitHub {
owner = "lalitmee";
repo = "cobalt2.nvim";
rev = "89c4212da7f2a6ce7570ca1b8ed01a95e30585c2";
sha256 = "00fdqj61av1awq2m3qjkd3znpnc5ywi6abnvyh8xcbs9sbp4iid8";
};
meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/";
};
coc-clap = buildVimPlugin {
pname = "coc-clap";
version = "2021-09-18";
@ -2598,6 +2682,18 @@ final: prev:
meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
};
cyberdream-nvim = buildVimPlugin {
pname = "cyberdream.nvim";
version = "2024-01-16";
src = fetchFromGitHub {
owner = "scottmckendry";
repo = "cyberdream.nvim";
rev = "5eacf2e0a36c6c44645d66ab7950a126af15dfc2";
sha256 = "0a4v1xakcq6sc3kshl45r6iy0y881fv8zc2nyylqgy9xh5p37vzl";
};
meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
};
dart-vim-plugin = buildVimPlugin {
pname = "dart-vim-plugin";
version = "2023-07-18";
@ -2646,6 +2742,18 @@ final: prev:
meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
};
deepwhite-nvim = buildVimPlugin {
pname = "deepwhite.nvim";
version = "2024-01-23";
src = fetchFromGitHub {
owner = "Verf";
repo = "deepwhite.nvim";
rev = "7c8d12505dafac651f14d4eaa21623a7658871ab";
sha256 = "1hz07976ka8q45sgk3ggmb0gk9qz463i8narda3hcws302h8nw8k";
};
meta.homepage = "https://github.com/Verf/deepwhite.nvim/";
};
defx-git = buildVimPlugin {
pname = "defx-git";
version = "2021-01-01";
@ -3092,6 +3200,18 @@ final: prev:
meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
};
doom-one-nvim = buildVimPlugin {
pname = "doom-one.nvim";
version = "2022-12-24";
src = fetchFromGitHub {
owner = "NTBBloodbath";
repo = "doom-one.nvim";
rev = "a43528cbd7908ccec7af4587ec8e18be149095bd";
sha256 = "0zv40jrr9d65kny43bxcfx6hclrsnhirsb9cz87z08qbz9jkbywm";
};
meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/";
};
dracula-nvim = buildVimPlugin {
pname = "dracula.nvim";
version = "2024-01-23";
@ -3286,6 +3406,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/errormarker.vim/";
};
eva01-vim = buildVimPlugin {
pname = "eva01.vim";
version = "2024-01-10";
src = fetchFromGitHub {
owner = "hachy";
repo = "eva01.vim";
rev = "8ab19cfc230806a5ce0ed8f3f75c990c78a949bd";
sha256 = "0bh2y5afi875b1p3h6lgz4jiszajv61fi14qns6n86n8zamqc3fl";
};
meta.homepage = "https://github.com/hachy/eva01.vim/";
};
everforest = buildVimPlugin {
pname = "everforest";
version = "2024-02-10";
@ -3503,6 +3635,18 @@ final: prev:
meta.homepage = "https://github.com/willothy/flatten.nvim/";
};
fleet-theme-nvim = buildVimPlugin {
pname = "fleet-theme-nvim";
version = "2024-01-08";
src = fetchFromGitHub {
owner = "felipeagc";
repo = "fleet-theme-nvim";
rev = "df10a0e0021d3267eb7c7104107988e4fb977b32";
sha256 = "0205qig2va639saih817wkan4pmksakdxc3a8k5rr36gwsgyf4gd";
};
meta.homepage = "https://github.com/felipeagc/fleet-theme-nvim/";
};
flit-nvim = buildVimPlugin {
pname = "flit.nvim";
version = "2024-01-13";
@ -4043,6 +4187,18 @@ final: prev:
meta.homepage = "https://github.com/liuchengxu/graphviz.vim/";
};
gruber-darker-nvim = buildVimPlugin {
pname = "gruber-darker.nvim";
version = "2024-01-08";
src = fetchFromGitHub {
owner = "blazkowolf";
repo = "gruber-darker.nvim";
rev = "a2dda61d9c1225e16951a51d6b89795b0ac35cd6";
sha256 = "1sxnprl27svdf4wp38abbywjbipr15mzmx53hg5w0jz1vj0kdjvl";
};
meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/";
};
gruvbox = buildVimPlugin {
pname = "gruvbox";
version = "2023-08-14";
@ -5662,6 +5818,30 @@ final: prev:
meta.homepage = "https://github.com/savq/melange-nvim/";
};
miasma-nvim = buildVimPlugin {
pname = "miasma.nvim";
version = "2023-10-24";
src = fetchFromGitHub {
owner = "xero";
repo = "miasma.nvim";
rev = "c672feec07d4e77ac485ee58e3432a96ebe51953";
sha256 = "187d35g6s53rs7zi3p8c4d8sy23qdpzy22i2vmr8apzgc2hirvx7";
};
meta.homepage = "https://github.com/xero/miasma.nvim/";
};
midnight-nvim = buildVimPlugin {
pname = "midnight.nvim";
version = "2024-01-30";
src = fetchFromGitHub {
owner = "dasupradyumna";
repo = "midnight.nvim";
rev = "13d812355db1e535ba5c790186d301e1fe9e7e1b";
sha256 = "1ynwivjw4kn4zz4ahpinvdyd5ndcss308nbqap5pnqzza2k8a7qh";
};
meta.homepage = "https://github.com/dasupradyumna/midnight.nvim/";
};
mind-nvim = buildVimPlugin {
pname = "mind.nvim";
version = "2023-03-22";
@ -6671,6 +6851,18 @@ final: prev:
meta.homepage = "https://github.com/chr4/nginx.vim/";
};
night-owl-nvim = buildVimPlugin {
pname = "night-owl.nvim";
version = "2024-01-30";
src = fetchFromGitHub {
owner = "oxfist";
repo = "night-owl.nvim";
rev = "2b7e78c34e25aea841d10ebc3ee19d6d558e9ec0";
sha256 = "07bnm5z1k384kmsvxwg2vk432gq0dp0rf83b0jf0z9lzh9ghfq6f";
};
meta.homepage = "https://github.com/oxfist/night-owl.nvim/";
};
nightfox-nvim = buildVimPlugin {
pname = "nightfox.nvim";
version = "2024-01-31";
@ -6683,6 +6875,18 @@ final: prev:
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
nightly-nvim = buildVimPlugin {
pname = "nightly.nvim";
version = "2023-10-20";
src = fetchFromGitHub {
owner = "Alexis12119";
repo = "nightly.nvim";
rev = "825299e1dfafc093918137e752bde2dbaed60503";
sha256 = "1g10pmg0jkj5bfsm1kvws9al2s0b2b15582815nf6mwr9fmhhbzy";
};
meta.homepage = "https://github.com/Alexis12119/nightly.nvim/";
};
nim-vim = buildVimPlugin {
pname = "nim.vim";
version = "2021-11-11";
@ -6731,6 +6935,18 @@ final: prev:
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
};
no-clown-fiesta-nvim = buildVimPlugin {
pname = "no-clown-fiesta.nvim";
version = "2024-01-30";
src = fetchFromGitHub {
owner = "aktersnurra";
repo = "no-clown-fiesta.nvim";
rev = "dae9bbb61223218d0043baffb3ede4cee9568872";
sha256 = "0dg6pk8p7gc18nf17yxbs0c4pv1ng44n41jppi71dgv6xb481mbz";
};
meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/";
};
no-neck-pain-nvim = buildVimPlugin {
pname = "no-neck-pain.nvim";
version = "2024-02-05";
@ -6743,6 +6959,18 @@ final: prev:
meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
};
noctis-nvim = buildVimPlugin {
pname = "noctis.nvim";
version = "2022-09-30";
src = fetchFromGitHub {
owner = "kartikp10";
repo = "noctis.nvim";
rev = "0b9336e39c686a7e58de06e4dd38c2bd862a7b33";
sha256 = "0aw361j28mnggv8769b70rywsx2cvri26kg2n8i470ka1wmzklaf";
};
meta.homepage = "https://github.com/kartikp10/noctis.nvim/";
};
noice-nvim = buildVimPlugin {
pname = "noice.nvim";
version = "2024-01-22";
@ -8039,6 +8267,18 @@ final: prev:
meta.homepage = "https://github.com/nomnivore/ollama.nvim/";
};
omni-vim = buildVimPlugin {
pname = "omni.vim";
version = "2022-06-17";
src = fetchFromGitHub {
owner = "yonlu";
repo = "omni.vim";
rev = "6c0f3015b1d6f2ae59c12cc380c629b965d3dc62";
sha256 = "0mb3qb2yv4y57xp3548wrlnlyrshxjv511lwmzb9k0xnyig6mgmx";
};
meta.homepage = "https://github.com/yonlu/omni.vim/";
};
omnisharp-extended-lsp-nvim = buildVimPlugin {
pname = "omnisharp-extended-lsp.nvim";
version = "2023-12-25";
@ -8087,6 +8327,18 @@ final: prev:
meta.homepage = "https://github.com/joshdick/onedark.vim/";
};
onedarker-nvim = buildVimPlugin {
pname = "onedarker.nvim";
version = "2022-10-10";
src = fetchFromGitHub {
owner = "LunarVim";
repo = "onedarker.nvim";
rev = "b4f92f073ed7cdf0358ad005cee0484411232b1b";
sha256 = "121bympiikzwgbklpbzvp9f0izm3bz9mqndv3wj796qb853ap48c";
};
meta.homepage = "https://github.com/LunarVim/onedarker.nvim/";
};
onedarkpro-nvim = buildVimPlugin {
pname = "onedarkpro.nvim";
version = "2024-02-13";
@ -8268,6 +8520,18 @@ final: prev:
meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/";
};
palenightfall-nvim = buildVimPlugin {
pname = "palenightfall.nvim";
version = "2023-10-05";
src = fetchFromGitHub {
owner = "JoosepAlviste";
repo = "palenightfall.nvim";
rev = "25a1e7d43256834a671174e5d83edb57f7bec1e0";
sha256 = "1svfibhrlwxsh4nzyb8hjdfgdakh176pg47vzvkrywafr8mw6ak5";
};
meta.homepage = "https://github.com/JoosepAlviste/palenightfall.nvim/";
};
palette-nvim = buildVimPlugin {
pname = "palette.nvim";
version = "2023-10-02";
@ -9555,6 +9819,18 @@ final: prev:
meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
};
styler-nvim = buildVimPlugin {
pname = "styler.nvim";
version = "2024-01-19";
src = fetchFromGitHub {
owner = "folke";
repo = "styler.nvim";
rev = "2cd29996d08cec8b31270c6de64465f716ef9d71";
sha256 = "0lml1hizypx26n80ghaibh3wkazd21phak0af5936y46c54xi2dk";
};
meta.homepage = "https://github.com/folke/styler.nvim/";
};
stylish-nvim = buildVimPlugin {
pname = "stylish.nvim";
version = "2022-02-01";
@ -12802,6 +13078,18 @@ final: prev:
meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/";
};
vim-humanoid-colorscheme = buildVimPlugin {
pname = "vim-humanoid-colorscheme";
version = "2021-11-21";
src = fetchFromGitHub {
owner = "humanoid-colors";
repo = "vim-humanoid-colorscheme";
rev = "ce4fa890a2b8a32f4747eb951e93050100548fba";
sha256 = "1650ymvma30zyq2hl9x5z7ql11wakjgq6jarc6vxbrpgvbz0f9c8";
};
meta.homepage = "https://github.com/humanoid-colors/vim-humanoid-colorscheme/";
};
vim-husk = buildVimPlugin {
pname = "vim-husk";
version = "2015-11-29";
@ -16359,6 +16647,18 @@ final: prev:
meta.homepage = "https://github.com/embark-theme/vim/";
};
gbprod-nord = buildVimPlugin {
pname = "gbprod-nord";
version = "2024-01-28";
src = fetchFromGitHub {
owner = "gbprod";
repo = "nord.nvim";
rev = "fb40d5b19205bc821964f795637250911a9fde0a";
sha256 = "10sswfgcl05wpj98m9qlqdbx16ypvmszpipkqhm1n59j43441m0v";
};
meta.homepage = "https://github.com/gbprod/nord.nvim/";
};
gruvbox-community = buildVimPlugin {
pname = "gruvbox-community";
version = "2024-01-21";
@ -16431,6 +16731,18 @@ final: prev:
meta.homepage = "https://github.com/nvchad/ui/";
};
phha-zenburn = buildVimPlugin {
pname = "phha-zenburn";
version = "2024-01-07";
src = fetchFromGitHub {
owner = "phha";
repo = "zenburn.nvim";
rev = "512d5192214000a1ddb430d31df2e2a80c88fa8a";
sha256 = "1bx0c1xssmvr4ly01gs67241f9wb30k9z8ykwyqicbid2abx2jga";
};
meta.homepage = "https://github.com/phha/zenburn.nvim/";
};
pure-lua = buildVimPlugin {
pname = "pure-lua";
version = "2021-05-16";

26
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -55,6 +55,7 @@ https://github.com/pearofducks/ansible-vim/,,
https://github.com/ckarnell/antonys-macro-repeater/,,
https://github.com/solarnz/arcanist.vim/,,
https://github.com/vim-scripts/argtextobj.vim/,,
https://github.com/AstroNvim/astrotheme/,,
https://github.com/prabirshrestha/async.vim/,,
https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
@ -76,9 +77,11 @@ https://github.com/m4xshen/autoclose.nvim/,HEAD,
https://github.com/vim-scripts/autoload_cscope.vim/,,
https://github.com/nullishamy/autosave.nvim/,HEAD,
https://github.com/rafi/awesome-vim-colorschemes/,,
https://github.com/AhmedAbdulrahman/aylin.vim/,,
https://github.com/ayu-theme/ayu-vim/,,
https://github.com/taybart/b64.nvim/,HEAD,
https://github.com/m00qek/baleia.nvim/,HEAD,
https://github.com/ribru17/bamboo.nvim/,,
https://github.com/romgrk/barbar.nvim/,,
https://github.com/utilyre/barbecue.nvim/,,
https://github.com/RRethy/base16-nvim/,,
@ -92,6 +95,8 @@ https://github.com/LunarVim/bigfile.nvim/,,
https://github.com/APZelos/blamer.nvim/,HEAD,
https://github.com/HampusHauffman/block.nvim/,HEAD,
https://github.com/blueballs-theme/blueballs-neovim/,,
https://github.com/uloco/bluloco.nvim/,,
https://github.com/rockerBOO/boo-colorscheme-nvim/,,
https://github.com/nat-418/boole.nvim/,HEAD,
https://github.com/turbio/bracey.vim/,,
https://github.com/fruit-in/brainfuck-vim/,,
@ -111,6 +116,7 @@ https://github.com/vim-scripts/changeColorScheme.vim/,,
https://github.com/sudormrfbin/cheatsheet.nvim/,,
https://github.com/yunlingz/ci_dark/,,
https://github.com/projekt0n/circles.nvim/,,
https://github.com/zootedb0t/citruszest.nvim/,,
https://github.com/xavierd/clang_complete/,,
https://github.com/p00f/clangd_extensions.nvim/,HEAD,
https://github.com/rhysd/clever-f.vim/,,
@ -165,6 +171,7 @@ https://github.com/pontusk/cmp-vimwiki-tags/,HEAD,
https://github.com/hrsh7th/cmp-vsnip/,,
https://github.com/tamago324/cmp-zsh/,HEAD,
https://github.com/saadparwaiz1/cmp_luasnip/,,
https://github.com/lalitmee/cobalt2.nvim/,,
https://github.com/vn-ki/coc-clap/,,
https://github.com/neoclide/coc-denite/,,
https://github.com/antoinemadec/coc-fzf/,,
@ -216,10 +223,12 @@ https://github.com/JazzCore/ctrlp-cmatcher/,,
https://github.com/FelikZ/ctrlp-py-matcher/,,
https://github.com/amiorin/ctrlp-z/,,
https://github.com/ctrlpvim/ctrlp.vim/,,
https://github.com/scottmckendry/cyberdream.nvim/,,
https://github.com/dart-lang/dart-vim-plugin/,,
https://github.com/rizzatti/dash.vim/,HEAD,
https://github.com/glepnir/dashboard-nvim/,,
https://github.com/andrewferrier/debugprint.nvim/,HEAD,
https://github.com/Verf/deepwhite.nvim/,,
https://github.com/kristijanhusak/defx-git/,,
https://github.com/kristijanhusak/defx-icons/,,
https://github.com/Shougo/defx.nvim/,,
@ -257,6 +266,7 @@ https://github.com/elihunter173/dirbuf.nvim/,HEAD,
https://github.com/direnv/direnv.vim/,,
https://github.com/chipsenkbeil/distant.nvim/,HEAD,
https://github.com/doki-theme/doki-theme-vim/,,
https://github.com/NTBBloodbath/doom-one.nvim/,,
https://github.com/Mofiqul/dracula.nvim/,HEAD,
https://github.com/stevearc/dressing.nvim/,,
https://github.com/Bekaboo/dropbar.nvim/,HEAD,
@ -273,6 +283,7 @@ https://github.com/dmix/elvish.vim/,,
https://github.com/mattn/emmet-vim/,,
https://github.com/vim-scripts/emodeline/,,
https://github.com/vim-scripts/errormarker.vim/,,
https://github.com/hachy/eva01.vim/,,
https://github.com/sainnhe/everforest/,,
https://github.com/google/executor.nvim/,HEAD,
https://github.com/jinh0/eyeliner.nvim/,HEAD,
@ -291,6 +302,7 @@ https://github.com/glacambre/firenvim/,HEAD,
https://github.com/andviro/flake8-vim/,,
https://github.com/folke/flash.nvim/,HEAD,
https://github.com/willothy/flatten.nvim/,HEAD,
https://github.com/felipeagc/fleet-theme-nvim/,,
https://github.com/ggandor/flit.nvim/,HEAD,
https://github.com/ncm2/float-preview.nvim/,,
https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
@ -336,6 +348,7 @@ https://github.com/rmagatti/goto-preview/,,
https://github.com/junegunn/goyo.vim/,,
https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
https://github.com/liuchengxu/graphviz.vim/,,
https://github.com/blazkowolf/gruber-darker.nvim/,,
https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
https://github.com/morhetz/gruvbox/,,
https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
@ -474,6 +487,8 @@ https://github.com/kaicataldo/material.vim/,HEAD,
https://github.com/vim-scripts/mayansmoke/,,
https://github.com/chikamichi/mediawiki.vim/,HEAD,
https://github.com/savq/melange-nvim/,,
https://github.com/xero/miasma.nvim/,,
https://github.com/dasupradyumna/midnight.nvim/,,
https://github.com/phaazon/mind.nvim/,HEAD,
https://github.com/echasnovski/mini.nvim/,,
https://github.com/wfxr/minimap.vim/,,
@ -560,14 +575,19 @@ https://github.com/oberblastmeister/neuron.nvim/,,
https://github.com/fiatjaf/neuron.vim/,,
https://github.com/Olical/nfnl/,main,
https://github.com/chr4/nginx.vim/,,
https://github.com/oxfist/night-owl.nvim/,,
https://github.com/EdenEast/nightfox.nvim/,,
https://github.com/Alexis12119/nightly.nvim/,,
https://github.com/zah/nim.vim/,,
https://github.com/figsoda/nix-develop.nvim/,HEAD,
https://github.com/tamago324/nlsp-settings.nvim/,main,
https://github.com/mcchrish/nnn.vim/,,
https://github.com/aktersnurra/no-clown-fiesta.nvim/,,
https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
https://github.com/kartikp10/noctis.nvim/,,
https://github.com/folke/noice.nvim/,HEAD,
https://github.com/nvimtools/none-ls.nvim/,HEAD,
https://github.com/gbprod/nord.nvim/,,gbprod-nord
https://github.com/shaunsingh/nord.nvim/,,
https://github.com/andersevenrud/nordic.nvim/,,
https://github.com/vigoux/notifier.nvim/,HEAD,
@ -675,10 +695,12 @@ https://github.com/mhartington/oceanic-next/,,
https://github.com/pwntester/octo.nvim/,,
https://github.com/stevearc/oil.nvim/,HEAD,
https://github.com/nomnivore/ollama.nvim/,HEAD,
https://github.com/yonlu/omni.vim/,,
https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
https://github.com/Th3Whit3Wolf/one-nvim/,,
https://github.com/navarasu/onedark.nvim/,,
https://github.com/joshdick/onedark.vim/,,
https://github.com/LunarVim/onedarker.nvim/,,
https://github.com/olimorris/onedarkpro.nvim/,,
https://github.com/sonph/onehalf/,,
https://github.com/rmehri01/onenord.nvim/,main,
@ -694,6 +716,7 @@ https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
https://github.com/vuki656/package-info.nvim/,,
https://github.com/wbthomason/packer.nvim/,,
https://github.com/drewtempelmeyer/palenight.vim/,,
https://github.com/JoosepAlviste/palenightfall.nvim/,,
https://github.com/roobert/palette.nvim/,HEAD,
https://github.com/NLKNguyen/papercolor-theme/,,
https://github.com/tmsvg/pear-tree/,,
@ -802,6 +825,7 @@ https://github.com/josegamez82/starrynight/,HEAD,
https://github.com/darfink/starsearch.vim/,,
https://github.com/startup-nvim/startup.nvim/,HEAD,
https://github.com/luukvbaal/statuscol.nvim/,,
https://github.com/folke/styler.nvim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/gbprod/substitute.nvim/,HEAD,
https://github.com/kvrohit/substrata.nvim/,HEAD,
@ -1079,6 +1103,7 @@ https://github.com/GEverding/vim-hocon/,,
https://github.com/Twinside/vim-hoogle/,,
https://github.com/ntk148v/vim-horizon/,,
https://github.com/jonsmithers/vim-html-template-literals/,,
https://github.com/humanoid-colors/vim-humanoid-colorscheme/,,
https://github.com/vim-utils/vim-husk/,,
https://github.com/w0ng/vim-hybrid/,,
https://github.com/kristijanhusak/vim-hybrid-material/,,
@ -1368,6 +1393,7 @@ https://github.com/KabbAmine/zeavim.vim/,,
https://github.com/folke/zen-mode.nvim/,,
https://github.com/mcchrish/zenbones.nvim/,HEAD,
https://github.com/jnurmine/zenburn/,,
https://github.com/phha/zenburn.nvim/,,phha-zenburn
https://github.com/glepnir/zephyr-nvim/,,
https://github.com/ziglang/zig.vim/,,
https://github.com/mickael-menu/zk-nvim/,HEAD,

30
pkgs/applications/emulators/retroarch/hashes.json
View File

@ -287,10 +287,10 @@
"src": {
"owner": "libretro",
"repo": "fbneo",
"rev": "2adfb2723b5d7abcf33633fd30a794dce4263a5b",
"hash": "sha256-AZzMGbCZJZ/BJ7A9CybwRPxfi7P7TBU7nRPzn/6kwrc="
"rev": "484962863ab84189dca218b02197575cd266a537",
"hash": "sha256-e1JAEiPISc4Q06HHPox6AVbK/Frrbc7pLNvNmuWojVw="
},
"version": "unstable-2024-02-16"
"version": "unstable-2024-02-18"
},
"fceumm": {
"fetcher": "fetchFromGitHub",
@ -528,11 +528,11 @@
"src": {
"owner": "Javanaise",
"repo": "mrboom-libretro",
"rev": "f688664f024723e00c0d2926e51b45754a25e2da",
"hash": "sha256-t6ArMkyGvHJ9hLc+FFoH2wTk0wRFn5etzdLipTQnGyc=",
"rev": "1c07bbec56b6bf5eb04c70e183804ab8d5e3520c",
"hash": "sha256-1gJK/Q2CZkDgMXrvJ5pxw1nvgH8Sk/UByWQKfJ6Pwfg=",
"fetchSubmodules": true
},
"version": "unstable-2024-02-09"
"version": "unstable-2024-02-17"
},
"mupen64plus": {
"fetcher": "fetchFromGitHub",
@ -559,10 +559,10 @@
"src": {
"owner": "libretro",
"repo": "nestopia",
"rev": "407df997b65cddbff9b25abae0510e6645205677",
"hash": "sha256-Vlz69ZpXwawdE+bfjlKNrQNmFHhB53FOKhfMgq4viE0="
"rev": "2cef539e0df9ae5c8e6adf830a37f5d122bf5f05",
"hash": "sha256-OKqD99kqpIoqRUOByQ4qwAczYlIGeAn0xfTZVC5jptc="
},
"version": "unstable-2024-02-13"
"version": "unstable-2024-02-18"
},
"np2kai": {
"fetcher": "fetchFromGitHub",
@ -651,11 +651,11 @@
"src": {
"owner": "jpd002",
"repo": "Play-",
"rev": "2462fe76ebf86fe1dd4da8d79b99872f14e987bf",
"hash": "sha256-08srcJwhvOw6AER36+ar2SXjKR1jO568lRl63B7zRio=",
"rev": "1c42b05083a5c9254a8479ea78cc04369beaaa00",
"hash": "sha256-GM4VymoZpJvQTHmJvzSTxl6ALLeGdP5OtQE+efPvYpw=",
"fetchSubmodules": true
},
"version": "unstable-2024-02-14"
"version": "unstable-2024-02-19"
},
"ppsspp": {
"fetcher": "fetchFromGitHub",
@ -693,10 +693,10 @@
"src": {
"owner": "libretro",
"repo": "libretro-uae",
"rev": "2cad13f98aa4df272decf2ab99d95aa582cd4cfb",
"hash": "sha256-8iGsQJcImL7hUK14X+u2BSq4W9BkosiLImCmzf63o4Q="
"rev": "4e8b54dd574eff239b5f4b4e3bc35c40b3a7cdd4",
"hash": "sha256-pBpzzCgZYaA7/+UvwTsKCRseroe98AwRovjIk4Z0fhI="
},
"version": "unstable-2024-02-03"
"version": "unstable-2024-02-20"
},
"quicknes": {
"fetcher": "fetchFromGitHub",

6
pkgs/applications/graphics/oculante/default.nix
View File

@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.8.7";
version = "0.8.8";
src = fetchFromGitHub {
owner = "woelper";
repo = "oculante";
rev = version;
hash = "sha256-49reMm9woxekJUqHq7biHvlYii9BmLvq6u9RFkASpUw=";
hash = "sha256-LfMun9eG/76wqm2SADYIjWXOHbCl5yikkdK2FoavSWY=";
};
cargoHash = "sha256-93J0/INcQEvu14pPZeLRfwKECeEGcsch9hUZ0IjYivM=";
cargoHash = "sha256-UALmfUD0+n4d/oYDgeX5mStOYw7QRftfCIE3AKezrQQ=";
nativeBuildInputs = [
cmake

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.55.2";
version = "0.55.3";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6lUBtTG05Bz+M9Jj5HaOqG2yelwbC1trCM33NzUP1U4=";
hash = "sha256-FwLL2/V8LIihsr3/JBIuzUH37sRX2xw7nk+KlIIhzxs=";
};
vendorHash = "sha256-uFSkolmQV11cY+3ZWrlByHDFolpr2E+9/R95bhBn6zo=";

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.2.3";
version = "24.2.5";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-US+RyjKpzIPpqvc19nInUW5/x/osLbc6xk4yKEdQYic=";
hash = "sha256-xLrt9ng2Le3eEPHyXuoqTUwSH5h6J+93bKFxIAaEduA=";
};
nativeBuildInputs = [

6
pkgs/applications/science/chemistry/avogadro2/default.nix
View File

@ -12,13 +12,13 @@ let
in stdenv.mkDerivation rec {
pname = "avogadro2";
version = "1.98.1";
version = "1.99.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadroapp";
rev = version;
hash = "sha256-N35WGYZbgfjKnorzGKCnbBvlrlt9Vr04YIG2R3k+b8A=";
hash = "sha256-m8kX4WzOmPE/BZQRePOoUAdMPdWb6pmcqtPvDdEIIao=";
};
postUnpack = ''
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ openbabel ];
qtWrapperArgs = [ "--prefix PATH : ${openbabel}/bin" ];
qtWrapperArgs = [ "--prefix PATH : ${lib.getBin openbabel}/bin" ];
meta = with lib; {
description = "Molecule editor and visualizer";

12
pkgs/applications/science/chemistry/openmolcas/default.nix
View File

@ -41,16 +41,15 @@ let
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "openmolcas";
version = "23.10";
version = "24.02";
src = fetchFromGitLab {
owner = "Molcas";
repo = "OpenMolcas";
# The tag keeps moving, fix a hash instead
rev = "c74317e68572d1da82fdce4210b005c2c1b1de53"; # 2023-09-25
hash = "sha256-wBrASZ6YFsWsu/TreEZ6Q+VxNQwCwMpyPC8AOqmNxos=";
rev = "v${version}";
hash = "sha256-4Ek0cnaRfLEbj1Nj31rRp9b2sois4rIFTcpOUq9h2mw=";
};
patches = [
@ -59,9 +58,6 @@ stdenv.mkDerivation {
# Required for a local QCMaquis build
./qcmaquis.patch
# PyParsing >= 3.11 compatibility, can be removed on next release
./pyparsing.patch
];
postPatch = ''

37
pkgs/applications/science/chemistry/openmolcas/pyparsing.patch
View File

@ -1,37 +0,0 @@
diff --git a/Tools/pymolcas/emil_grammar.py b/Tools/pymolcas/emil_grammar.py
index acbbae8..509c56f 100644
--- a/Tools/pymolcas/emil_grammar.py
+++ b/Tools/pymolcas/emil_grammar.py
@@ -15,6 +15,14 @@
from __future__ import (unicode_literals, division, absolute_import, print_function)
+try:
+ u = unicode
+ del u
+ py2 = True
+except NameError:
+ pass
+
+
from re import sub
from pyparsing import *
@@ -24,6 +32,8 @@ def chomp(s):
def chompAction(s, l, t):
try:
+ if (py2):
+ pass
return list(map(lambda s: chomp(unicode(s)), t))
except NameError:
return list(map(chomp, t))
@@ -33,6 +43,8 @@ def removeEMILEnd(s):
def removeEMILEndAction(s, l, t):
try:
+ if (py2):
+ pass
return list(map(lambda s: removeEMILEnd(unicode(s)), t))
except NameError:
return list(map(removeEMILEnd, t))

6
pkgs/applications/version-management/git-ignore/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-ignore";
version = "1.2.2";
version = "1.3.1";
src = fetchFromGitHub {
owner = "sondr3";
repo = pname;
rev = "v${version}";
hash = "sha256-kIRuoY0dM2t+aY4iYdik9gUpG+81sDiJLD11Bmx68FI=";
hash = "sha256-kfc4LIFjLMltCn3BPaEfxc/yOZxFjYioyobTQZN/RmY=";
};
cargoHash = "sha256-6sb+OW5VtA6vY6fDtsaZePZD53ehH7QawxJJlUNsrnM=";
cargoHash = "sha256-HoW10XzWIjxsqoKVKQkMf5in7pOODGnUM0cRZP1OJpg=";
nativeBuildInputs = [
installShellFiles

4
pkgs/applications/virtualization/crun/default.nix
View File

@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "1.14.2";
version = "1.14.3";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
hash = "sha256-D2OuTbWAISEtrKy7LFVJz8FZWdXSn1ZiKYak9cJVceU=";
hash = "sha256-BsDkPwHi8nUcxw6KSrsMvVCdD6/BxVDuiBkAdv8H2xc=";
fetchSubmodules = true;
};

59
pkgs/by-name/ap/apx-gui/package.nix Normal file
View File

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchFromGitHub
, appstream-glib
, desktop-file-utils
, gobject-introspection
, libadwaita
, meson
, ninja
, pkg-config
, python3
, wrapGAppsHook4
, apx
, gnome-console
}:
stdenv.mkDerivation (finalAttrs: {
pname = "apx-gui";
version = "0.1.1";
src = fetchFromGitHub {
owner = "Vanilla-OS";
repo = "apx-gui";
rev = "v${finalAttrs.version}";
hash = "sha256-orP5kAsoXX0zyDskeIPKKHNt5c757eUm9un4Ws6uFYA=";
};
strictDeps = true;
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gobject-introspection
meson
ninja
pkg-config
(python3.withPackages (ps: [ ps.pygobject3 ]))
wrapGAppsHook4
];
buildInputs = [
libadwaita
];
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ apx gnome-console ]}"
)
'';
meta = {
description = "A GUI frontend for Apx in GTK 4 and Libadwaita";
homepage = "https://github.com/Vanilla-OS/apx-gui";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ chewblacka ];
mainProgram = "apx-gui";
};
})

4179
pkgs/by-name/di/dim/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

19412
pkgs/by-name/di/dim/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

100
pkgs/by-name/di/dim/package.nix Normal file
View File

@ -0,0 +1,100 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
buildNpmPackage,
makeWrapper,
ffmpeg_5,
git,
pkg-config,
sqlite,
libvaSupport ? stdenv.hostPlatform.isLinux,
libva,
}:
rustPlatform.buildRustPackage rec {
pname = "dim";
version = "0-unstable-2023-12-29";
src = fetchFromGitHub {
owner = "Dusk-Labs";
repo = "dim";
rev = "3ccb4ab05fc1d7dbd4ebbba9ff2de0ecc9139b27";
hash = "sha256-1mgbrDnIkIdWy78uj4EjjgwBQxw/rIS1LCFNscXXPbk=";
};
frontend = buildNpmPackage {
pname = "dim-ui";
inherit version;
src = "${src}/ui";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-6oSm3H6RItHOrBIvP6uvR7sBboBRWFuP3VwU38GMfgQ=";
installPhase = ''
runHook preInstall
cp -r build $out
runHook postInstall
'';
};
patches = [
# Upstream uses a 'ffpath' function to look for config directory and
# (ffmpeg) binaries in the same directory as the binary. Patch it to use
# the working dir and PATH instead.
./relative-paths.diff
];
postConfigure = ''
ln -ns $frontend ui/build
'';
nativeBuildInputs = [
makeWrapper
pkg-config
git
];
buildInputs = [
sqlite
] ++ lib.optional libvaSupport libva;
buildFeatures = lib.optional libvaSupport "vaapi";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno=";
"nightfall-0.3.12-rc4" = "sha256-DtSXdIDg7XBgzEYzHdzjrHdM1ESKTQdgByeerH5TWwU=";
};
};
checkFlags = [
# Requires network
"--skip=tmdb::tests::johhny_test_seasons"
"--skip=tmdb::tests::once_upon_get_year"
"--skip=tmdb::tests::tmdb_get_cast"
"--skip=tmdb::tests::tmdb_get_details"
"--skip=tmdb::tests::tmdb_get_episodes"
"--skip=tmdb::tests::tmdb_get_seasons"
"--skip=tmdb::tests::tmdb_search"
# Broken doctest
"--skip=dim-utils/src/lib.rs"
];
postInstall = ''
wrapProgram $out/bin/dim \
--prefix PATH : ${lib.makeBinPath [ffmpeg_5]}
'';
meta = {
homepage = "https://github.com/Dusk-Labs/dim";
description = "Self-hosted media manager";
license = lib.licenses.agpl3Only;
mainProgram = "dim";
maintainers = [ lib.maintainers.misterio77 ];
platforms = lib.platforms.unix;
};
}

173
pkgs/by-name/di/dim/relative-paths.diff Normal file
View File

@ -0,0 +1,173 @@
diff --git a/dim-core/src/routes/settings.rs b/dim-core/src/routes/settings.rs
index f577eaf6..67da9448 100644
--- a/dim-core/src/routes/settings.rs
+++ b/dim-core/src/routes/settings.rs
@@ -1,5 +1,3 @@
-use crate::utils::ffpath;
-
use std::error::Error;
use std::fs::File;
use std::fs::OpenOptions;
@@ -49,7 +47,7 @@ impl Default for GlobalSettings {
}
}
},
- metadata_dir: ffpath("config/metadata"),
+ metadata_dir: "config/metadata".into(),
quiet_boot: false,
disable_auth: false,
verbose: false,
@@ -69,7 +67,7 @@ pub fn get_global_settings() -> GlobalSettings {
}
pub fn init_global_settings(path: Option<String>) -> Result<(), Box<dyn Error>> {
- let path = path.unwrap_or(ffpath("config/config.toml"));
+ let path = path.unwrap_or("config/config.toml".into());
let _ = SETTINGS_PATH.set(path.clone());
let mut content = String::new();
@@ -94,7 +92,7 @@ pub fn set_global_settings(settings: GlobalSettings) -> Result<(), Box<dyn Error
let path = SETTINGS_PATH
.get()
.cloned()
- .unwrap_or(ffpath("config/config.toml"));
+ .unwrap_or("config/config.toml".into());
{
let mut lock = GLOBAL_SETTINGS.lock().unwrap();
@@ -107,4 +105,4 @@ pub fn set_global_settings(settings: GlobalSettings) -> Result<(), Box<dyn Error
.unwrap();
Ok(())
-}
\ No newline at end of file
+}
diff --git a/dim-core/src/streaming/mod.rs b/dim-core/src/streaming/mod.rs
index a9312041..8ad12fe4 100644
--- a/dim-core/src/streaming/mod.rs
+++ b/dim-core/src/streaming/mod.rs
@@ -1,27 +1,13 @@
pub mod ffprobe;
-use cfg_if::cfg_if;
-
use std::collections::HashMap;
use std::sync::Arc;
use std::sync::RwLock;
-use crate::utils::ffpath;
-
lazy_static::lazy_static! {
pub static ref STREAMING_SESSION: Arc<RwLock<HashMap<String, HashMap<String, String>>>> = Arc::new(RwLock::new(HashMap::new()));
- pub static ref FFMPEG_BIN: &'static str = Box::leak(ffpath("utils/ffmpeg").into_boxed_str());
- pub static ref FFPROBE_BIN: &'static str = {
- cfg_if! {
- if #[cfg(test)] {
- "/usr/bin/ffprobe"
- } else if #[cfg(bench)] {
- "/usr/bin/ffprobe"
- } else {
- Box::leak(ffpath("utils/ffprobe").into_boxed_str())
- }
- }
- };
+ pub static ref FFMPEG_BIN: &'static str = "ffmpeg";
+ pub static ref FFPROBE_BIN: &'static str = "ffprobe";
}
use std::process::Command;
diff --git a/dim-database/src/lib.rs b/dim-database/src/lib.rs
index de99a5e4..ac9731be 100644
--- a/dim-database/src/lib.rs
+++ b/dim-database/src/lib.rs
@@ -1,8 +1,6 @@
// FIXME: We have a shim in dim/utils but we cant depend on dim because itd be a circular dep.
#![deny(warnings)]
-use crate::utils::ffpath;
-
use std::str::FromStr;
use std::sync::atomic::AtomicBool;
use std::sync::atomic::Ordering;
@@ -157,13 +155,13 @@ pub async fn get_conn_logged() -> sqlx::Result<DbConnection> {
async fn internal_get_conn() -> sqlx::Result<DbConnection> {
let rw_only = sqlx::sqlite::SqliteConnectOptions::new()
.create_if_missing(true)
- .filename(ffpath("config/dim.db"))
+ .filename("config/dim.db")
.connect()
.await?;
let rd_only = sqlx::pool::PoolOptions::new()
.connect_with(
- sqlx::sqlite::SqliteConnectOptions::from_str(ffpath("config/dim.db"))?
+ sqlx::sqlite::SqliteConnectOptions::from_str("config/dim.db")?
.read_only(true)
.synchronous(sqlx::sqlite::SqliteSynchronous::Normal)
.create_if_missing(true),
diff --git a/dim-database/src/utils.rs b/dim-database/src/utils.rs
index 35e25c6c..e1e56e01 100644
--- a/dim-database/src/utils.rs
+++ b/dim-database/src/utils.rs
@@ -16,17 +16,3 @@ macro_rules! opt_update {
}
}
}
-
-#[cfg(not(debug_assertions))]
-pub fn ffpath(bin: impl AsRef<str>) -> &'static str {
- let mut path = std::env::current_exe().expect("Failed to grab path to the `dim` binary.");
- path.pop(); // remove the dim bin to get the dir of `dim`
- path.push(bin.as_ref());
-
- Box::leak(path.to_string_lossy().to_string().into_boxed_str())
-}
-
-#[cfg(debug_assertions)]
-pub fn ffpath(bin: impl AsRef<str>) -> &'static str {
- Box::leak(bin.as_ref().to_string().into_boxed_str())
-}
diff --git a/dim-utils/src/lib.rs b/dim-utils/src/lib.rs
index 816bfe82..6dddc9aa 100644
--- a/dim-utils/src/lib.rs
+++ b/dim-utils/src/lib.rs
@@ -400,20 +400,6 @@ pub fn secs_to_pretty(t: u64) -> String {
tag
}
-#[cfg(not(debug_assertions))]
-pub fn ffpath(bin: impl AsRef<str>) -> String {
- let mut path = std::env::current_exe().expect("Failed to grab path to the `dim` binary.");
- path.pop(); // remove the dim bin to get the dir of `dim`
- path.push(bin.as_ref());
-
- path.to_string_lossy().to_string()
-}
-
-#[cfg(debug_assertions)]
-pub fn ffpath(bin: impl AsRef<str>) -> String {
- bin.as_ref().to_string()
-}
-
pub fn codec_pretty(codec: &str) -> String {
match codec {
"h264" => "H.264".into(),
diff --git a/dim/src/main.rs b/dim/src/main.rs
index 867d64de..e683b441 100644
--- a/dim/src/main.rs
+++ b/dim/src/main.rs
@@ -18,12 +18,12 @@ struct Args {
fn main() {
let args = Args::parse();
- let _ = std::fs::create_dir_all(dim::utils::ffpath("config"));
+ let _ = std::fs::create_dir_all("config");
let config_path = args
.config
.map(|x| x.to_string_lossy().to_string())
- .unwrap_or(dim::utils::ffpath("config/config.toml"));
+ .unwrap_or("config/config.toml".into());
// initialize global settings.
dim::init_global_settings(Some(config_path)).expect("Failed to initialize global settings.");

34
pkgs/by-name/em/emacsclient-commands/package.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, fetchFromGitHub
, buildGoModule
, gnumake
}:
buildGoModule {
pname = "emacsclient-commands";
version = "unstable-2023-09-22";
src = fetchFromGitHub {
owner = "szermatt";
repo = "emacsclient-commands";
rev = "8f5c8a877794ed51f8225036e36fd5ce272b17f3";
hash = "sha256-OlcB5VqWYdl0wz1y8nmG6Xgdf5IPOUQ31UG1TDxQAis=";
};
vendorHash = "sha256-8oREed2Igz5UvUTDdOFwW5wQQy3H8Xj8epxo6gqnZFA=";
buildInputs = [ gnumake ];
buildPhase = ''
runHook preBuild
DESTDIR=$out/ make install
runHook postBuild
'';
meta = with lib; {
description = "A collection of small shell utilities that connect to a local Emacs server";
homepage = "https://github.com/szermatt/emacsclient-commands";
license = licenses.gpl2Only;
maintainers = with maintainers; [ binarycat ];
};
}

6
pkgs/by-name/go/goldwarden/package.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "goldwarden";
version = "0.2.10";
version = "0.2.12";
src = fetchFromGitHub {
owner = "quexten";
repo = "goldwarden";
rev = "v${version}";
hash = "sha256-NYK9H9BCjUweip8HjxHqN2wjUGmg0zicJSC/S1hpvx8=";
hash = "sha256-W6dqxHGZGHuVOUNYWMpfswzG2bSCRyY58ya/ZqAMxyY=";
};
vendorHash = "sha256-AiYgI2dBhVYxGNU7t4dywi8KWiffO6V05KFYoGzA0t4=";
vendorHash = "sha256-IH0p7t1qInA9rNYv6ekxDN/BT5Kguhh4cZfmL+iqwVU=";
ldflags = [ "-s" "-w" ];

6
pkgs/by-name/hu/hugo/package.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.122.0";
version = "0.123.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-pnsQo+nSuIlQ6KKTP1z/BZ74zEu9HjYP66hGStPc0pc=";
hash = "sha256-VGp+B+a4nX5oIc+YjslQHzXgC76MvMObKS6EXll1C3E=";
};
vendorHash = "sha256-aYy0TOfNIqx44UBXJhewvxi+oSAWjmi/32WvI3HJ3MM=";
vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o=";
doCheck = false;

38
pkgs/by-name/ke/keepassxc-go/package.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
}:
buildGoModule rec {
pname = "keepassxc-go";
version = "1.5.1";
src = fetchFromGitHub {
owner = "MarkusFreitag";
repo = "keepassxc-go";
rev = "v${version}";
hash = "sha256-seCeHNEj5GxAI7BVMPzh+YuoxivmTwvhVCqY5LKHpQk=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-jscyNyVr+RDN1EaxIOc3aYCAVT+1eO/c+dxEsIorDIs=";
postInstall = ''
local INSTALL="$out/bin/keepassxc-go"
installShellCompletion --cmd keepassxc-go \
--bash <($out/bin/keepassxc-go completion bash) \
--fish <($out/bin/keepassxc-go completion fish) \
--zsh <($out/bin/keepassxc-go completion zsh)
'';
meta = with lib; {
description = "Library and basic CLI tool to interact with KeepassXC via unix socket";
homepage = "https://github.com/MarkusFreitag/keepassxc-go";
changelog = "https://github.com/MarkusFreitag/keepassxc-go/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ xgwq ];
mainProgram = "keepassxc-go";
};
}

6
pkgs/by-name/ko/kor/package.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kor";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "yonahd";
repo = pname;
rev = "v${version}";
hash = "sha256-GeGttcvAhCRLbScxgcV9DrNZbvlsVRyOcA4xFUlHCyI=";
hash = "sha256-Y8k7tpKqs/X5ePa2kFkKxrYb1E4Z5h8+o229eD6YQ/M=";
};
vendorHash = "sha256-x3XlqyaNPafBbCOq6leUHmBzz2poxgT0mVJ8UM0aRzg=";
vendorHash = "sha256-DRbwM6fKTIlefD0rUmNLlUXrK+t3vNCl4rxHF7m8W10=";
preCheck = ''
HOME=$(mktemp -d)

10
pkgs/by-name/pa/paratest/composer.lock generated
View File

@ -2628,16 +2628,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.58",
"version": "1.10.59",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "a23518379ec4defd9e47cbf81019526861623ec2"
"reference": "e607609388d3a6d418a50a49f7940e8086798281"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
"reference": "a23518379ec4defd9e47cbf81019526861623ec2",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
"reference": "e607609388d3a6d418a50a49f7940e8086798281",
"shasum": ""
},
"require": {
@ -2686,7 +2686,7 @@
"type": "tidelift"
}
],
"time": "2024-02-12T20:02:57+00:00"
"time": "2024-02-20T13:59:13+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",

6
pkgs/by-name/pa/paratest/package.nix
View File

@ -5,17 +5,17 @@
(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject (finalAttrs: {
pname = "paratest";
version = "7.4.2";
version = "7.4.3";
src = fetchFromGitHub {
owner = "paratestphp";
repo = "paratest";
rev = "v${finalAttrs.version}";
hash = "sha256-Sd7S51SjI8g2Qz/NAeKKpxpSyBhvlrtJFbazbPJf2N0=";
hash = "sha256-Shf/fsGhDmupFn/qERzXGg3ko7mBgUqYzafO/VPqmoU=";
};
composerLock = ./composer.lock;
vendorHash = "sha256-O8iEkvXIkkaQxcKfhm0Z4EZOtLolNsTPaPkXekpxkqs=";
vendorHash = "sha256-9KFh6Vwzt17v6WlEutRpwCauLOcj05hR4JGDcPbYL1U=";
meta = {
changelog = "https://github.com/paratestphp/paratest/releases/tag/v${finalAttrs.version}";

121
pkgs/by-name/re/recoverdm/0001-darwin-build-fixes.patch Normal file
View File

@ -0,0 +1,121 @@
From 9b46e151b9fdaf5684618482e69ef4a307c0d47c Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Sun, 18 Feb 2024 19:54:21 +0000
Subject: [PATCH] darwin build fixes
---
compat.h | 14 ++++++++++++++
dev.c | 1 +
error.c | 1 +
io.c | 1 +
mergebad.c | 1 +
recoverdm.c | 1 +
utils.c | 1 +
utils.h | 1 +
8 files changed, 21 insertions(+)
create mode 100644 src/compat.h
diff --git a/compat.h b/compat.h
new file mode 100644
index 0000000..181c8ea
--- /dev/null
+++ b/compat.h
@@ -0,0 +1,14 @@
+#pragma once
+#ifdef __APPLE__
+#include <unistd.h>
+_Static_assert(sizeof(off_t) == 8, "off_t must be 8 bytes");
+typedef off_t off64_t;
+#define stat64 stat
+#define lseek64 lseek
+#define open64 open
+#define POSIX_FADV_SEQUENTIAL 1
+static inline int posix_fadvise(int fd, off_t offset, off_t len, int advice)
+{
+ return 0;
+}
+#endif
diff --git a/dev.c b/dev.c
index c1ce748..ae3ce2c 100644
--- a/dev.c
+++ b/dev.c
@@ -18,6 +18,7 @@
#include <scsi/scsi_ioctl.h>
#include <linux/cdrom.h>
#endif
+#include "compat.h"
#include "dev.h"
diff --git a/error.c b/error.c
index d2f8acf..550e1af 100644
--- a/error.c
+++ b/error.c
@@ -4,6 +4,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <signal.h>
+#include "compat.h"
void error_exit(char *format, ...)
{
diff --git a/io.c b/io.c
index 9d66534..e784d75 100644
--- a/io.c
+++ b/io.c
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "compat.h"
#include "io.h"
#include "error.h"
diff --git a/mergebad.c b/mergebad.c
index 34a6ef7..580c3bc 100644
--- a/mergebad.c
+++ b/mergebad.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include "compat.h"
#include "io.h"
#include "dev.h"
diff --git a/recoverdm.c b/recoverdm.c
index 8b71ae1..5dddeb3 100644
--- a/recoverdm.c
+++ b/recoverdm.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include "compat.h"
#include "io.h"
#include "dev.h"
diff --git a/utils.c b/utils.c
index 5791404..ee42a0a 100644
--- a/utils.c
+++ b/utils.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include "compat.h"
#include "io.h"
#include "dev.h"
diff --git a/utils.h b/utils.h
index c749c2e..acb0888 100644
--- a/utils.h
+++ b/utils.h
@@ -1,3 +1,4 @@
+#include "compat.h"
void * mymalloc(size_t size, char *what);
void * myrealloc(void *oldp, size_t newsize, char *what);
off64_t get_filesize(char *filename);
--
2.43.0

53
pkgs/by-name/re/recoverdm/package.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, installShellFiles
}:
stdenv.mkDerivation (finalAttrs: {
pname = "recoverdm";
version = "0.20-8";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "pkg-security-team";
repo = "recoverdm";
rev = "debian/${finalAttrs.version}";
hash = "sha256-1iW3Ug85ZLGpvG29N5zJt8oooSQGnLsr+8XIcp4aSSM=";
};
patches = let patch = name: "./debian/patches/${name}"; in [
(patch "10_fix-makefile.patch")
(patch "20_fix-typo-binary.patch")
(patch "30-fix-BTS-mergebad-crash.patch")
(patch "40_dev-c.patch")
./0001-darwin-build-fixes.patch
];
postPatch = ''
substituteInPlace Makefile \
--replace-fail '$(DESTDIR)/usr/bin' $out/bin
'';
nativeBuildInputs = [
installShellFiles
];
preInstall = ''
mkdir -p $out/bin
'';
postInstall = ''
installManPage recoverdm.1
'';
meta = with lib; {
description = "Recover damaged CD DVD and disks with bad sectors";
mainProgram = "recoverdm";
homepage = "https://salsa.debian.org/pkg-security-team/recoverdm";
maintainers = with maintainers; [ d3vil0p3r ];
platforms = platforms.unix;
license = licenses.gpl1Only;
};
})

4
pkgs/by-name/re/renode-unstable/package.nix
View File

@ -7,10 +7,10 @@
inherit buildUnstable;
}).overrideAttrs (finalAttrs: _: {
pname = "renode-unstable";
version = "1.14.0+20240215git10667c665";
version = "1.14.0+20240219gitea2784757";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
hash = "sha256-4u2mAW93ivXteVBimjbjDhYHzHHIQCdrINEFzapCd3c=";
hash = "sha256-ODf2vWQ0ZeYYmia5BgQvLm+BFCX/GjVvRqVAPPW/sq8=";
};
})

4
pkgs/by-name/wt/wtfis/package.nix
View File

@ -5,12 +5,12 @@
let
pname = "wtfis";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "pirxthepilot";
repo = "wtfis";
rev = "refs/tags/v${version}";
hash = "sha256-X3e0icyhNPg8P6+N9k6a9WwBJ8bXRPdo3fj4cj+yY6w=";
hash = "sha256-eSmvyDr8PbB15UWIl67Qp2qHeOq+dmnP8eMsvcGypVw=";
};
in python3.pkgs.buildPythonApplication {
inherit pname version src;

4
pkgs/data/fonts/sudo/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "sudo-font";
version = "0.81";
version = "1.0";
src = fetchzip {
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
hash = "sha256-qc26xHM9P9+lsPE9j5UY4f0hIb5PjlCSy+jm0zEFj2g=";
hash = "sha256-XD+oLfPE8DD5DG5j/VN6nTVn+mhFE5qqyvjwDk2Dr/I=";
};
installPhase = ''

4
pkgs/development/compilers/circt/default.nix
View File

@ -17,12 +17,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.65.0";
version = "1.66.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
sha256 = "sha256-RYQAnvU+yoHGrU9zVvrD1/O80ioHEq2Cvo/MIjI6uTo=";
sha256 = "sha256-7O2YUZq0GBS2xvsXg0v55XZXAzqsbHjeKNgqMbNRT8E=";
fetchSubmodules = true;
};

17
pkgs/development/compilers/qbe/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv
{ lib
, stdenv
, fetchzip
, callPackage
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "qbe";
version = "1.1";
version = "1.2";
src = fetchzip {
url = "https://c9x.me/compile/release/qbe-${version}.tar.xz";
sha256 = "sha256-yFZ3cpp7eLjf7ythKFTY1YEJYyfeg2en4/D8+9oM1B4=";
url = "https://c9x.me/compile/release/qbe-${finalAttrs.version}.tar.xz";
hash = "sha256-UgtJnZF/YtD54OBy9HzGRAEHx5tC9Wo2YcUidGwrv+s=";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru = {
tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {};
tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { };
};
meta = with lib; {
@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ fgaz ];
license = licenses.mit;
platforms = platforms.all;
mainProgram = "qbe";
};
}
})

2
pkgs/development/libraries/double-conversion/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
homepage = "https://github.com/google/double-conversion";
license = licenses.bsd3;
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ abbradar ];
};
}

2
pkgs/development/libraries/libpsl/default.nix
View File

@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = [ maintainers.c0bw3b ];
mainProgram = "psl";
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
pkgConfigModules = [ "libpsl" ];
};
}

16
pkgs/development/libraries/openbabel/default.nix
View File

@ -1,21 +1,21 @@
{ stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
{ stdenv, lib, fetchFromGitHub, cmake, perl, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "3.1.1";
version = "unstable-06-12-23";
src = fetchFromGitHub {
owner = "openbabel";
repo = "openbabel";
rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY=";
repo = pname;
rev = "32cf131444c1555c749b356dab44fb9fe275271f";
hash = "sha256-V0wrZVrojCZ9Knc5H6cPzPoYWVosRZ6Sn4PX+UFEfHY=";
};
postPatch = ''
sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12
'';
buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ];
buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson ];
nativeBuildInputs = [ cmake pkg-config ];
@ -26,13 +26,15 @@ stdenv.mkDerivation rec {
"-DPYTHON_BINDINGS=ON"
];
# Setuptools only accepts PEP 440 version strings. The "unstable" identifier
# can not be used. Instead we pretend to be the 3.2 beta release.
postFixup = ''
cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py
from distutils.core import setup
setup(
name = 'pyopenbabel',
version = '${version}',
version = '3.2b1',
packages = ['openbabel'],
package_data = {'openbabel' : ['_openbabel.so']}
)

23
pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, zlib, eigen, libGL, doxygen, spglib
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, doxygen, spglib
, mmtf-cpp, glew, python3, libarchive, libmsym, msgpack, qttools, wrapQtAppsHook
}:
@ -18,26 +18,43 @@ let
rev = "1.0.1";
sha256 = "sH/WuvLaYu6akOc3ssAKhnxD8KNoDxuafDSozHqJZC4=";
};
fragmentsRepo = fetchFromGitHub {
owner = "OpenChemistry";
repo = "fragments";
rev = "8dc711a59d016604b3e9b6d59dec178b8e6ccd36";
hash = "sha256-Valc5zwlaZ//eDupFouCfWCeID7/4ObU1SDLFJ/mo/g=";
};
in stdenv.mkDerivation rec {
pname = "avogadrolibs";
version = "1.98.1";
version = "1.99.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = pname;
rev = version;
hash = "sha256-BuBMWW7N5Cu9tw5Vpwk+aoIaMWwHViRzLtIG7XDWjN4=";
hash = "sha256-3jUbzEd7tUeHlVFAO9KJ+LOQlkLzJQvwmHp8gOriZRI=";
};
postUnpack = ''
cp -r ${moleculesRepo} molecules
cp -r ${crystalsRepo} crystals
cp -r ${fragmentsRepo} fragments
'';
patches = [
# Fix a Cmake error when searching the fragments directory.
# Can be removed upon next release
(fetchpatch {
url = "https://github.com/OpenChemistry/avogadrolibs/commit/6e2e84dbb088a40d69117c1836f4306792f57acd.patch";
hash = "sha256-0tY9kHh6e5IDZQ8cWPgTpwIBhfZQlgUEZbPHOmtOVUQ=";
})
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
pythonWP
];
buildInputs = [

13
pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt
index 3f68e6dd..822de4e5 100644
--- a/avogadro/qtplugins/templatetool/CMakeLists.txt
+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt
@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool
)
# Install the fragments
-set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments")
+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments")
# Look in parallel directory for the molecule fragment repository
if(NOT EXISTS "${_fragments}")

6
pkgs/development/php-packages/phpstan/default.nix
View File

@ -2,16 +2,16 @@
php.buildComposerProject (finalAttrs: {
pname = "phpstan";
version = "1.10.58";
version = "1.10.59";
src = fetchFromGitHub {
owner = "phpstan";
repo = "phpstan-src";
rev = finalAttrs.version;
hash = "sha256-Dt2auiTM5T9jNF+ja/tTYctVOCVju+tYzHZS1g0sZIw=";
hash = "sha256-2+CQtpmh2r2+87zLhx7UkYlZ7sDQdDh4S8v67PGNjLM=";
};
vendorHash = "sha256-Nqly5GnIarqLgr8/xoSbpU9cexc1QxKDDSGklQu13Ec=";
vendorHash = "sha256-6Wea4iUSFq0xSWFq4er4lzFn2mgeoYBXG1zMGM3Y390=";
composerStrictValidation = false;
meta = {

9
pkgs/development/python-modules/aioautomower/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioautomower";
version = "2024.2.6";
version = "2024.2.7";
pyproject = true;
disabled = pythonOlder "3.11";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Thomas55555";
repo = "aioautomower";
rev = "refs/tags/${version}";
hash = "sha256-iYC2bYkO9INbSeny9gy/I0cDSYeyrJiD9MJddUFIlhg=";
hash = "sha256-ij/Webe/YqpAyjCXFpKq0eyvTegiTDJYiMASuUJKc7Q=";
};
postPatch = ''
@ -57,6 +57,11 @@ buildPythonPackage rec {
"--snapshot-update"
];
disabledTests = [
# File is missing
"test_standard_mower"
];
meta = with lib; {
description = "Module to communicate with the Automower Connect API";
homepage = "https://github.com/Thomas55555/aioautomower";

54
pkgs/development/python-modules/asteroid-filterbanks/default.nix Normal file
View File

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, black
, codecov
, coverage
, librosa
, numpy
, pre-commit
, pytest
, scipy
, torch
}:
buildPythonPackage rec {
pname = "asteroid-filterbanks";
version = "0.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "asteroid-team";
repo = "asteroid-filterbanks";
rev = "v${version}";
hash = "sha256-Z5M2Xgj83lzqov9kCw/rkjJ5KXbjuP+FHYCjhi5nYFE=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
black
codecov
coverage
librosa
numpy
pre-commit
pytest
scipy
torch
];
pythonImportsCheck = [ "asteroid_filterbanks" ];
meta = with lib; {
description = "The PyTorch-based audio source separation toolkit for researchers";
homepage = "https://github.com/asteroid-team/asteroid-filterbanks";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

4
pkgs/development/python-modules/boto3-stubs/default.nix
View File

@ -365,14 +365,14 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.44";
version = "1.34.45";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-FXLl1Ro/kpZE6qRQqTKYDPmgDjKbJjzgpTAtdEolVMM=";
hash = "sha256-1V1TzKG/tLOIBo4rVtWJQOshnUcuvF0wrnfWdS6gLtc=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/botocore-stubs/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.44";
version = "1.34.45";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-O2LnO0Z2X0bSC8IU3k7md141miPmcbWKvSshGbgZThQ=";
hash = "sha256-hw7MQfRVnatZKw49XVKVDiw1IRz7vt9bBcucp2D7KRs=";
};
nativeBuildInputs = [

36
pkgs/development/python-modules/julius/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, torch
}:
buildPythonPackage rec {
pname = "julius";
version = "0.2.7";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-PA9fUwbX1gFvzJUZaydMrm8H4slZbu0xTk52QVVPuwg=";
};
propagatedBuildInputs = [
torch
];
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "julius" ];
meta = with lib; {
description = "Nice DSP sweets: resampling, FFT Convolutions. All with PyTorch, differentiable and with CUDA support";
homepage = "https://pypi.org/project/julius/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

13
pkgs/development/python-modules/mobi/default.nix
View File

@ -1,10 +1,10 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, loguru
, poetry-core
, pythonOlder
, pythonRelaxDepsHook
, setuptools
}:
@ -18,13 +18,18 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iscc";
repo = "mobi";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-g1L72MkJdrKQRsEdew+Qsn8LfCn8+cmj2pmY6s4nv2U=";
};
pythonRelaxDeps = [
"loguru"
];
nativeBuildInputs = [
setuptools
poetry-core
pythonRelaxDepsHook
setuptools
];
propagatedBuildInputs = [

4
pkgs/development/python-modules/motionblinds/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "motionblinds";
version = "0.6.20";
version = "0.6.21";
pyproject = true;
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = "refs/tags/${version}";
hash = "sha256-Ri14GwRpORk+8RdpPnrOOfDD+sqdQp9ESlYDnaS9ln8=";
hash = "sha256-zWEVgBEjxc0mg9KhlU1UvAd7HzQ2Rvsnsa2Q+/KxrHw=";
};
nativeBuildInputs = [

23
pkgs/development/python-modules/objax/default.nix
View File

@ -2,22 +2,26 @@
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, jaxlib
, jax
, jaxlib
, keras
, numpy
, parameterized
, pillow
, scipy
, tensorboard
, keras
, pytestCheckHook
, pythonOlder
, scipy
, setuptools
, tensorboard
, tensorflow
}:
buildPythonPackage rec {
pname = "objax";
version = "1.8.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "google";
@ -26,6 +30,10 @@ buildPythonPackage rec {
hash = "sha256-WD+pmR8cEay4iziRXqF3sHUzCMBjmLJ3wZ3iYOD+hzk=";
};
nativeBuildInputs = [
setuptools
];
# Avoid propagating the dependency on `jaxlib`, see
# https://github.com/NixOS/nixpkgs/issues/156767
buildInputs = [
@ -62,11 +70,14 @@ buildPythonPackage rec {
disabledTests = [
# Test requires internet access for prefetching some weights
"test_pretrained_keras_weight_0_ResNet50V2"
# ModuleNotFoundError: No module named 'tree'
"TestResNetV2Pretrained"
];
meta = with lib; {
description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX.";
description = "Machine learning framework that provides an Object Oriented layer for JAX";
homepage = "https://github.com/google/objax";
changelog = "https://github.com/google/objax/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
};

11
pkgs/development/python-modules/openaiauth/default.nix
View File

@ -2,13 +2,14 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, requests
, setuptools
, tls-client
}:
buildPythonPackage rec {
pname = "openaiauth";
version = "3.0.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,8 +19,12 @@ buildPythonPackage rec {
hash = "sha256-9SrptiheiM5s9YI6Ht68ahDGMFADWfBQgAWUBY3EEJ8=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
requests
tls-client
];
# Module has no tests

3
pkgs/development/python-modules/openbabel-bindings/default.nix
View File

@ -1,8 +1,7 @@
{ lib, openbabel, python, buildPythonPackage }:
buildPythonPackage rec {
pname = "openbabel";
version = "3.1.1";
inherit (openbabel) pname version;
src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages";

32
pkgs/development/python-modules/primepy/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
}:
buildPythonPackage rec {
pname = "primepy";
version = "1.3";
pyproject = true;
src = fetchPypi {
pname = "primePy";
inherit version;
hash = "sha256-Jf1+JTRLB4mlmEx12J8FT88fGAvvIMmY5L77rJLeRmk=";
};
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "primePy" ];
meta = with lib; {
description = "This module contains several useful functions to work with prime numbers. from primePy import primes";
homepage = "https://pypi.org/project/primePy/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

87
pkgs/development/python-modules/pyannote-audio/default.nix Normal file
View File

@ -0,0 +1,87 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, asteroid-filterbanks
, einops
, huggingface-hub
, pytorch-lightning
, omegaconf
, pyannote-core
, pyannote-database
, pyannote-metrics
, pyannote-pipeline
, pytorch-metric-learning
, rich
, semver
, soundfile
, speechbrain
, tensorboardx
, torch
, torch-audiomentations
, torchaudio
, torchmetrics
, numpy
, pyscaffold
}:
buildPythonPackage rec {
pname = "pyannote-audio";
version = "3.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pyannote";
repo = "pyannote-audio";
rev = version;
hash = "sha256-BxmEJE6v+QkEaAJ2oB2LwDQIoRajv6F9SRc8lP9iRLM=";
fetchSubmodules = true;
};
nativeBuildInputs = [
pyscaffold
setuptools
wheel
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "pyscaffold>=3.2a0,<3.3a0" "pyscaffold"
substituteInPlace requirements.txt \
--replace "lightning" "pytorch-lightning"
'';
propagatedBuildInputs = [
asteroid-filterbanks
einops
huggingface-hub
omegaconf
pyannote-core
pyannote-database
pyannote-metrics
pyannote-pipeline
pytorch-metric-learning
rich
semver
soundfile
speechbrain
tensorboardx
torch
torch-audiomentations
torchaudio
torchmetrics
numpy
pytorch-lightning
];
pythonImportsCheck = [ "pyannote.audio" ];
meta = with lib; {
description = "Neural building blocks for speaker diarization: speech activity detection, speaker change detection, overlapped speech detection, speaker embedding";
homepage = "https://github.com/pyannote/pyannote-audio";
changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

44
pkgs/development/python-modules/pyannote-core/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, sortedcontainers
, numpy
, scipy
, typing-extensions
}:
buildPythonPackage rec {
pname = "pyannote-core";
version = "5.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pyannote";
repo = "pyannote-core";
rev = version;
hash = "sha256-XQVEMy60LkfFr2TKXTeg6cGHRx5BUZ5qDgzIdKy/19Y=";
};
propagatedBuildInputs = [
sortedcontainers
numpy
scipy
typing-extensions
];
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "pyannote.core" ];
meta = with lib; {
description = "Advanced data structures for handling temporal segments with attached labels";
homepage = "https://github.com/pyannote/pyannote-core";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

44
pkgs/development/python-modules/pyannote-database/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, pyannote-core
, pyyaml
, pandas
, typer
}:
buildPythonPackage rec {
pname = "pyannote-database";
version = "5.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pyannote";
repo = "pyannote-database";
rev = version;
hash = "sha256-A7Xr24O8OvVAlURrR+SDCh8Uv9Yz3AUJSFDyDShVVjA=";
};
propagatedBuildInputs = [
pyannote-core
pyyaml
pandas
typer
];
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "pyannote.database" ];
meta = with lib; {
description = "Reproducible experimental protocols for multimedia (audio, video, text) database";
homepage = "https://github.com/pyannote/pyannote-database";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

56
pkgs/development/python-modules/pyannote-metrics/default.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, pyannote-core
, pyannote-database
, pandas
, scipy
, scikit-learn
, docopt
, tabulate
, matplotlib
, sympy
, numpy
}:
buildPythonPackage rec {
pname = "pyannote-metrics";
version = "3.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pyannote";
repo = "pyannote-metrics";
rev = version;
hash = "sha256-V4qyaCaFsoikfFILm2sccf6m7lqJSDTdLxS1sr/LXAY=";
};
propagatedBuildInputs = [
pyannote-core
pyannote-database
pandas
scipy
scikit-learn
docopt
tabulate
matplotlib
sympy
numpy
];
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "pyannote.metrics" ];
meta = with lib; {
description = "A toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems";
homepage = "https://github.com/pyannote/pyannote-metrics";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

52
pkgs/development/python-modules/pyannote-pipeline/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, pyannote-core
, pyannote-database
, pyyaml
, optuna
, tqdm
, docopt
, filelock
, scikit-learn
}:
buildPythonPackage rec {
pname = "pyannote-pipeline";
version = "3.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pyannote";
repo = "pyannote-pipeline";
rev = version;
hash = "sha256-0wSgy6kbKi9Wa5dimOz34IV5/8fSwaHDMUpaBW7tm2Y=";
};
propagatedBuildInputs = [
pyannote-core
pyannote-database
pyyaml
optuna
tqdm
docopt
filelock
scikit-learn
];
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "pyannote.pipeline" ];
meta = with lib; {
description = "Tunable pipelines";
homepage = "https://github.com/pyannote/pyannote-pipeline";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

108
pkgs/development/python-modules/pyscaffold/default.nix Normal file
View File

@ -0,0 +1,108 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, colorama
, configupdater
, importlib-metadata
, packaging
, platformdirs
, tomlkit
, pre-commit
, pyscaffoldext-cookiecutter
, pyscaffoldext-custom-extension
, pyscaffoldext-django
, pyscaffoldext-dsproject
, pyscaffoldext-markdown
, pyscaffoldext-travis
, virtualenv
, build
, certifi
, flake8
, pytest
, pytest-cov
, pytest-randomly
, pytest-xdist
, sphinx
, tox
}:
buildPythonPackage rec {
pname = "pyscaffold";
version = "4.5";
pyproject = true;
src = fetchPypi {
pname = "PyScaffold";
inherit version;
hash = "sha256-2En5ouFb3PFl4Z+Wg18LF+Gi1Z1MVhxEW4J6CB3m0mI=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
postPatch = ''
substituteInPlace setup.cfg --replace "platformdirs>=2,<4" "platformdirs"
'';
propagatedBuildInputs = [
colorama
configupdater
importlib-metadata
packaging
platformdirs
setuptools
setuptools-scm
tomlkit
];
passthru.optional-dependencies = {
all = [
pre-commit
pyscaffoldext-cookiecutter
pyscaffoldext-custom-extension
pyscaffoldext-django
pyscaffoldext-dsproject
pyscaffoldext-markdown
pyscaffoldext-travis
virtualenv
];
ds = [
pyscaffoldext-dsproject
];
md = [
pyscaffoldext-markdown
];
testing = [
build
certifi
flake8
pre-commit
pytest
pytest-cov
pytest-randomly
pytest-xdist
setuptools
setuptools-scm
sphinx
tomlkit
tox
virtualenv
wheel
];
};
pythonImportsCheck = [ "pyscaffold" ];
meta = with lib; {
description = "Template tool for putting up the scaffold of a Python project";
homepage = "https://pypi.org/project/PyScaffold/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

62
pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix Normal file
View File

@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, cookiecutter
, importlib-metadata
, pyscaffold
, configupdater
, pre-commit
, pytest
, pytest-cov
, pytest-xdist
, tox
, virtualenv
}:
buildPythonPackage rec {
pname = "pyscaffoldext-cookiecutter";
version = "0.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-H++p/kPASs3IWk39fCXzq20QmMPGkG0bDTnVAm773cU=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
cookiecutter
importlib-metadata
pyscaffold
];
passthru.optional-dependencies = {
testing = [
configupdater
pre-commit
pytest
pytest-cov
pytest-xdist
setuptools-scm
tox
virtualenv
];
};
pythonImportsCheck = [ "pyscaffoldext.cookiecutter" ];
meta = with lib; {
description = "Integration of Cookiecutter project templates into PyScaffold (see: https://github.com/cookiecutter/cookiecutter";
homepage = "https://pypi.org/project/pyscaffoldext-cookiecutter/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

63
pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix Normal file
View File

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, configupdater
, importlib-metadata
, packaging
, pyscaffold
, pre-commit
, pytest
, pytest-cov
, pytest-xdist
, tox
, virtualenv
}:
buildPythonPackage rec {
pname = "pyscaffoldext-custom-extension";
version = "0.6.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-xHtKNqLSCTlbbXubADfLYjD3/53WfM65rRuh9RsyeN4=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
configupdater
importlib-metadata
packaging
pyscaffold
];
passthru.optional-dependencies = {
testing = [
configupdater
pre-commit
pytest
pytest-cov
pytest-xdist
setuptools-scm
tox
virtualenv
];
};
pythonImportsCheck = [ "pyscaffoldext.custom_extension" ];
meta = with lib; {
description = "PyScaffold extension to create a custom PyScaffold extension";
homepage = "https://pypi.org/project/pyscaffoldext-custom-extension/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

60
pkgs/development/python-modules/pyscaffoldext-django/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, django
, pyscaffold
, configupdater
, pre-commit
, pytest
, pytest-cov
, pytest-xdist
, tox
, virtualenv
}:
buildPythonPackage rec {
pname = "pyscaffoldext-django";
version = "0.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-5yzF3VK/9VlCSrRsRJWX4arr9n34G2R6O5A51jTpLhg=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
django
pyscaffold
];
passthru.optional-dependencies = {
testing = [
configupdater
pre-commit
pytest
pytest-cov
pytest-xdist
setuptools-scm
tox
virtualenv
];
};
pythonImportsCheck = [ "pyscaffoldext.django" ];
meta = with lib; {
description = "Integration of django builtin scaffold cli (django-admin) into PyScaffold";
homepage = "https://pypi.org/project/pyscaffoldext-django/";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

62
pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix Normal file
View File

@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, importlib-metadata
, pyscaffold
, pyscaffoldext-markdown
, configupdater
, pre-commit
, pytest
, pytest-cov
, pytest-xdist
, tox
, virtualenv
}:
buildPythonPackage rec {
pname = "pyscaffoldext-dsproject";
version = "0.7.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-SF99noD6C31p4LWlwVAwArPYeNspF+ARK8Dzl5B1T9g=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
importlib-metadata
pyscaffold
pyscaffoldext-markdown
];
passthru.optional-dependencies = {
testing = [
configupdater
pre-commit
pytest
pytest-cov
pytest-xdist
setuptools-scm
tox
virtualenv
];
};
pythonImportsCheck = [ "pyscaffoldext.dsproject" ];
meta = with lib; {
description = "PyScaffold extension for Data Science projects";
homepage = "https://pypi.org/project/pyscaffoldext-dsproject/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

65
pkgs/development/python-modules/pyscaffoldext-markdown/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, importlib-metadata
, myst-parser
, pyscaffold
, configupdater
, pre-commit
, pytest
, pytest-cov
, pytest-xdist
, tox
, twine
, virtualenv
}:
buildPythonPackage rec {
pname = "pyscaffoldext-markdown";
version = "0.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-fycTscq9rjUNFidWyeoH4QwedthdCdqqjXDO9DC4tds=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
importlib-metadata
myst-parser
pyscaffold
wheel
];
passthru.optional-dependencies = {
testing = [
configupdater
pre-commit
pytest
pytest-cov
pytest-xdist
setuptools-scm
tox
twine
virtualenv
];
};
pythonImportsCheck = [ "pyscaffoldext.markdown" ];
meta = with lib; {
description = "PyScaffold extension which uses Markdown instead of reStructuredText";
homepage = "https://pypi.org/project/pyscaffoldext-markdown/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

60
pkgs/development/python-modules/pyscaffoldext-travis/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, setuptools-scm
, wheel
, importlib-metadata
, pyscaffold
, configupdater
, pre-commit
, pytest
, pytest-cov
, pytest-xdist
, tox
, virtualenv
}:
buildPythonPackage rec {
pname = "pyscaffoldext-travis";
version = "0.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-ztAhA/2ctCHz5kggOAaXd3ed903ClTlhCfaGTl344zI=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
importlib-metadata
pyscaffold
];
passthru.optional-dependencies = {
testing = [
configupdater
pre-commit
pytest
pytest-cov
pytest-xdist
setuptools-scm
tox
virtualenv
];
};
pythonImportsCheck = [ "pyscaffoldext.travis" ];
meta = with lib; {
description = "Travis CI configurations for PyScaffold";
homepage = "https://pypi.org/project/pyscaffoldext-travis/";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

6
pkgs/development/python-modules/pyvlx/default.nix
View File

@ -7,11 +7,12 @@
, pyyaml
, setuptools
, typing-extensions
, zeroconf
}:
buildPythonPackage rec {
pname = "pyvlx";
version = "0.2.21";
version = "0.2.22";
pyproject = true;
disabled = pythonOlder "3.10";
@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "Julius2342";
repo = "pyvlx";
rev = "refs/tags/${version}";
hash = "sha256-t6lbpP9IwNhXpoZ9+0n9vKCuZ+azWqP7w5v0BfqbMcs=";
hash = "sha256-Ne/mEgvD2ANb5ER0y3eSW4TsPmrqDX1Pvki+0cb+t7w=";
};
nativeBuildInputs = [
@ -30,6 +31,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pyyaml
typing-extensions
zeroconf
];
nativeCheckInputs = [

4
pkgs/development/python-modules/reolink-aio/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.8.7";
version = "0.8.8";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-+Yhw7Wbt0K7BLXatd/UANnnNWPkxgk8SqAyV9Kk4hos=";
hash = "sha256-W6F8Wr7iUMpyEFGLk07argmk+Wimagq5cOWU9yy9qU0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/scikit-misc/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "scikit-misc";
version = "0.3.0";
version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "has2k1";
repo = "scikit-misc";
rev = "refs/tags/v${version}";
hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s=";
hash = "sha256-2L30hvKbFqIGlSEbzc1HvHybBqDGldJfZoUpqJJOv2Q=";
};
postPatch = ''

19
pkgs/development/python-modules/timm/default.nix
View File

@ -1,21 +1,22 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, expecttest
, pytest-timeout
, fetchFromGitHub
, pdm-backend
, huggingface-hub
, pyyaml
, safetensors
, torch
, torchvision
, expecttest
, pytestCheckHook
, pytest-timeout
}:
buildPythonPackage rec {
pname = "timm";
version = "0.9.12";
format = "setuptools";
version = "0.9.16";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,9 +24,13 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "pytorch-image-models";
rev = "refs/tags/v${version}";
hash = "sha256-dDd/Sjy4xmJlaAg+fOxxcuX3FX//uJJkW0q3AaeCfns=";
hash = "sha256-IWEDKuI2565Z07q1MxTpzKS+CROPR6SyaD5fKcQ5eXk=";
};
nativeBuildInputs = [
pdm-backend
];
propagatedBuildInputs = [
huggingface-hub
pyyaml

45
pkgs/development/python-modules/tls-client/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, typing-extensions
, pythonOlder
}:
buildPythonPackage rec {
pname = "tls-client";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "FlorianREGAZ";
repo = "Python-Tls-Client";
rev = "refs/tags/${version}";
hash = "sha256-0eH9fA/oQzrgXcQilUdg4AaTqezj1Q9hP9olhZEDeBc=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
typing-extensions
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"tls_client"
];
meta = with lib; {
description = "Advanced HTTP Library";
homepage = "https://github.com/FlorianREGAZ/Python-Tls-Client";
changelog = "https://github.com/FlorianREGAZ/Python-Tls-Client/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

46
pkgs/development/python-modules/torch-audiomentations/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, julius
, librosa
, torch
, torchaudio
, torch-pitch-shift
}:
buildPythonPackage rec {
pname = "torch-audiomentations";
version = "0.11.0";
pyproject = true;
src = fetchFromGitHub {
owner = "asteroid-team";
repo = "torch-audiomentations";
rev = "v${version}";
hash = "sha256-r3J8yo3+jjuD4qqpC5Ax3TFPL9pGUNc0EksTkCTJKbU=";
};
propagatedBuildInputs = [
julius
librosa
torch
torchaudio
torch-pitch-shift
];
nativeBuildInputs = [
setuptools
wheel
];
pythonImportsCheck = [ "torch_audiomentations" ];
meta = with lib; {
description = "Fast audio data augmentation in PyTorch. Inspired by audiomentations. Useful for deep learning";
homepage = "https://github.com/asteroid-team/torch-audiomentations";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

44
pkgs/development/python-modules/torch-pitch-shift/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, wheel
, packaging
, primepy
, torch
, torchaudio
}:
buildPythonPackage rec {
pname = "torch-pitch-shift";
version = "1.2.4";
pyproject = true;
src = fetchFromGitHub {
owner = "KentoNishi";
repo = "torch-pitch-shift";
rev = "v${version}";
hash = "sha256-s3z+6jOGC7RfF9TzVZ9HFbIFz2BsBm6Yhx7lgaEKv6o=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
packaging
primepy
torch
torchaudio
];
pythonImportsCheck = [ "torch_pitch_shift" ];
meta = with lib; {
description = "Pitch-shift audio clips quickly with PyTorch (CUDA supported)! Additional utilities for searching efficient transformations are included";
homepage = "https://github.com/KentoNishi/torch-pitch-shift";
license = licenses.mit;
maintainers = with maintainers; [ matthewcroughan ];
};
}

4
pkgs/development/python-modules/types-psycopg2/default.nix
View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-psycopg2";
version = "2.9.21.20240201";
version = "2.9.21.20240218";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-daknNfYro2OXQJrkdY8CQcvEqbsw8fldO0pmD+p+dxE=";
hash = "sha256-MITNgHA4piyA+1vni0HYVbSKBgMWEB6ln9hcMC77V9Q=";
};
nativeBuildInputs = [

31
pkgs/development/python-modules/wheel-inspect/default.nix
View File

@ -3,8 +3,10 @@
, buildPythonPackage
, entry-points-txt
, fetchFromGitHub
, hatchling
, headerparser
, jsonschema
, pythonRelaxDepsHook
, packaging
, pytestCheckHook
, pythonOlder
@ -15,17 +17,32 @@
buildPythonPackage rec {
pname = "wheel-inspect";
version = "1.7.1";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jwodder";
repo = pname;
rev = "v${version}";
repo = "wheel-inspect";
rev = "refs/tags/v${version}";
hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0=";
};
postPatch = ''
substituteInPlace tox.ini \
--replace-fail "--cov=wheel_inspect --no-cov-on-fail" ""
'';
pythonRelaxDeps = [
"entry-points-txt"
"headerparser"
];
nativeBuildInputs = [
hatchling
pythonRelaxDepsHook
];
propagatedBuildInputs = [
attrs
entry-points-txt
@ -40,13 +57,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace tox.ini \
--replace " --cov=wheel_inspect --no-cov-on-fail" ""
substituteInPlace setup.cfg \
--replace "entry-points-txt ~= 0.1.0" "entry-points-txt >= 0.1.0"
'';
pythonImportsCheck = [
"wheel_inspect"
];
@ -59,6 +69,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Extract information from wheels";
homepage = "https://github.com/jwodder/wheel-inspect";
changelog = "https://github.com/wheelodex/wheel-inspect/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ayazhafiz ];
};

6
pkgs/development/tools/api-linter/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "api-linter";
version = "1.63.4";
version = "1.63.5";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
rev = "v${version}";
hash = "sha256-u/UgcNkVOfFb/m9Fmrc6kwwiyENvSf9f6rmT5WxMEKA=";
hash = "sha256-jslSa3TlSb6nDl79ZcXHBkxs71OndVh3QZjVruv4puc=";
};
vendorHash = "sha256-MCgntQXZfQ6MgLs1i/5u+ZjCV+bY70JQj5onB9p45+4=";
vendorHash = "sha256-1p7fcg6ZMHxwrk6+KwGhy3jdXX3FpgufbYIv1BIGNKk=";
subPackages = [ "cmd/api-linter" ];

6
pkgs/development/tools/jql/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
version = "7.1.4";
version = "7.1.5";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "jql-v${version}";
hash = "sha256-luVlLSZbPWUtNipKdsSE3shS2fVG/lIEyuoBQ3isfTQ=";
hash = "sha256-bNFCfT758ZvIe5AiKsa8/rvyz4s1NUfIfwNM2x6LzRE=";
};
cargoHash = "sha256-+LXEBhK9NNrWB09mpvPYi+egbytUlLwSaZsy/VTrtYY=";
cargoHash = "sha256-Y2Mjj83I/FHf4njI4AfXxoEhzI5mcItfjwxDLIrnES0=";
meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust";

4
pkgs/development/tools/misc/opengrok/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "opengrok";
version = "1.13.3";
version = "1.13.4";
# binary distribution
src = fetchurl {
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
hash = "sha256-/5u4QZZ+/8BCQpUaoyQWw2vy/UAYFpr4W4/tspn/wz8=";
hash = "sha256-NtBNsCWcnRqJlhIy8VQX54Jzj1KegZOjKS5z2QG3NOI=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/rust/cargo-mobile2/default.nix
View File

@ -12,7 +12,7 @@
let
inherit (darwin.apple_sdk.frameworks) CoreServices;
pname = "cargo-mobile2";
version = "0.9.1";
version = "0.10.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
owner = "tauri-apps";
repo = pname;
rev = "cargo-mobile2-v${version}";
hash = "sha256-gyTA85eLVvDQKWo7D2zO6zFC8910AyNasXGjR1qkI6c=";
hash = "sha256-5Z2ztRe4SBiqR2hQELVXBLtvTLspTbBMIMZab8gQMzo=";
};
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
# sourceRoot = "${src.name}/tooling/cli";
cargoHash = "sha256-Zcs+Sm2+xd7OSPXv+QDd7Jh8YvlmVrhWotjVNMqyE60=";
cargoHash = "sha256-mOdtIJfnn8neOQIiiYNITlKrG2Qst0Jl4rTI3fo/JdU=";
preBuild = ''
mkdir -p $out/share/

6
pkgs/development/tools/rust/cargo-tally/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.36";
version = "1.0.38";
src = fetchCrate {
inherit pname version;
hash = "sha256-WvOzlz/ACM+TBc5HOiQe4ELhqhAIc8pobRN/9hxmPNI=";
hash = "sha256-OPl0/HhVMFp4EDEjBDjqVF5LGbz1T+0j/OiF8emHLxc=";
};
cargoHash = "sha256-uud6cr77XAxzGhN5wWtUh9jD9JWsyCMufx+b2fyIm0Q=";
cargoHash = "sha256-Agdzm2uNJH59S+ok0AG3sYTs6tSEDoBgYEBXvgkNj0U=";
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
DiskArbitration

4
pkgs/games/starsector/default.nix
View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "starsector";
version = "0.97a-RC10";
version = "0.97a-RC11";
src = fetchzip {
url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip";
sha256 = "sha256-GTzFY7iUB0xtUk9di8LKAgZwCOjqvv2j5QFSUKAfNDU=";
sha256 = "sha256-KT4n0kBocaljD6dTbpr6xcwy6rBBZTFjov9m+jizDW4=";
};
nativeBuildInputs = [ copyDesktopItems makeWrapper ];

8
pkgs/os-specific/linux/firmware/linux-firmware/source.nix
View File

@ -1,7 +1,7 @@
# This file is autogenerated! Run ./update.sh to regenerate.
{
version = "20240115";
revision = "20240115";
sourceHash = "sha256-aiEYBqjUs48GaDKQ/0DRLm9cmfoWiaUKVGhdtfVlgjk=";
outputHash = "sha256-iOQGK1vE05Wcx17hbFJVEW8PcmkHGPcCmO5xZaVQRog=";
version = "20240220";
revision = "20240220";
sourceHash = "sha256-IU2ak8L9kiVt/2hExSfhHJMqtD9QlYEuzW2qz3pP8aU=";
outputHash = "sha256-C5vt+tAQxVIMMht/QNQRMjD/9HQuLtL9bMvAwrLKXuo=";
}

4
pkgs/servers/bazarr/default.nix
View File

@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
pname = "bazarr";
version = "1.4.1";
version = "1.4.2";
sourceRoot = ".";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
sha256 = "sha256-qkOvodOHeV+jo/+c6RiVEmjorXF+PIJ4C+S9/hDBW98=";
sha256 = "sha256-1OqbCyQmA33ZvyCE11ZSyVwEgyym0Y0EX6qx3g71lnQ=";
};
nativeBuildInputs = [ unzip makeWrapper ];

70
pkgs/servers/geospatial/geoserver/default.nix
View File

@ -1,14 +1,13 @@
{ lib
, callPackage
, fetchurl
, makeWrapper
, nixosTests
, stdenv
, jre
, unzip
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: rec {
pname = "geoserver";
version = "2.24.2";
@ -25,24 +24,55 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
nativeBuildInputs = [ unzip makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/geoserver
cp -r . $out/share/geoserver
rm -fr $out/share/geoserver/bin/*.bat
installPhase =
let
inputs = finalAttrs.buildInputs or [ ];
ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in
''
runHook preInstall
mkdir -p $out/share/geoserver
cp -r . $out/share/geoserver
rm -fr $out/share/geoserver/bin/*.bat
makeWrapper $out/share/geoserver/bin/startup.sh $out/bin/geoserver-startup \
--set JAVA_HOME "${jre}" \
--set GEOSERVER_HOME "$out/share/geoserver"
makeWrapper $out/share/geoserver/bin/shutdown.sh $out/bin/geoserver-shutdown \
--set JAVA_HOME "${jre}" \
--set GEOSERVER_HOME "$out/share/geoserver"
runHook postInstall
'';
makeWrapper $out/share/geoserver/bin/startup.sh $out/bin/geoserver-startup \
--prefix PATH : "${lib.makeBinPath inputs}" \
--prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath inputs}" \
--set JAVA_HOME "${jre}" \
--set GEOSERVER_HOME "$out/share/geoserver"
makeWrapper $out/share/geoserver/bin/shutdown.sh $out/bin/geoserver-shutdown \
--prefix PATH : "${lib.makeBinPath inputs}" \
--prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath inputs}" \
--set JAVA_HOME "${jre}" \
--set GEOSERVER_HOME "$out/share/geoserver"
runHook postInstall
'';
passthru = {
tests.geoserver = nixosTests.geoserver;
};
passthru =
let
geoserver = finalAttrs.finalPackage;
extensions = lib.attrsets.filterAttrs (n: v: lib.isDerivation v) (callPackage ./extensions.nix { });
in
{
withExtensions = selector:
let
selectedExtensions = selector extensions;
in
geoserver.overrideAttrs (finalAttrs: previousAttrs: {
pname = previousAttrs.pname + "-with-extensions";
buildInputs = lib.lists.unique ((previousAttrs.buildInputs or [ ]) ++ lib.lists.concatMap (drv: drv.buildInputs) selectedExtensions);
postInstall = (previousAttrs.postInstall or "") + ''
for extension in ${builtins.toString selectedExtensions} ; do
cp -r $extension/* $out
# Some files are the same for all/several extensions. We allow overwriting them again.
chmod -R +w $out
done
'';
});
tests.geoserver = nixosTests.geoserver;
passthru.updateScript = ./update.sh;
};
meta = with lib; {
description = "Open source server for sharing geospatial data";
@ -52,4 +82,4 @@ stdenv.mkDerivation rec {
maintainers = teams.geospatial.members;
platforms = platforms.all;
};
}
})

353
pkgs/servers/geospatial/geoserver/extensions.nix Normal file
View File

@ -0,0 +1,353 @@
# DO *NOT* MODIFY THE LINES CONTAINING "hash = ..." OR "version = ...".
# THEY ARE GENERATED. SEE ./update.sh.
{ fetchzip, libjpeg, netcdf, pkgs, stdenv }:
let
mkGeoserverExtension = { name, version, hash, buildInputs ? [ ] }: stdenv.mkDerivation {
pname = "geoserver-${name}-extension";
inherit buildInputs version;
src = fetchzip {
url = "mirror://sourceforge/geoserver/GeoServer/${version}/extensions/geoserver-${version}-${name}-plugin.zip";
inherit hash;
# We expect several files.
stripRoot = false;
};
installPhase = ''
runHook preInstall
DIR=$out/share/geoserver/webapps/geoserver/WEB-INF/lib
mkdir -p $DIR
cp -r $src/* $DIR
runHook postInstall
'';
};
in
{
app-schema = mkGeoserverExtension {
name = "app-schema";
version = "2.24.2"; # app-schema
hash = "sha256-nwZ+gZZ38nrKmIqe2Wjg8rkh9cq6TFaxjkwS/lw8720="; # app-schema
};
authkey = mkGeoserverExtension {
name = "authkey";
version = "2.24.2"; # authkey
hash = "sha256-R2dL1xAw7PZTAp7asoulfOPWodRD7TnOu8mnSrwxL8I="; # authkey
};
cas = mkGeoserverExtension {
name = "cas";
version = "2.24.2"; # cas
hash = "sha256-oTM+ipYuIefxVFUG7ifNE08GkYbuHkt83PtrOHRw40w="; # cas
};
charts = mkGeoserverExtension {
name = "charts";
version = "2.24.2"; # charts
hash = "sha256-w9e8Ra0iuhtQ45De1T3wztis6ZLey5LuhpmCadbpCp4="; # charts
};
control-flow = mkGeoserverExtension {
name = "control-flow";
version = "2.24.2"; # control-flow
hash = "sha256-XY9YwiMgEay/GhLt6IJQ0gdiVxA0abg/qrnYNW3wiO8="; # control-flow
};
css = mkGeoserverExtension {
name = "css";
version = "2.24.2"; # css
hash = "sha256-GDoRcM8Nx3fZuWgzIHM1vSXLMaCJO3j7/cDmRl7BS2U="; # css
};
csw = mkGeoserverExtension {
name = "csw";
version = "2.24.2"; # csw
hash = "sha256-Ir/ebw87DV1zSLJIN3sMEwMAqfD9rZ3oKvAM62BNWcE="; # csw
};
csw-iso = mkGeoserverExtension {
name = "csw-iso";
version = "2.24.2"; # csw-iso
hash = "sha256-j0rVy5JRwGTs+8esOpMPc79ICccwwtD47vOFsunZAkE="; # csw-iso
};
db2 = mkGeoserverExtension {
name = "db2";
version = "2.24.2"; # db2
hash = "sha256-LKOAdKU+0TJdaxUbluXcxzgJw2fvhkqVjYs+d2c84uk="; # db2
};
# Needs wps extension.
dxf = mkGeoserverExtension {
name = "dxf";
version = "2.24.2"; # dxf
hash = "sha256-Et4nCPH6xUChfKRZ35u3/VduEQwCOKeKQXVZZcgJRWc="; # dxf
};
excel = mkGeoserverExtension {
name = "excel";
version = "2.24.2"; # excel
hash = "sha256-Nm4mayt8ofwpiRD5FDbsubrHIzfaOBW+Nv8wUVaIPws="; # excel
};
feature-pregeneralized = mkGeoserverExtension {
name = "feature-pregeneralized";
version = "2.24.2"; # feature-pregeneralized
hash = "sha256-56HA4L1Vfh5Q45lRhjsYfq816YYNkJLmovngF0+3Vbk="; # feature-pregeneralized
};
# Note: The extension name ("gdal") clashes with pkgs.gdal.
gdal = mkGeoserverExtension {
name = "gdal";
version = "2.24.2"; # gdal
buildInputs = [ pkgs.gdal ];
hash = "sha256-KLIlEUmYUIXAikW+y3iQzGZPpW0N+9FuPTst23Nf9Y4="; # gdal
};
# Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
#geofence = mkGeoserverExtension {
# name = "geofence";
# version = "2.24.2"; # geofence
# hash = "sha256-5MRUKiC23/XlFr7X4zpsAoDR4JGtZujFnUmtcRlG+9w="; # geofence
#};
#geofence-server = mkGeoserverExtension {
# name = "geofence-server";
# version = "2.24.2"; # geofence-server
# hash = "sha256-MyDQSb7IZ8cTpO9+rV0PdZNHRvIDIr04+HNhyMpx81I="; # geofence-server
#};
#geofence-wps = mkGeoserverExtension {
# name = "geofence-wps";
# version = "2.24.2"; # geofence-wps
# hash = "sha256-uLii8U3UAiF/MQjABBAfHbnXTlf+iYsEOy4kadqc6+k="; # geofence-wps
#};
geopkg-output = mkGeoserverExtension {
name = "geopkg-output";
version = "2.24.2"; # geopkg-output
hash = "sha256-NzsozGYoGOoekX+wY0d5d8I0JefHgSDb/HuEPzwX+YE="; # geopkg-output
};
grib = mkGeoserverExtension {
name = "grib";
version = "2.24.2"; # grib
hash = "sha256-9i+aqQM4GnRXfIjg2R2/NkkQAF9YxNRfbMp7mGO4BgE="; # grib
buildInputs = [ netcdf ];
};
gwc-s3 = mkGeoserverExtension {
name = "gwc-s3";
version = "2.24.2"; # gwc-s3
hash = "sha256-fesKzbSnNHxgjwuXghLBJhUkvM2HeCOZY9V0AAiZVWk="; # gwc-s3
};
h2 = mkGeoserverExtension {
name = "h2";
version = "2.24.2"; # h2
hash = "sha256-cMPdNh7Bp7aiAAiuB5E8dDWCuUkd89xQXJbvoYN5Oyk="; # h2
};
iau = mkGeoserverExtension {
name = "iau";
version = "2.24.2"; # iau
hash = "sha256-yIqw1ur2e3haPMXGOFgFdNLguzhMMytcg9aweaBFq5U="; # iau
};
importer = mkGeoserverExtension {
name = "importer";
version = "2.24.2"; # importer
hash = "sha256-/u5m4ljr7kEnRl9sOuYcS8913uPzJjDCXmRiWh7YS2c="; # importer
};
inspire = mkGeoserverExtension {
name = "inspire";
version = "2.24.2"; # inspire
hash = "sha256-3N1LUEu2q3Vy2verkJd9Fiem8V9W0KvsnSTwooO0M6E="; # inspire
};
# Needs Kakadu plugin from
# https://github.com/geosolutions-it/imageio-ext
#jp2k = mkGeoserverExtension {
# name = "jp2k";
# version = "2.24.2"; # jp2k
# hash = "sha256-ZjPDCMzaXegrzmbI9vwjTt0Osbjjl/31sffU65PPJ3k="; # jp2k
#};
libjpeg-turbo = mkGeoserverExtension {
name = "libjpeg-turbo";
version = "2.24.2"; # libjpeg-turbo
hash = "sha256-aPKXE8STYG0h5OtxrOoTvXagUCBmb7nmEV8ckLRq6GM="; # libjpeg-turbo
buildInputs = [ libjpeg.out ];
};
mapml = mkGeoserverExtension {
name = "mapml";
version = "2.24.2"; # mapml
hash = "sha256-vjNoLZEM2CMmxL2JPO0r9PColReWmFdVjMkDxbyrSGg="; # mapml
};
mbstyle = mkGeoserverExtension {
name = "mbstyle";
version = "2.24.2"; # mbstyle
hash = "sha256-zvfoAoVT8hXUETn/GkceP8vLSA8iNUXivXjQUyIJDEs="; # mbstyle
};
metadata = mkGeoserverExtension {
name = "metadata";
version = "2.24.2"; # metadata
hash = "sha256-A6Gai/ExL9FSUQOuUwxqpRcaVtn4H1VwBaAKXMNm6Fg="; # metadata
};
mongodb = mkGeoserverExtension {
name = "mongodb";
version = "2.24.2"; # mongodb
hash = "sha256-R9dp/uOIX7KBp4c2676NXQupqoRahxKkufjCr6sQaA0="; # mongodb
};
monitor = mkGeoserverExtension {
name = "monitor";
version = "2.24.2"; # monitor
hash = "sha256-IB9/4755ePtL/CWIOd28dOyBG6cmddQnhZKVQMQFeIE="; # monitor
};
mysql = mkGeoserverExtension {
name = "mysql";
version = "2.24.2"; # mysql
hash = "sha256-8y3N7+KgA9R5JIw1YuHmTmzK6H2c56469KUTrRpqP4g="; # mysql
};
netcdf = mkGeoserverExtension {
name = "netcdf";
version = "2.24.2"; # netcdf
hash = "sha256-uAhJTCKn/00zDUGtgyYd1v8KxXj1N+vAAosBjQG3rBk="; # netcdf
buildInputs = [ netcdf ];
};
netcdf-out = mkGeoserverExtension {
name = "netcdf-out";
version = "2.24.2"; # netcdf-out
hash = "sha256-wMFx+BnEcLy1x9j0K+du7hG9wC+EzA4E4AVjIsyXO3A="; # netcdf-out
buildInputs = [ netcdf ];
};
ogr-wfs = mkGeoserverExtension {
name = "ogr-wfs";
version = "2.24.2"; # ogr-wfs
buildInputs = [ pkgs.gdal ];
hash = "sha256-jMnc0OnrKHFegEIPtyAG92fC8cLa/X1UUdTmeDyUxSI="; # ogr-wfs
};
# Needs ogr-wfs extension.
ogr-wps = mkGeoserverExtension {
name = "ogr-wps";
version = "2.24.2"; # ogr-wps
# buildInputs = [ pkgs.gdal ];
hash = "sha256-O0MKOCEV5AjYUg4LL0UAV0KBHg1alOK7WEdEyikqpTs="; # ogr-wps
};
oracle = mkGeoserverExtension {
name = "oracle";
version = "2.24.2"; # oracle
hash = "sha256-OIvwpGt/9jtKAeP7LK/hTZDVbKQnjVGTXDy5q/zVU2k="; # oracle
};
params-extractor = mkGeoserverExtension {
name = "params-extractor";
version = "2.24.2"; # params-extractor
hash = "sha256-z6hMGCHB0I3DS05NvdSmVMfPKNA/1jhx8Mmb6odL6RU="; # params-extractor
};
printing = mkGeoserverExtension {
name = "printing";
version = "2.24.2"; # printing
hash = "sha256-nDkT9x6Va5SNSf8x7OEu7NqQ6qFSJhPavg6eUo5D4HA="; # printing
};
pyramid = mkGeoserverExtension {
name = "pyramid";
version = "2.24.2"; # pyramid
hash = "sha256-HM2ItB34+CHNzhoH3X3Kh1iVNMb+AimvdHrgHHh5SJc="; # pyramid
};
querylayer = mkGeoserverExtension {
name = "querylayer";
version = "2.24.2"; # querylayer
hash = "sha256-7WtAsisMJBpRZqU0nfr4orp36uBmnvat2+DlbnGCjVg="; # querylayer
};
sldservice = mkGeoserverExtension {
name = "sldservice";
version = "2.24.2"; # sldservice
hash = "sha256-m3QJP/u6HZmO0p8d++8EKXXxtkbMDmBFFCzBPctPV5A="; # sldservice
};
sqlserver = mkGeoserverExtension {
name = "sqlserver";
version = "2.24.2"; # sqlserver
hash = "sha256-ZwsO1Yxb3OWCLtYI30l3jnMrAbPI7v0XTGcasJPN1Y8="; # sqlserver
};
vectortiles = mkGeoserverExtension {
name = "vectortiles";
version = "2.24.2"; # vectortiles
hash = "sha256-fQ9qSIHplxt57n45w4MN4e5AFdU8nmtvQ/vTeL/cdzQ="; # vectortiles
};
wcs2_0-eo = mkGeoserverExtension {
name = "wcs2_0-eo";
version = "2.24.2"; # wcs2_0-eo
hash = "sha256-q0cXVjOBmX4vYwzf+3LjsYf9rPAIeCxnOZZadfNlLF0="; # wcs2_0-eo
};
web-resource = mkGeoserverExtension {
name = "web-resource";
version = "2.24.2"; # web-resource
hash = "sha256-v/SnNV6JnWPoYUSFowXFDDuhjZC8b1iPtDeMG8mWqG4="; # web-resource
};
wmts-multi-dimensional = mkGeoserverExtension {
name = "wmts-multi-dimensional";
version = "2.24.2"; # wmts-multi-dimensional
hash = "sha256-ASSGBqTpq9Tk1R3oBTBoi6L1tsXIJpJyez3LXBPmjd8="; # wmts-multi-dimensional
};
wps = mkGeoserverExtension {
name = "wps";
version = "2.24.2"; # wps
hash = "sha256-KJa0yWqO/qyY59U9NMK5/V4EskIqEbe9XnSvGRvODHU="; # wps
};
# Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
# available in nixpgs as of 2024/01.
#wps-cluster-hazelcast = mkGeoserverExtension {
# name = "wps-cluster-hazelcast";
# version = "2.24.2"; # wps-cluster-hazelcast
# hash = "sha256-PQcX3AVJy3DluAL4b5vcWvLl0fYLBq+F8cKsvJ/WOyE="; # wps-cluster-hazelcast
#};
wps-download = mkGeoserverExtension {
name = "wps-download";
version = "2.24.2"; # wps-download
hash = "sha256-cjVbQ1R2uit/29axZsu88ZiMuwY7mmR5x8XNb9qX8aM="; # wps-download
};
# Needs Postrgres configuration or similar.
# See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
wps-jdbc = mkGeoserverExtension {
name = "wps-jdbc";
version = "2.24.2"; # wps-jdbc
hash = "sha256-dJUnh8HZmlu5aqVeFxyR3A8fbXYqbgIqPxIENq4rhfs="; # wps-jdbc
};
ysld = mkGeoserverExtension {
name = "ysld";
version = "2.24.2"; # ysld
hash = "sha256-GLUioofwqoGUw7JQeEhzBG1SRwGUzwqjKvhkOt4TUVw="; # ysld
};
}

41
pkgs/servers/geospatial/geoserver/update.sh Executable file
View File

@ -0,0 +1,41 @@
#!/usr/bin/env nix-shell
#!nix-shell -I ./. -i bash -p common-updater-scripts jq
set -eEuo pipefail
test ${DEBUG:-0} -eq 1 && set -x
# Current version.
LATEST_NIXPKGS_VERSION=$(nix eval --raw .#geoserver.version 2>/dev/null)
UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION}
# Maybe future version.
LATEST_GITHUB_VERSION=$(curl -s "https://api.github.com/repos/geoserver/geoserver/releases/latest" | jq -r '.tag_name')
UPDATE_NIX_NEW_VERSION=${UPDATE_NIX_NEW_VERSION:-$LATEST_GITHUB_VERSION}
SMALLEST_VERSION=$(printf "$UPDATE_NIX_OLD_VERSION\n$UPDATE_NIX_NEW_VERSION" | sort --version-sort | head -n 1)
if [[ "$SMALLEST_VERSION" == "$UPDATE_NIX_NEW_VERSION" ]]; then
echo "geoserver is up-to-date: $SMALLEST_VERSION"
exit 0
fi
echo "Updating geoserver..."
update-source-version geoserver "$UPDATE_NIX_NEW_VERSION"
cd "$(dirname "$(readlink -f "$0")")"
EXT_NAMES=($(grep -o -E "hash = .*?; # .*$" ./extensions.nix | sed 's/.* # //' | sort))
if [[ $# -gt 0 ]] ; then
EXT_NAMES=(${@:1})
fi
for EXT_NAME in "${EXT_NAMES[@]}" ; do
echo "Updating extension $EXT_NAME..."
URL="mirror://sourceforge/geoserver/GeoServer/${UPDATE_NIX_NEW_VERSION}/extensions/geoserver-${UPDATE_NIX_NEW_VERSION}-${EXT_NAME}-plugin.zip"
HASH=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --unpack "$URL"))
sed -i "s@version = \".*\"; # $EXT_NAME@version = \"$UPDATE_NIX_NEW_VERSION\"; # $EXT_NAME@" ./extensions.nix
sed -i "s@hash = \".*\"; # $EXT_NAME@hash = \"$HASH\"; # $EXT_NAME@" ./extensions.nix
done
cd -

4
pkgs/servers/http/lighttpd/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "lighttpd";
version = "1.4.73";
version = "1.4.74";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
sha256 = "sha256-gYgW0LMUsKqHKKcHZRNDX21esifzthMjRo4fENvoTKg=";
sha256 = "sha256-XAhzboMIj34Bl5cVnzBuiOxymr6XbcmPs77XG50+U7U=";
};
postPatch = ''

4
pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }:
stdenv.mkDerivation rec {
pname = "dovecot-fts-xapian";
version = "1.6.2";
version = "1.6.5";
src = fetchFromGitHub {
owner = "grosjo";
repo = "fts-xapian";
rev = version;
sha256 = "sha256-xXHsbvWA0IWAMBMQgVsyKc1qfiqMH+Xm09fvK87R3hE=";
sha256 = "sha256-jkQM5J3Yqjo2j4kXhw/woV0kID2bghCmpFMuxbdMHuk=";
};
buildInputs = [ dovecot xapian icu64 sqlite ];

8
pkgs/servers/pleroma/default.nix
View File

@ -7,14 +7,14 @@
beamPackages.mixRelease rec {
pname = "pleroma";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "v${version}";
sha256 = "sha256-VIGlJ5+99l+VSUl7c9jiQf94X/JV0+HFgI8xQ4ZLQ9s=";
sha256 = "sha256-KVB6e/B6DJbylpfR8QTZJ1GOJrAqF6shqoU/zIndi1U=";
};
patches = [
@ -47,8 +47,8 @@ beamPackages.mixRelease rec {
group = "pleroma";
owner = "elixir-libraries";
repo = "elixir-captcha";
rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab";
sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";
rev = "90f6ce7672f70f56708792a98d98bd05176c9176";
hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po=";
};
beamDeps = with final; [ ];

4
pkgs/servers/search/weaviate/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "weaviate";
version = "1.23.9";
version = "1.23.10";
src = fetchFromGitHub {
owner = "weaviate";
repo = "weaviate";
rev = "v${version}";
hash = "sha256-cl8jTMrX/N/MNxmFtF818veZEFuBQ1APXzqs8WC/Bt4=";
hash = "sha256-aPXPQO47HeYXqzD+wS+EAhvDy7D9g5Kh6YXB89M1d0c=";
};
vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og=";

4
pkgs/tools/admin/exoscale-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.76.0";
version = "1.76.1";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-mE1ELXMTQc5JU3d6JLuH4rm1+gfSQH4V29yJ9IkYOXU=";
sha256 = "sha256-HVMsN5qkC+eWb5usdSLgE/dgFtALCaadnKV5zeiKLJI=";
};
vendorHash = null;

6
pkgs/tools/admin/scaleway-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.26.0";
version = "2.27.0";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-RfXNwuynlELT7gVWjlhjaX5nKuBJM+v6eAD/JCuRyck=";
sha256 = "sha256-brcsscNRftlpx73Q6lnbwvFiKoY6csERUUnAsiXwhF0=";
};
vendorHash = "sha256-hBfEQtuBkU2fKoCd78dpp+I19lTOycItqjlcA6KByLY=";
vendorHash = "sha256-GDV7BDZb0oHQUbA/Ojx6kzh9kBh0C5RbjYDDzX16LmQ=";
ldflags = [
"-w"

4
pkgs/tools/misc/gh-dash/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gh-dash";
version = "3.13.1";
version = "3.14.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
hash = "sha256-zITrwGklEcC3QsPGfx+ymVu1QBg96Q9aJIXR2x2e2LQ=";
hash = "sha256-6YPUGOQ2KBfu+3XAgub9Cpz0QBrU2kV+gq13tUtzY+w=";
};
vendorHash = "sha256-jCf9FWAhZK5hTzyy8N4r5dfUYTgESmsn8iKxCccgWiM=";

4
pkgs/tools/misc/nb/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nb";
version = "7.11.0";
version = "7.12.1";
src = fetchFromGitHub {
owner = "xwmx";
repo = "nb";
rev = version;
sha256 = "sha256-A7RC8Zsj746lVm9uqD1W+9gRA/zC+p12WsVVudGBxa8=";
sha256 = "sha256-vy2WrFh4ukc6f0YFVaHvw0k1Wm9mdhh9p2MKLc/566U=";
};
nativeBuildInputs = [ installShellFiles ];

6
pkgs/tools/misc/tmux/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, bison
, libevent
@ -37,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64=";
};
patches = [(fetchpatch {
url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff";
hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs=";
})];
nativeBuildInputs = [
pkg-config
autoreconfHook

52
pkgs/tools/networking/namespaced-openvpn/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib,
fetchFromGitHub,
buildPythonPackage,
openvpn,
iproute2,
iptables,
util-linux
}:
buildPythonPackage rec {
pname = "namespaced-openvpn";
version = "0.6.0";
format = "other";
src = fetchFromGitHub {
owner = "slingamn";
repo = pname;
rev = "a3fa42b2d8645272cbeb6856e26a7ea9547cb7d1";
sha256 = "+Fdaw9EGyFGH9/DSeVJczS8gPzAOv+qn+1U20zQBBqQ=";
};
buildInputs = [ openvpn iproute2 util-linux ];
postPatch = ''
substituteInPlace namespaced-openvpn \
--replace-fail "/usr/sbin/openvpn" "${openvpn}/bin/openvpn" \
--replace-fail "/sbin/ip" "${iproute2}/bin/ip" \
--replace-fail "/usr/bin/nsenter" "${util-linux}/bin/nsenter" \
--replace-fail "/bin/mount" "${util-linux}/bin/mount" \
--replace-fail "/bin/umount" "${util-linux}/bin/umount"
substituteInPlace seal-unseal-gateway \
--replace-fail "/sbin/iptables" "${iptables}/bin/iptables"
'';
dontBuild = true;
doCheck = false;
installPhase = ''
mkdir -p $out/bin
cp namespaced-openvpn seal-unseal-gateway $out/bin
'';
meta = with lib; {
homepage = "https://github.com/slingamn/namespaced-openvpn";
description = "Network namespace isolation for OpenVPN tunnels.";
license = licenses.mit;
maintainers = [ maintainers.lodi ];
platforms = platforms.linux;
mainProgram = "namespaced-openvpn";
};
}

4
pkgs/tools/networking/octodns/providers/gandi/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "octodns-gandi";
version = "0.0.2";
version = "0.0.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "octodns";
repo = "octodns-gandi";
rev = "refs/tags/v${version}";
hash = "sha256-aZUVdCeIbyXBgy8HNf6bZSmjdRzIvQkCEzndKGyuTkw=";
hash = "sha256-L7kDkqTVmU8OqjMS3GkML1xBxEuwb9iyYi/YZBB4NSU=";
};
nativeBuildInputs = [

4
pkgs/tools/networking/swagger-codegen3/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }:
stdenv.mkDerivation rec {
version = "3.0.53";
version = "3.0.54";
pname = "swagger-codegen";
jarfilename = "${pname}-cli-${version}.jar";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
sha256 = "sha256-o6z4yL0PadbVRx2YGEyPHAVpF82vandxPfQeKcQaLok=";
sha256 = "sha256-OOv+7r43mxUZjTs3tGHax3Yu7CNM8bg6XkOt5pJADy0=";
};
dontUnpack = true;

6
pkgs/tools/networking/trurl/default.nix
View File

@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "trurl";
version = "0.9";
version = "0.10";
src = fetchFromGitHub {
owner = "curl";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-R/7Saea84iqUICAAQz9zcfDLDud4uFedY2752xyg+oE=";
hash = "sha256-/eivtsxNzW6IlX08Zfnj06C1kdaaRs4yvqLlbBuo8ec=";
};
# The version number was forgotten to be updated for the release,
# so do it manually in the meantime.
# See https://github.com/curl/trurl/discussions/244#discussioncomment-7436369
postPatch = ''
substituteInPlace version.h --replace 0.8 0.9
substituteInPlace version.h --replace 0.8 0.10
'';
outputs = [ "out" "dev" "man" ];

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2024-02-17";
version = "2024-02-20";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-rOhNN/kdwAtSq27P1vpTG/nLSyID/OKrPbDQOxdbgIw=";
hash = "sha256-cvz+yiB0Ei37W/RlW60oLCmQSCHZI6QB5JJtX4aUyuo=";
};
nativeBuildInputs = [

6
pkgs/tools/security/witness/default.nix
View File

@ -10,15 +10,15 @@
buildGoModule rec {
pname = "witness";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "in-toto";
repo = "witness";
rev = "v${version}";
sha256 = "sha256-U+dcaPi9Drg4I2SZlZPaR3Ryb+Dz27nyPI2XJPG/LWc=";
sha256 = "sha256-uwps/sHPgOdVhjaFxATVL5A/BGw6zPX/GSkYm802jmU=";
};
vendorHash = "sha256-pjcyAGdR8TsU9YBy5zd6u575vDKPwy8s85TXUsuxZiU=";
vendorHash = "sha256-ktBpv2NDsha2mN3OtZWIDkneR8zi1RZkVQdvi9XPSLY=";
nativeBuildInputs = [ installShellFiles ];

Some files were not shown because too many files have changed in this diff Show More