Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-11-04 12:06:08 +00:00 committed by GitHub
commit 2ff59d4786
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
73 changed files with 2397 additions and 1709 deletions

View File

@ -4394,7 +4394,7 @@
githubId = 2083950;
};
conni2461 = {
email = "simon.hauser@outlook.com";
email = "simon-hauser@outlook.com";
github = "Conni2461";
name = "Simon Hauser";
githubId = 15233006;
@ -8674,6 +8674,12 @@
githubId = 186660;
name = "Miao, ZhiCheng";
};
helsinki-Jo = {
email = "joachim.ernst@helsinki-systems.de";
github = "helsinki-Jo";
githubId = 155722885;
name = "Joachim Ernst";
};
henkery = {
email = "jim@reupload.nl";
github = "henkery";

View File

@ -465,6 +465,7 @@ with lib.maintainers;
members = [
das_j
conni2461
helsinki-Jo
];
scope = "Group registration for packages maintained by Helsinki Systems";
shortName = "Helsinki Systems employees";

View File

@ -5,7 +5,7 @@ let
opt = options.services.buildbot-master;
package = cfg.package.python.pkgs.toPythonModule cfg.package;
python = package.pythonModule;
python = cfg.package.python;
escapeStr = lib.escape [ "'" ];

View File

@ -9,7 +9,7 @@
};
};
in {
meta.maintainers = with maintainers; [ das_j ];
meta.maintainers = teams.helsinki-systems.members;
options.services.icingaweb2 = with types; {
enable = mkEnableOption "the icingaweb2 web interface";

View File

@ -1048,6 +1048,7 @@ in {
tika = runTest ./tika.nix;
timescaledb = handleTest ./timescaledb.nix {};
timezone = handleTest ./timezone.nix {};
timidity = handleTestOn ["aarch64-linux" "x86_64-linux"] ./timidity {};
tinc = handleTest ./tinc {};
tinydns = handleTest ./tinydns.nix {};
tinyproxy = handleTest ./tinyproxy.nix {};

View File

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "icingaweb2";
meta = with pkgs.lib.maintainers; {
maintainers = [ das_j ];
meta = {
maintainers = pkgs.lib.teams.helsinki-systems.members;
};
nodes = {

View File

@ -1,7 +1,7 @@
{ kernelPackages ? null, mkXfsFlags ? "" }:
import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "lvm2-vdo";
meta.maintainers = lib.teams.helsinki-systems.members;
meta.maintainers = [ ];
nodes.machine = { pkgs, lib, ... }: {
# Minimum required size for VDO volume: 5063921664 bytes

View File

@ -1610,7 +1610,7 @@ let
varnish = {
exporterConfig = {
enable = true;
instance = "/var/spool/varnish/varnish";
instance = "/run/varnish/varnish";
group = "varnish";
};
metricProvider = {
@ -1619,6 +1619,7 @@ let
];
services.varnish = {
enable = true;
stateDir = "/run/varnish/varnish";
config = ''
vcl 4.0;
backend default {

View File

@ -0,0 +1,20 @@
import ../make-test-python.nix (
{ pkgs, ... }:
{
name = "timidity";
nodes.machine =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.timidity ];
};
testScript = ''
start_all ()
## TiMidity++ is around.
machine.succeed("command -v timidity")
'';
}
)

View File

@ -0,0 +1,4 @@
inputs: {
basic = import ./basic.nix inputs;
with-vorbis = import ./with-vorbis.nix inputs;
}

Binary file not shown.

View File

@ -0,0 +1,40 @@
import ../make-test-python.nix (
{ pkgs, ... }:
{
name = "timidity-with-vorbis";
nodes.machine =
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
(timidity.override { enableVorbis = true; })
ffmpeg # # for `ffprobe`
];
};
testScript = ''
import json
start_all()
## TiMidity++ is around and it claims to support Ogg Vorbis.
machine.succeed("command -v timidity")
machine.succeed("timidity --help | grep 'Ogg Vorbis'")
## TiMidity++ manages to process a MIDI input and produces an Ogg Vorbis
## output file. NOTE: the `timidity` CLI succeeds even when the input file
## does not exist; hence our test for the output file's existence.
machine.succeed("cp ${./tam-lin.midi} tam-lin.midi")
machine.succeed("timidity -Ov tam-lin.midi && test -e tam-lin.ogg")
## The output file has the expected characteristics.
metadata_as_text = machine.succeed("ffprobe -show_format -print_format json -i tam-lin.ogg")
metadata = json.loads(metadata_as_text)
assert metadata['format']['format_name'] == 'ogg', \
f"expected 'format_name' to be 'ogg', got '{metadata['format']['format_name']}'"
assert 37 <= float(metadata['format']['duration']) <= 38, \
f"expected 'duration' to be between 37s and 38s, got {metadata['format']['duration']}s"
'';
}
)

View File

@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let
in {
name = "varnish";
meta = {
maintainers = lib.teams.helsinki-systems.members;
maintainers = [ ];
};
nodes = {

View File

@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "youtube-music";
version = "3.5.1";
version = "3.6.2";
src = fetchFromGitHub {
owner = "th-ch";
repo = "youtube-music";
rev = "v${finalAttrs.version}";
hash = "sha256-6aAaIugho8yHohEHp0HVkmzIOfhpkNYts6BOKPp9Wbw=";
hash = "sha256-S13f3vGMQJvpJbdfUstJlA8MfY5Q1efRA7QcPXYvhMI=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-6Fh1fbl7Y33EyWbWUhe70CGzhc4y+I59vPbzZydoJ18=";
hash = "sha256-brHNp19BEYzgxhdNnn7n1GYhBdyi3S/2VqvKWXmKGX8=";
};
nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ]

View File

@ -36,7 +36,6 @@ let
in pkgs.mkShell {
packages = [
pkgs.git
pkgs.nix
pkgs.bash
pkgs.nix-prefetch-git
pkgs.nix-prefetch-hg

View File

@ -18791,4 +18791,64 @@ final: prev:
};
meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/";
};
cmp-vimtex = buildVimPlugin {
pname = "cmp-vimtex";
version = "2024-08-06";
src = fetchFromGitHub {
owner = "micangl";
repo = "cmp-vimtex";
rev = "5283bf9108ef33d41e704027b9ef22437ce7a15b";
sha256 = "pD2dPdpyn5A/uwonDdAxCX138yBeDqbXDdlG/IKjVTU=";
};
meta.homepage = "https://github.com/micangl/cmp-vimtex/";
};
luasnip-latex-snippets-nvim = buildVimPlugin {
pname = "luasnip-latex-snippets.nvim";
version = "2024-09-16";
src = fetchFromGitHub {
owner = "evesdropper";
repo = "luasnip-latex-snippets.nvim";
rev = "c6b5b5367dd4bb8419389f5acf528acf296adcdd";
sha256 = "calv4nF1yxJyehQC+l0p4psI+f4Kg49K6XziCkH9I1Q=";
};
meta.homepage = "https://github.com/evesdropper/luasnip-latex-snippets.nvim/";
};
typst-conceal-vim = buildVimPlugin {
pname = "typst-conceal.vim";
version = "2023-10-13";
src = fetchFromGitHub {
owner = "MrPicklePinosaur";
repo = "typst-conceal.vim";
rev = "b8862f2d5a015b838e4a0d361f30423c45e23425";
sha256 = "UHEVhlV/1cq6jaMhNNookeGPtHvSwy1AKLvb8FR6Rro=";
};
meta.homepage = "https://github.com/MrPicklePinosaur/typst-conceal.vim/";
};
typst-preview-nvim = buildVimPlugin {
pname = "typst-preview.nvim";
version = "2024-10-24";
src = fetchFromGitHub {
owner = "chomosuke";
repo = "typst-preview.nvim";
rev = "06778d1b3d4d29c34f1faf80947b586f403689ba";
sha256 = "oBJ+G4jTQw6+MF/SMwaTkGlLQuYLbaAFqJkexf45I1g=";
};
meta.homepage = "https://github.com/chomosuke/typst-preview.nvim";
};
follow-md-links-nvim = buildVimPlugin {
pname = "follow-md-links.nvim";
version = "2024-09-29";
src = fetchFromGitHub {
owner = "jghauser";
repo = "follow-md-links.nvim";
rev = "41a6d74636b4209571680d40f20f59a0bf30bf57";
sha256 = "ULQTE57SRA8uTuvg5LLJzcI5hOlXDrUwrHfm9+1pbe8=";
};
meta.homepage = "https://github.com/jghauser/follow-md-links.nvim/";
};
}

View File

@ -134,6 +134,9 @@
# must be lua51Packages
luajitPackages,
aider-chat,
# typst-preview dependencies
tinymist,
websocat,
}:
self: super:
let
@ -2729,6 +2732,16 @@ in
--replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'"
'';
};
typst-preview-nvim = super.typst-preview-nvim.overrideAttrs {
postPatch = ''
substituteInPlace lua/typst-preview/config.lua \
--replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \
--replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}',"
'';
nvimRequireCheck = "typst-preview";
};
}
// (
let

View File

@ -182,6 +182,7 @@ https://github.com/andersevenrud/cmp-tmux/,,
https://github.com/ray-x/cmp-treesitter/,,
https://github.com/lukas-reineke/cmp-under-comparator/,,
https://github.com/dmitmel/cmp-vim-lsp/,HEAD,
https://github.com/micangl/cmp-vimtex/,HEAD,
https://github.com/pontusk/cmp-vimwiki-tags/,HEAD,
https://github.com/hrsh7th/cmp-vsnip/,,
https://github.com/tamago324/cmp-zsh/,HEAD,
@ -343,6 +344,7 @@ https://github.com/floobits/floobits-neovim/,,
https://github.com/akinsho/flutter-tools.nvim/,HEAD,
https://github.com/nvim-focus/focus.nvim/,HEAD,
https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
https://github.com/jghauser/follow-md-links.nvim/,HEAD,
https://github.com/mhartington/formatter.nvim/,,
https://github.com/megaannum/forms/,,
https://github.com/rubiin/fortune.nvim/,HEAD,
@ -522,6 +524,7 @@ https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
https://github.com/arkav/lualine-lsp-progress/,,
https://github.com/nvim-lualine/lualine.nvim/,,
https://github.com/l3mon4d3/luasnip/,,
https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD,
https://github.com/alvarosevilla95/luatab.nvim/,,
https://github.com/rktjmp/lush.nvim/,,
https://github.com/mkasa/lushtags/,,
@ -774,9 +777,9 @@ https://github.com/yorickpeterse/nvim-pqf/,HEAD,
https://github.com/jamestthompson3/nvim-remote-containers/,HEAD,
https://github.com/olrtg/nvim-rename-state/,HEAD,
https://github.com/chrisgrieser/nvim-rip-substitute/,,
https://github.com/chrisgrieser/nvim-scissors/,HEAD,
https://github.com/petertriho/nvim-scrollbar/,HEAD,
https://github.com/dstein64/nvim-scrollview/,,
https://github.com/chrisgrieser/nvim-scissors,HEAD,
https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,
https://github.com/garymjr/nvim-snippets/,,
https://github.com/dcampos/nvim-snippy/,HEAD,
@ -1058,6 +1061,8 @@ https://github.com/folke/twilight.nvim/,,
https://github.com/pmizio/typescript-tools.nvim/,,
https://github.com/leafgarland/typescript-vim/,,
https://github.com/jose-elias-alvarez/typescript.nvim/,,
https://github.com/MrPicklePinosaur/typst-conceal.vim/,HEAD,
https://github.com/chomosuke/typst-preview.nvim/,HEAD,
https://github.com/kaarmu/typst.vim/,HEAD,
https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/altermo/ultimate-autopair.nvim/,HEAD,

View File

@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "ArchiSteamFarm";
# nixpkgs-update: no auto update
version = "6.0.7.5";
version = "6.0.8.7";
src = fetchFromGitHub {
owner = "JustArchiNET";
repo = "ArchiSteamFarm";
rev = version;
hash = "sha256-YmwbANzwpda/ZJyGZ5lqa/4AVz7QNTXqHXOJNiZcc/M=";
hash = "sha256-PnHMJtM4lWuRn+7J9NxObEOJi4pbYEChcpcAJ+EdtSI=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;

View File

@ -57,13 +57,13 @@
(fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; })
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; })
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.3.0"; hash = "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc="; })
(fetchNuGet { pname = "Markdig.Signed"; version = "0.38.0"; hash = "sha256-yhO/GFoKdE/Z9SZPyGFe7DlnSd8dcAohqJNFqSqKLnk="; })
(fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
(fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.1"; hash = "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c="; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24415.1"; hash = "sha256-mZISof2BEaehgkVhw/G/vb6yvnNJtfoDEdGOHqAiWAg="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.0"; hash = "sha256-XglInnx5GePUYHG7n2NLX+WfK7kJnornsWOW/5FnOXE="; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24454.1"; hash = "sha256-cG/5tTEFcIEC78NwZBXkJac4JoYKq4n8n/QqJcZZWIU="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.1"; hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; })
@ -79,25 +79,25 @@
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.1.0"; hash = "sha256-BupPW6gN3p1LhIdDTcCVFmAMx3kMl7+Oq4kNWpbPsp4="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.1.0"; hash = "sha256-TzyHvyQQ/v1pr5IXOcyubLiB2l1uZLYiZyrg/QZADiM="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.1.0"; hash = "sha256-focc7oT7KbA3hDs6huy7PrPorH6EhRaVnaCkhrXPfq8="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.1.0"; hash = "sha256-wH3TDd7NcbGlMy1Z5clPcH/DjCNbDV1EJtDJcg9YcHA="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.0"; hash = "sha256-WjyA78+PG9ZloWTt9Hf1ek3VVj2FfJ9fAjqklnN+fWw="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.1.2"; hash = "sha256-uS0TjGTpt6q38Xheiu93yK3u47qK/dveidZabyKu7m0="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.1.2"; hash = "sha256-ASv9e7Q2Z5bfWfzCpQe5nQh782WISceFlxGwgJ51RHI="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.1.2"; hash = "sha256-Yv1B2ETQTPm95LoNg2op4V5arrb0udDq/ZdfiZl/Sc0="; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.1.2"; hash = "sha256-8fmgNOX1nyiNKrszZl3fvkxzCPuaeUbQJV45by8qRZs="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.4.0"; hash = "sha256-j9D+ts+CoP1xj/ZM7Eucp3Dx16NUQ7FsyALB7ArmJCw="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.4.0"; hash = "sha256-k3DIWLQe2Y8Q1lV75wNTqzvnbfhIyp/gOGLB6u8hBZs="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.4.0"; hash = "sha256-P+Sy651SvEE+4/e5jsm79xhWJ4D/qUoTYEqgLEN6hUc="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.4.0"; hash = "sha256-xTBi8jb1e8xF5n/HPYnAjNRPM/zS8gVR/51hJXx7Vkg="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.4.0"; hash = "sha256-xW9SRkROePnNMX6BQYHOFmivmPaSbJ5/YeuwcJNrzQg="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.0"; hash = "sha256-mCI3MCV6nyrGLrBat5VvK5LrXTEKlsdp9NkpZyJYwVg="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.0"; hash = "sha256-gViDLobza22kuLvB4JdlGtbANqwBHRwf1wLmIHMw9Eo="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.4.1"; hash = "sha256-oh0HFyB8AKR8nopzPk6HpmohY7TE94BLMYPGNuz3rzw="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.4.1"; hash = "sha256-XkkbSzJ1BSp1rZlR2OSPqQrl8rCTvtYKUTKtfxA/Xas="; })
(fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.4.1"; hash = "sha256-ICQHHkhffLr5tEIyAYBqLsi8nQGmWngl6Jeo0RnVawc="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.4.1"; hash = "sha256-EcqAc5HUXxBecqX6/Js5jimlVE0WKGp4yvVcC5e0wrM="; })
(fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.4.1"; hash = "sha256-tUqqZoCqprHvWsL6zwq05jxlW19bYEmhjA6qXTXWZ90="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
(fetchNuGet { pname = "MSTest"; version = "3.6.0"; hash = "sha256-p1w/OOAdFOy+WLV16cn2adGl5MeyDhltDllrDpPhYLE="; })
(fetchNuGet { pname = "MSTest.Analyzers"; version = "3.6.0"; hash = "sha256-/EdgXvk5a38DjpAcu3+13Xm9yjZUYHqBy3Q3UQxAEVo="; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.6.0"; hash = "sha256-XpSVWgNU36VVUssPUc11R/StiyzzmSu7imXu7kBzLkE="; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.0"; hash = "sha256-3j4Gp+BOhhKZav23gED/dtAnsoOrG+wtI9+p6IHNVMA="; })
(fetchNuGet { pname = "MSTest"; version = "3.6.1"; hash = "sha256-GZXe2I+IngWeNRTUtUTIBwtZy3rmIpNYwHOnlPSOwxU="; })
(fetchNuGet { pname = "MSTest.Analyzers"; version = "3.6.1"; hash = "sha256-b/VpTlHSzlO+APdTse2H0+9DK6QzcxZu9DaDVeyuTqc="; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.6.1"; hash = "sha256-bi7f3+FZtCw3VKI72vnM/ZdtYSzJYK1iVoq0irUkjBU="; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.1"; hash = "sha256-ECT15NPN86xU+KkK7QhF8hvOr3xLxjdVouSn757RjXE="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; })
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; })
@ -116,12 +116,12 @@
(fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; })
(fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.8.0"; hash = "sha256-2CMwJt9QDVrQ0FCGol0TTInEbchcXItVjgwh2HeJts4="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.8.0"; hash = "sha256-ADbd0g8R79X1lQ2A5SDX3yYvNFnMiztuDd6OtNC5It0="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.8.0"; hash = "sha256-tqJRsvb4snA/1EmAh2oKzGFBC6atFCkg4+b1PMSmfoo="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.8.0"; hash = "sha256-g7D+WGZAmUccExd5IzGwNGypJKcve85YdT3kof1w/LI="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.8.0"; hash = "sha256-45+fRCATI+MKYa9/rXIylBItVXV+pJhY2y7iO3ida+o="; })
(fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.5"; hash = "sha256-6AXrY3OYtF00FzP3yNWOdyFJE5jTqLegrlMh7hvDHJ8="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.9.0"; hash = "sha256-fmJjAfVHzbw/31IFPFUP31g46Y1XXIc1kr6VvYW5pCc="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.9.0"; hash = "sha256-0mbewpERdqKPLK5ULcAyHMF3nbAPCaaGPgelraLgoB4="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.9.0"; hash = "sha256-8KM21CWckFghGaqWahMa3V64+hUBrifAJnQ6P2VXlEk="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.9.0"; hash = "sha256-Ni8Z9CFs+ybTX8IgDuSKA580ISQ55w032EeqWYQXwoc="; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.9.0"; hash = "sha256-V+3bEEpxSXPi9Sy1hHZEjY9qxuIpRWV5dKzaqYMSu40="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; })
(fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; })

View File

@ -2,7 +2,7 @@
buildNpmPackage rec {
pname = "asf-ui";
version = "9f5672d65a1bd3b0f5d16ea6a1b5d220d670223c";
version = "7c5eb33a79736ca57acff776af4bd88816773247";
src = fetchFromGitHub {
owner = "JustArchiNET";
@ -10,10 +10,10 @@ buildNpmPackage rec {
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = version;
hash = "sha256-ngIPUy3iAkC5yFsH9lZlRcBlFs4sEkzfTrJ+ajB+weo=";
hash = "sha256-oOeXyhDnW2jeKGssxzgMIQElkH1uT5IALiXwxUg1ETQ=";
};
npmDepsHash = "sha256-GKkXh0FjsorllAukg6hYBSU0JEP6Bv7tvzEgRM4zAgw=";
npmDepsHash = "sha256-nofLj2PaL+A/M6F6vteh4SmONmsQ5kLPOZ/jxokubgU=";
installPhase = ''
runHook preInstall

View File

@ -1,5 +1,5 @@
{ lib
, python310
, python3
, fetchFromGitHub
, gdk-pixbuf
, adwaita-icon-theme
@ -17,7 +17,7 @@
}:
let
python = python310.override {
python = python3.override {
self = python;
packageOverrides = (self: super: {
matplotlib = super.matplotlib.override {

View File

@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "4.4.2";
version = "4.4.3";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-1N8ompxbygOm1PrgBuUgNwZO8Dutb76VnFOPMZdDTew=";
hash = "sha256-KVYS+NwkryjJGCV9MBTrUzQqXQd9Xj2aPq3zA72P6/o=";
};
# Why is this needed? https://github.com/weechat/weechat/issues/2031

View File

@ -53,7 +53,20 @@ let
};
in rec {
thunderbird = thunderbird-128;
# Upstream claims -latest is "for testing purposes only". Stick to -esr until this changes.
thunderbird = thunderbird-esr;
thunderbird-latest = common {
version = "132.0";
sha512 = "71206606d691e3b257b4b163e56604eaff221a43f88015fcbdbbbb3bbd708a7459f61b0470f7534ce9adafd41561e11b3487484fbfe3e95a06674785cae97029";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-latest";
};
};
# Eventually, switch to an updateScript without versionPrefix hardcoded...
thunderbird-esr = thunderbird-128;
thunderbird-128 = common {
version = "128.4.0esr";

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs }:
{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs, stdenv }:
buildGoModule rec {
pname = "git-lfs";
@ -39,6 +39,7 @@ buildGoModule rec {
postInstall = ''
installManPage man/man*/*
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd git-lfs \
--bash <($out/bin/git-lfs completion bash) \
--fish <($out/bin/git-lfs completion fish) \

View File

@ -21,6 +21,6 @@ buildGoModule rec {
homepage = "https://gitlab.com/gitlab-org/gitlab-pages";
changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = teams.helsinki-systems.members ++ teams.gitlab.members;
maintainers = teams.gitlab.members;
};
}

View File

@ -0,0 +1,4 @@
{ python3Packages }:
with python3Packages;
toPythonApplication aggregate6

View File

@ -0,0 +1,59 @@
{
lib,
python3Packages,
fetchFromGitHub,
bgpq4,
}:
python3Packages.buildPythonPackage rec {
pname = "arouteserver";
version = "1.23.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pierky";
repo = "arouteserver";
rev = "v${version}";
hash = "sha256-EZOBMDBsxbuVzzjQWU8V4n3gcLkRQxCq2eVK/Tyko4E=";
};
postPatch = ''
substituteInPlace tests/static/test_irr_queries_failover.py --replace-fail 'bgpq4 -h' '${lib.getExe bgpq4} -h'
substituteInPlace pierky/arouteserver/builder.py pierky/arouteserver/config/program.py tests/static/test_cfg_program.py \
--replace-fail '"bgpq4"' '"${lib.getExe bgpq4}"'
'';
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
aggregate6
jinja2
pyyaml
requests
packaging
urllib3
setuptools
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
requests-mock
];
pythonImportsCheck = [
"pierky"
"pierky.arouteserver"
];
pytestFlagsArray = [ "tests/static" ];
meta = {
description = "Automatically build (and test) feature-rich configurations for BGP route servers";
mainProgram = "arouteserver";
homepage = "https://github.com/pierky/arouteserver";
changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst";
license = with lib.licenses; [ gpl3Only ];
maintainers = lib.teams.wdz.members ++ (with lib.maintainers; [ marcel ]);
};
}

View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "baddns";
version = "1.1.869";
version = "1.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "blacklanternsecurity";
repo = "baddns";
rev = "refs/tags/v${version}";
hash = "sha256-BoRR7duvkXjI8vVP59IOACuIV7NmQe1loMEUgPfsdNw=";
hash = "sha256-pF7HYl1l+TSahJHuyVBZtYeET6wPCiSi+Yi7Rg46T44=";
};
pythonRelaxDeps = true;
@ -48,7 +48,13 @@ python3.pkgs.buildPythonApplication rec {
disabledTests = [
# Tests require network access
"test_cli_cname_http"
"test_cli_direct"
"test_cli_validation_customnameservers_valid"
"test_cname_http_bigcartel_match"
"test_cname_whois_unregistered_baddata"
"test_cname_whois_unregistered_match"
"test_cname_whois_unregistered_missingdata"
"test_modules_customnameservers"
"test_references_cname_css"
"test_references_cname_js"
@ -57,6 +63,7 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "Tool to check subdomains for subdomain takeovers and other DNS issues";
homepage = "https://github.com/blacklanternsecurity/baddns/";
changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "baddns";

View File

@ -73,7 +73,6 @@ let
};
allBeamDeps = import ./rebar-deps.nix {
# TODO(@chuangzhu) add updateScript
inherit fetchHex fetchgit fetchFromGitHub;
builder = lib.makeOverridable beamPackages.buildRebar3;
@ -142,7 +141,7 @@ let
in
stdenv.mkDerivation (finalAttrs:{
pname = "ejabberd";
version = "24.07";
version = "24.10";
nativeBuildInputs = [
makeWrapper
@ -171,7 +170,7 @@ stdenv.mkDerivation (finalAttrs:{
owner = "processone";
repo = "ejabberd";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-4wEQBumWrHqN2uNrDxAJhgv2ok7pgQlAEPpL96ZOsTQ=";
hash = "sha256-WQCFwhyaTVAX1bQURJkiCupgr3zc5yKrhQBiGyYsWZk=";
};
passthru.tests = {
@ -211,6 +210,8 @@ stdenv.mkDerivation (finalAttrs:{
}"''}
'';
passthru.updateScript = ./update.sh;
meta = {
description = "Open-source XMPP application server written in Erlang";
mainProgram = "ejabberdctl";

View File

@ -54,11 +54,11 @@ let
};
xmpp = builder {
name = "xmpp";
version = "1.8.3";
version = "1.9.0";
src = fetchHex {
pkg = "xmpp";
version = "1.8.3";
sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE=";
version = "1.9.0";
sha256 = "sha256-wbkb50qalQOvpnZvdWR3UWkg/7/uoMJgwvoXE1X1PCc=";
};
beamDeps = [
ezlib
@ -71,11 +71,11 @@ let
};
stun = builder {
name = "stun";
version = "1.2.14";
version = "1.2.15";
src = fetchHex {
pkg = "stun";
version = "1.2.14";
sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM=";
version = "1.2.15";
sha256 = "sha256-9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8=";
};
beamDeps = [
fast_tls
@ -124,11 +124,11 @@ let
};
p1_pgsql = builder {
name = "p1_pgsql";
version = "1.1.27";
version = "1.1.28";
src = fetchHex {
pkg = "p1_pgsql";
version = "1.1.27";
sha256 = "sha256-jk0adgLLaHgOVdidxamy4arKP08e49GiXy+MPSNk/7k=";
version = "1.1.28";
sha256 = "sha256-ZVu3XfA2rOVd3OF8p0EUPELgZnxiBqwnpNy8Zfcaye8=";
};
beamDeps = [ xmpp ];
};
@ -144,21 +144,21 @@ let
};
p1_mysql = builder {
name = "p1_mysql";
version = "1.0.24";
version = "1.0.25";
src = fetchHex {
pkg = "p1_mysql";
version = "1.0.24";
sha256 = "sha256-8FiGX2Qlf1B6LGpa/zabE3XbyzCz1CWNrU8bPq/7ZV8=";
version = "1.0.25";
sha256 = "sha256-5hh/+ulbcmCY6I8+5vI0SsJZziwm4O5AOwX+7zQa5DQ=";
};
beamDeps = [ ];
};
p1_acme = builder {
name = "p1_acme";
version = "1.0.23";
version = "1.0.24";
src = fetchHex {
pkg = "p1_acme";
version = "1.0.23";
sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk=";
version = "1.0.24";
sha256 = "sha256-8UUdcGWV75l6scoXFi3axY+HSsl+MVpfrb48+iYUgAI=";
};
beamDeps = [
base64url
@ -220,21 +220,21 @@ let
};
fast_xml = builder {
name = "fast_xml";
version = "1.1.52";
version = "1.1.53";
src = fetchHex {
pkg = "fast_xml";
version = "1.1.52";
sha256 = "sha256-eVGSOQ4G0rZQFqaZC7+lcn9KJtKRSAixw8mjLu3NG/0=";
version = "1.1.53";
sha256 = "sha256-UGQzbW82Pu5Ql6pdxc7Ztn8FFS8ua4Ug/VDSaMKrg5w=";
};
beamDeps = [ p1_utils ];
};
fast_tls = builder {
name = "fast_tls";
version = "1.1.21";
version = "1.1.22";
src = fetchHex {
pkg = "fast_tls";
version = "1.1.21";
sha256 = "sha256-ExVCkTk3Al5IzYCqgfADWWhtVQG3ViHnICaoe1IpUFs=";
version = "1.1.22";
sha256 = "sha256-5ld5rvt6sVxHVSMP74B35ofSDMWjmEpZdPn2V+jiSFs=";
};
beamDeps = [ p1_utils ];
};
@ -250,11 +250,11 @@ let
};
esip = builder {
name = "esip";
version = "1.0.54";
version = "1.0.56";
src = fetchHex {
pkg = "esip";
version = "1.0.54";
sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4=";
version = "1.0.56";
sha256 = "sha256-nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8=";
};
beamDeps = [
fast_tls

View File

@ -0,0 +1,27 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake nixfmt-rfc-style
#shellcheck shell=bash
set -eu -o pipefail
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
https://api.github.com/repos/processone/ejabberd/releases/latest | jq -e -r .tag_name)
old_version=$(nix-instantiate --eval -A ejabberd.version | jq -e -r)
if [[ $version == "$old_version" ]]; then
echo "New version same as old version, nothing to do." >&2
exit 0
fi
update-source-version ejabberd "$version"
sqlite=$(nix-build . -A sqlite.dev --no-link)
rebardeps=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")/rebar-deps.nix
tmpdir=$(mktemp -d)
cp -r $(nix-build . --no-out-link -A ejabberd.src)/. "$tmpdir"
cd "$tmpdir"
./autogen.sh
./configure --enable-all --disable-elixir --with-sqlite3=$sqlite
HOME=. rebar3 nix lock -o "$rebardeps"
nixfmt "$rebardeps"

View File

@ -166,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "130.0.6723.69";
version = "130.0.6723.91";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-MhLaPV2Ht4ZYsmrs4HWYtv/IFqD/mQVZwA/IVnZfND8=";
hash = "sha256-30RwtLlU4GhqDhbHTZMqrih77d2yOFeIBiOG3CugvLo=";
};
# With strictDeps on, some shebangs were not being patched correctly
@ -266,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "130.0.6723.70";
version = "130.0.6723.92";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/acl5a2wdujowx65sbvjgokb6thqq_130.0.6723.70/GoogleChrome-130.0.6723.70.dmg";
hash = "sha256-Ft+kBhYnnMpsRsCmmXp9rgyGuwCAb9WW6u5z6UJzh7o=";
url = "http://dl.google.com/release2/chrome/adlhlvvxwq7oxwh4d3ghghzdnhaq_130.0.6723.92/GoogleChrome-130.0.6723.92.dmg";
hash = "sha256-R1YCj0Ou+pyGUCxh6ATTTPIb5qUTnGROZypuAh8SlAg=";
};
dontPatch = true;

View File

@ -1,19 +1,34 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, gnum4, pkg-config, python3, wayland-scanner
, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
, enableHybridCodec ? false, vaapi-intel-hybrid
, enableGui ? true
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
gnum4,
pkg-config,
python3,
wayland-scanner,
intel-gpu-tools,
libdrm,
libva,
libX11,
libGL,
wayland,
libXext,
enableHybridCodec ? false,
vaapi-intel-hybrid,
enableGui ? true,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "intel-vaapi-driver";
version = "2.4.1";
version = "2.4.1-unstable-2024-10-27";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-vaapi-driver";
rev = version;
sha256 = "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp";
rev = "d30e01329344858f3c84d0ef9c2b68cbde37bb9a";
hash = "sha256-hMXFLXXTe2qvdk8svVlJ0sWJUIv8lu5DXk53SlBO0Cg=";
};
# Set the correct install path:
@ -29,15 +44,31 @@ stdenv.mkDerivation rec {
] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
nativeBuildInputs = [
autoreconfHook gnum4 pkg-config python3 wayland-scanner
autoreconfHook
gnum4
pkg-config
python3
wayland-scanner
];
buildInputs = [ intel-gpu-tools libdrm libva ]
++ lib.optionals enableGui [ libX11 libXext libGL wayland ]
buildInputs =
[
intel-gpu-tools
libdrm
libva
]
++ lib.optionals enableGui [
libX11
libXext
libGL
wayland
]
++ lib.optional enableHybridCodec vaapi-intel-hybrid;
enableParallelBuilding = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = with lib; {
homepage = "https://01.org/linuxmedia";
license = licenses.mit;
@ -52,7 +83,10 @@ stdenv.mkDerivation rec {
processing. It consists of a main library and driver-specific acceleration
backends for each supported hardware vendor.
'';
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = [
"x86_64-linux"
"i686-linux"
];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View File

@ -0,0 +1,8 @@
{
ncurses,
}:
ncurses.override {
unicodeSupport = false;
withTermlib = true;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,36 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, cargo
, meson
, ninja
, pkg-config
, desktop-file-utils
, rustc
, wrapGAppsHook4
, openssl
, dbus
, libadwaita
, glib-networking
, gst_all_1
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
cargo,
meson,
ninja,
pkg-config,
desktop-file-utils,
rustc,
wrapGAppsHook4,
openssl,
dbus,
libadwaita,
glib-networking,
gst_all_1,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "netease-cloud-music-gtk";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "gmg137";
repo = "netease-cloud-music-gtk";
rev = version;
hash = "sha256-5pIt6VBeNiQbKbffTPa0VJzO8pYGnfonpNpdtkaCwGI=";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-QRgGQDYrqOpZErz+OHZF1GPshxnZRPTIJSNkFWqQeHM=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"netease-cloud-music-api-1.4.0" = "sha256-M/7jvrCndgl9lhmzTrNhQor9CBkWTFjfkVxQPW3ed7Q=";
"netease-cloud-music-api-1.5.0" = "sha256-3CBWYUJ+5/KRQ6/EPt84rBxXQRjhvazrasRzbpkRwPU=";
};
};
@ -49,12 +50,14 @@ stdenv.mkDerivation rec {
rustc
];
buildInputs = [
buildInputs =
[
openssl
dbus
libadwaita
glib-networking
] ++ (with gst_all_1; [
]
++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
@ -66,8 +69,11 @@ stdenv.mkDerivation rec {
description = "Rust + GTK based netease cloud music player";
homepage = "https://github.com/gmg137/netease-cloud-music-gtk";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ diffumist aleksana ];
maintainers = with lib.maintainers; [
diffumist
aleksana
];
mainProgram = "netease-cloud-music-gtk4";
platforms = lib.platforms.linux;
};
}
})

File diff suppressed because it is too large Load Diff

View File

@ -31,8 +31,8 @@
]
}:
let
version = "1.17.31";
hash = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ=";
version = "1.18.26";
hash = "sha256-sJ0Zn5GMi64/S8zqomL/dYRVW8SOQWsP+bpcdatJC0A=";
rocksdb = rocksdb_8_3;
inherit (darwin.apple_sdk_11_0) Libsystem;
@ -55,6 +55,8 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws=";
"tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk=";
"aes-gcm-siv-0.10.3" = "sha256-N1ppxvew4B50JQWsC3xzP0X4jgyXZ5aOQ0oJMmArjW8=";
"curve25519-dalek-3.2.1" = "sha256-FuVNFuGCyHXqKqg+sn3hocZf1KMCI092Ohk7cvLPNjQ=";
};
};
@ -83,8 +85,7 @@ rustPlatform.buildRustPackage rec {
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd solana \
--bash <($out/bin/solana completion --shell bash) \
--fish <($out/bin/solana completion --shell fish) \
--zsh <($out/bin/solana completion --shell zsh)
--fish <($out/bin/solana completion --shell fish)
mkdir -p $out/bin/sdk/bpf
cp -a ./sdk/bpf/* $out/bin/sdk/bpf/

View File

@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Validating, recursive, and caching DNS resolver";
license = licenses.bsd3;
homepage = "https://www.unbound.net";
maintainers = lib.teams.helsinki-systems.members;
maintainers = [ ];
platforms = platforms.unix ++ platforms.windows;
};
})

View File

@ -19,20 +19,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "video-trimmer";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "YaLTeR";
repo = "video-trimmer";
rev = "v${finalAttrs.version}";
hash = "sha256-GXFbfebwiESplOeYDWxBH8Q0SCgV0vePYV7rv0qgrHM=";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-4B3NNGww+UjI/VbsKL62vWlKye7NYXYPzlJ4TfywJDw=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-szxJzBFtyFZ1T5TZb2MDPFJzn+EYETa/JbPdlg6UrTk=";
inherit (finalAttrs) pname version src;
hash = "sha256-vtV5TrF81TK4PUwzOF/CuDsKH1vTLO+4PFufyIOp2zk=";
};
nativeBuildInputs = [
@ -62,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
strictDeps = true;
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ ffmpeg-headless ]}"

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,11 @@
{ alsa-lib
, dbus
, fetchFromGitHub
, lib
, openssl
, pkg-config
, rustPlatform
,
{
alsa-lib,
dbus,
fetchFromGitHub,
lib,
openssl,
pkg-config,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"rusty_ytdl-0.6.6" = "sha256-htXD8v9Yd7S0iLjP6iZu94tP5KO5vbmkdUybqA7OtlU=";
"symphonia-0.5.1" = "sha256-rGvde5w7czMLcOPARK1gFfDLn70VeIrn4nKOL6FPc2U=";
"symphonia-0.5.4" = "sha256-uf0BbpqtlpZhsnV7Cm8egxjb/fXSINsOANTjDUQ4U9M=";
};
};
postPatch = "cp ${./Cargo.lock} Cargo.lock";

View File

@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "https://netfilter.org/projects/libnftnl/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ fpletz ];
};
}

View File

@ -9,6 +9,7 @@
, enableStatic ? stdenv.hostPlatform.isStatic
, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
, mouseSupport ? false, gpm
, withTermlib ? false
, unicodeSupport ? true
, testers
, binlore
@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
++ lib.optional withTermlib "--with-termlib"
++ lib.optionals stdenv.hostPlatform.isWindows [
"--enable-sp-funcs"
"--enable-term-driver"

View File

@ -0,0 +1,31 @@
From d20c7039316ea7c76da86963b266d3c34001b9f7 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sat, 2 Nov 2024 21:13:37 +0100
Subject: [PATCH] setup: remove nose, coverage
---
setup.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index b880f27..7a47360 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ setup(
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6'
],
- setup_requires=["nose", "coverage", "mock"],
+ setup_requires=["mock"],
install_requires=["py-radix==0.10.0"] + (
["future", "ipaddress"] if sys.version_info.major == 2 else []
),
@@ -78,5 +78,4 @@ setup(
entry_points={'console_scripts':
['aggregate6 = aggregate6.aggregate6:main']},
data_files = [('man/man7', ['aggregate6.7'])],
- test_suite='nose.collector'
)
--
2.44.1

View File

@ -0,0 +1,48 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
py-radix-sr,
pytestCheckHook,
mock,
}:
buildPythonPackage rec {
pname = "aggregate6";
version = "1.0.12";
pyproject = true;
src = fetchFromGitHub {
owner = "job";
repo = "aggregate6";
rev = version;
hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0=";
};
patches = [ ./0001-setup-remove-nose-coverage.patch ];
# py-radix-sr is a fork, with fixes
postPatch = ''
substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr'
'';
build-system = [ setuptools ];
dependencies = [ py-radix-sr ];
nativeCheckInputs = [
pytestCheckHook
mock
];
pythonImportsCheck = [ "aggregate6" ];
meta = {
description = "IPv4 and IPv6 prefix aggregation tool";
mainProgram = "aggregate6";
homepage = "https://github.com/job/aggregate6";
license = with lib.licenses; [ bsd2 ];
maintainers = lib.teams.wdz.members ++ (with lib.maintainers; [ marcel ]);
};
}

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "3.16.6";
version = "3.16.7";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc-data";
rev = "refs/tags/${version}";
hash = "sha256-2KYAFNCh6QfGdTzHE5LCumWoi+DM4t857qg6LrFO5x4=";
hash = "sha256-HT+IcfUA1QMkWhQKNwjKexzG04WJj+WTyHV+15DDoCI=";
};
build-system = [ setuptools-scm ];

View File

@ -57,7 +57,7 @@
buildPythonPackage rec {
pname = "dvc";
version = "3.55.2";
version = "3.56.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -66,7 +66,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvc";
rev = "refs/tags/${version}";
hash = "sha256-yNnOSYh4lCefTnIgNstsKaRbrPCgSiWEgKeF66KD66k=";
hash = "sha256-9TV+YQ9UFgqr3IoM0indUYa48O+mhfNxzAI56UtB3+Y=";
};
pythonRelaxDeps = [

View File

@ -48,6 +48,13 @@ buildPythonPackage rec {
url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch";
hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A=";
})
(fetchpatch2 {
# Bug reported upstream in https://github.com/open-mmlab/mmengine/issues/1575
# PR: https://github.com/open-mmlab/mmengine/pull/1589
name = "adapt-to-pytest-breaking-change";
url = "https://patch-diff.githubusercontent.com/raw/open-mmlab/mmengine/pull/1589.patch";
hash = "sha256-lyKf1GCLOPMpDttJ4s9hbATIGCVkiQhtyLfH9WzMWrw=";
})
];
build-system = [ setuptools ];
@ -64,7 +71,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
# bitsandbytes (broken as of 2024-07-06)
bitsandbytes
coverage
dvclive
lion-pytorch
@ -77,7 +84,7 @@ buildPythonPackage rec {
preCheck =
''
export HOME=$TMPDIR
export HOME=$(mktemp -d)
''
# Otherwise, the backprop hangs forever. More precisely, this exact line:
# https://github.com/open-mmlab/mmengine/blob/02f80e8bdd38f6713e04a872304861b02157905a/tests/test_runner/test_activation_checkpointing.py#L46
@ -95,14 +102,6 @@ buildPythonPackage rec {
"tests/test_runner/test_activation_checkpointing.py"
# missing dependencies
"tests/test_visualizer/test_vis_backend.py"
# Tests are outdated (runTest instead of run_test)
"mmengine/testing/_internal"
"tests/test_dist/test_dist.py"
"tests/test_dist/test_utils.py"
"tests/test_hooks/test_sync_buffers_hook.py"
"tests/test_model/test_wrappers/test_model_wrapper.py"
"tests/test_optim/test_optimizer/test_optimizer.py"
"tests/test_optim/test_optimizer/test_optimizer_wrapper.py"
];
disabledTests = [

View File

@ -4,23 +4,26 @@
fetchFromGitHub,
paramiko,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "mock-ssh-server";
version = "0.9.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "carletes";
repo = pname;
repo = "mock-ssh-server";
rev = "refs/tags/${version}";
hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo=";
};
propagatedBuildInputs = [ paramiko ];
build-system = [ setuptools ];
dependencies = [ paramiko ];
# Tests are running into a timeout on Hydra, they work locally
doCheck = false;

View File

@ -434,8 +434,8 @@ rec {
"sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE=";
mypy-boto3-dynamodb =
buildMypyBoto3Package "dynamodb" "1.35.24"
"sha256-Vb+Jeh0ONUV57bBQAfS8T0crlFK63Z2ySHbDG98/cqE=";
buildMypyBoto3Package "dynamodb" "1.35.54"
"sha256-qzd/6OxI0XBt8Z1s5bzlRbM27o/O1ZDfR98uqsH69sA=";
mypy-boto3-dynamodbstreams =
buildMypyBoto3Package "dynamodbstreams" "1.35.0"
@ -1322,8 +1322,8 @@ rec {
"sha256-aTKMQz0w0d0WOWHGU3HIqSb3z6PvbuSqtX+saBIIRog=";
mypy-boto3-stepfunctions =
buildMypyBoto3Package "stepfunctions" "1.35.46"
"sha256-crU3Xc5EkSSrhBqNVS/LIQa4ssiMNtI1gNoCvhBedWs=";
buildMypyBoto3Package "stepfunctions" "1.35.54"
"sha256-LueUCqK9oEYZfilqW6nA58zFNQtQn9eog/BmfBg+O/4=";
mypy-boto3-storagegateway =
buildMypyBoto3Package "storagegateway" "1.35.50"

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-opensearch";
version = "1.0.2";
version = "1.0.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-opensearch";
rev = "refs/tags/v${version}";
hash = "sha256-VEMt9CKbhPRj1182WcLOqF9JOEzorrz9Yyqp0+FAA88=";
hash = "sha256-whAvUgjPdZ0ePt0LkREJxJnLacNyQDWupdAinK3kJww=";
};
postPatch = ''

View File

@ -69,8 +69,7 @@ stdenv.mkDerivation rec {
homepage = "https://jenkins.io/";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mit;
maintainers = with maintainers;
[ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ coconnor earldouglas nequissimus ];
changelog = "https://www.jenkins.io/changelog-stable/#v${version}";
mainProgram = "jenkins-cli";
platforms = platforms.all;

View File

@ -29,7 +29,7 @@ let
homepage = "https://apparmor.net/";
description = "Mandatory access control system - ${component}";
license = with licenses; [ gpl2Only lgpl21Only ];
maintainers = with maintainers; [ julm thoughtpolice ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ julm thoughtpolice ];
platforms = platforms.linux;
};

View File

@ -153,6 +153,6 @@ stdenv.mkDerivation rec {
description = "Tools to support Logical Volume Management (LVM) on Linux";
platforms = platforms.linux;
license = with licenses; [ gpl2Only bsd2 lgpl21 ];
maintainers = with maintainers; [ raskin ajs124 ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ raskin ajs124 ];
};
}

View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
homepage = "https://netfilter.org/projects/nftables/";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ izorkin ];
mainProgram = "nft";
};
}

View File

@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
description = "Command shell for managing the Linux LIO kernel target";
homepage = "https://github.com/open-iscsi/targetcli-fb";
license = licenses.asl20;
maintainers = lib.teams.helsinki-systems.members;
maintainers = [ ];
platforms = platforms.linux;
};
}

View File

@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
# platforms are defined in https://github.com/dm-vdo/vdo/blob/master/utils/uds/atomicDefs.h
platforms = [ "x86_64-linux" "aarch64-linux" "s390-linux" "powerpc64-linux" "powerpc64le-linux" ];
license = with licenses; [ gpl2Plus ];
maintainers = teams.helsinki-systems.members;
maintainers = [ ];
};
}

View File

@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec {
'';
homepage = "https://www.icinga.com/products/icinga-web-2/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ das_j ];
maintainers = teams.helsinki-systems.members;
mainProgram = "icingacli";
platforms = platforms.all;
};

View File

@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/Icinga/icinga-php-library";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ das_j ];
maintainers = lib.teams.helsinki-systems.members;
};
}

View File

@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/Icinga/icinga-php-thirdparty";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ das_j ];
maintainers = lib.teams.helsinki-systems.members;
};
}

View File

@ -65,6 +65,6 @@ buildGoModule rec {
license = with licenses; [ agpl3Only asl20 ];
homepage = "https://grafana.com/oss/loki/";
changelog = "https://github.com/grafana/loki/releases/tag/v${version}";
maintainers = with maintainers; [ willibutz globin mmahut emilylange ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ willibutz globin mmahut emilylange ];
};
}

View File

@ -45,7 +45,7 @@ let
description = "Web application accelerator also known as a caching HTTP reverse proxy";
homepage = "https://www.varnish-cache.org";
license = licenses.bsd2;
maintainers = teams.helsinki-systems.members;
maintainers = [ ];
platforms = platforms.unix;
};
};

View File

@ -1,18 +1,21 @@
# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
# $ ./refresh-tarballs.bash --targets=armv7l-unknown-linux-gnueabihf
#
# Metadata:
# - nixpkgs revision: b92edf1104c47016385e85c87c2d953cf5cd2f98
# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l-unknown-linux-gnueabihf.build/latest
# - resolved hydra build: https://hydra.nixos.org/build/276944599
# - instantiated derivation: /nix/store/ldvkcqvzvwqv6frf6aqkl44jja88gvbx-stdenv-bootstrap-tools-armv7l-unknown-linux-gnueabihf.drv
# - output directory: /nix/store/y2xac60x8qkli271qn4dz78lzm2sqiv8-stdenv-bootstrap-tools-armv7l-unknown-linux-gnueabihf
# - build time: Thu, 31 Oct 2024 20:57:35 +0000
{
# Note: do not use Hydra as a source URL. Ask a member of the
# infrastructure team to mirror the job.
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv/armv7l-unknown-linux-gnueabihf/b92edf1104c47016385e85c87c2d953cf5cd2f98/bootstrap-tools.tar.xz";
hash = "sha256-FpBUnMI20l4LVdtmPpaGWP5+V52ZpvAH1JmHkOqFhCI=";
};
busybox = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
# from build: https://hydra.nixos.org/build/114203060
url = "http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
# note: the following hash is different than the above hash, due to executable = true
sha256 = "18qc6w2yykh7nvhjklsqb2zb3fjh4p9r22nvmgj32jr1mjflcsjn";
url = "http://tarballs.nixos.org/stdenv/armv7l-unknown-linux-gnueabihf/b92edf1104c47016385e85c87c2d953cf5cd2f98/busybox";
hash = "sha256-LSK7lkzpD1Zv5aFzp45W+3JGLi8iqOIk8brl1TNIl4g=";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
# from build: https://hydra.nixos.org/build/114203060
url = "http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
sha256 = "cf2968e8085cd3e6b3e9359624060ad24d253800ede48c5338179f6e0082c443";
};
}

View File

@ -63,13 +63,8 @@ in {
libtinfo = makeSharedObjectTest (getSharedObjectFromDebian "libedit.so.2.0.70" (fetchurl {
url = "mirror://debian/pool/main/libe/libedit/libedit2_3.1-20221030-2_amd64.deb";
hash = "sha256-HPFKvycW0yedsS0GV6VzfPcAdKHnHTvfcyBmJePInOY=";
})) (p: let
ncurses' = p.ncurses.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [ "--with-termlib" ];
postFixup = "";
});
in [
(ncurses'.override { unicodeSupport = false; })
})) (p: [
p.libtinfo
p.libbsd
]);

View File

@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
description = "SGI XFS utilities";
license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright
platforms = platforms.linux;
maintainers = with maintainers; [ dezgeg ajs124 ] ++ teams.helsinki-systems.members;
maintainers = with maintainers; [ dezgeg ajs124 ];
};
}

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, nixosTests
, pkg-config
, memstreamHook
, CoreAudio
@ -9,6 +10,9 @@
, ncurses
, alsa-lib
, buildPackages
## Additional optional output modes
, enableVorbis ? false, libvorbis
}:
stdenv.mkDerivation rec {
@ -29,6 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ];
buildInputs = [
libjack2
ncurses
@ -37,19 +42,31 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreAudio
libobjc
] ++ lib.optionals enableVorbis [
libvorbis
];
enabledOutputModes = [
"jack"
] ++ lib.optionals stdenv.hostPlatform.isLinux [
"oss"
"alsa"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"darwin"
] ++ lib.optionals enableVorbis [
"vorbis"
];
configureFlags = [
"--enable-ncurses"
("--enable-audio=" + builtins.concatStringsSep "," enabledOutputModes)
"lib_cv_va_copy=yes"
"lib_cv___va_copy=yes"
] ++ lib.optionals stdenv.hostPlatform.isLinux [
"--enable-audio=oss,alsa,jack"
"--enable-alsaseq"
"--with-default-output=alsa"
"lib_cv_va_val_copy=yes"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"--enable-audio=darwin,jack"
"lib_cv_va_val_copy=no"
"timidity_cv_ccoption_rdynamic=yes"
# These configure tests fail because of incompatible function pointer conversions.
@ -86,6 +103,8 @@ stdenv.mkDerivation rec {
# This fixup step is unnecessary and fails on Darwin
dontRewriteSymlinks = stdenv.hostPlatform.isDarwin;
passthru.tests = nixosTests.timidity;
meta = with lib; {
homepage = "https://sourceforge.net/projects/timidity/";
license = licenses.gpl2Plus;

View File

@ -1,6 +1,8 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
@ -14,8 +16,18 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-ArSIeu3u+TUy18rzJvhq0+/qvi5xPZmtQ7rPpwaEx9g=";
};
nativeBuildInputs = [ installShellFiles ];
cargoHash = "sha256-h1NQQFjtlpQuyTz7AHuAPUe1GxR0Q2yKzow8XB9375U=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
local INSTALL="$out/bin/trip"
installShellCompletion --cmd trip \
--bash <($out/bin/trip --generate bash) \
--fish <($out/bin/trip --generate fish) \
--zsh <($out/bin/trip --generate zsh)
'';
meta = with lib; {
description = "Network diagnostic tool";
homepage = "https://trippy.cli.rs";

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "evtx";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "omerbenamram";
repo = "evtx";
rev = "refs/tags/v${version}";
hash = "sha256-q2IpWWL/wmjVKSwupAa43zpXF+8/a1Cm/lKOmpwcsLA=";
hash = "sha256-ljEuFsLOwydLbx1DprJdBTL3cjFkhmuwr34da8LzG88=";
};
cargoHash = "sha256-O6XnBvLLoTvYA3G5Ws/aaYWJvEmDT7nnz+mc4QVkftg=";
cargoHash = "sha256-PZTB53DbUlyACS2wWmgVUQVz6EXb02GUogO3ClY678I=";
postPatch = ''
# CLI tests will fail in the sandbox

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mediawriter";
version = "5.1.3";
version = "5.1.90";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = "MediaWriter";
rev = "refs/tags/${version}";
hash = "sha256-w32Ps+GrbMq4Wot6vWyZS03Tv2rfTDnFLS7VwrcJLcc=";
hash = "sha256-ClqBEITZU1gx04ouPk4hBuURSRIg1CSYfMBdfnvD51Q=";
};
nativeBuildInputs = [

View File

@ -23198,8 +23198,6 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { };
vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { };
@ -32585,6 +32583,13 @@ with pkgs;
thunderbird-unwrapped = thunderbirdPackages.thunderbird;
thunderbird = wrapThunderbird thunderbird-unwrapped { };
thunderbird-latest-unwrapped = thunderbirdPackages.thunderbird-latest;
thunderbird-latest = wrapThunderbird thunderbird-latest-unwrapped { };
thunderbird-esr-unwrapped = thunderbirdPackages.thunderbird-esr;
thunderbird-esr = wrapThunderbird thunderbird-esr-unwrapped { };
thunderbird-128-unwrapped = thunderbirdPackages.thunderbird-128;
thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { };
thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped {

View File

@ -123,6 +123,8 @@ self: super: with self; {
agent-py = callPackage ../development/python-modules/agent-py { };
aggregate6 = callPackage ../development/python-modules/aggregate6 { };
ago = callPackage ../development/python-modules/ago { };
aggdraw = callPackage ../development/python-modules/aggdraw { };