diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index f26e4a2ffa4f..b1dafe8543ca 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -1,12 +1,22 @@ # Neovim {#neovim} Install `neovim-unwrapped` to get a barebone neovim to configure imperatively. -Neovim can be configured to include your favorite plugins and additional libraries by installing `neovim` instead. +This is the closest to what you encounter on other distributions. + +`neovim` is a wrapper around neovim with some extra configuration to for +instance set the various language providers like python. +The wrapper can be further configured to include your favorite plugins and +configurations for a reproducible neovim across machines. See the next section for more details. ## Custom configuration {#neovim-custom-configuration} -For Neovim the `configure` argument can be overridden to achieve the same: +There are two wrappers available to provide additionnal configuration around the vanilla package `pkgs.neovim-unwrapped`: +1. `wrapNeovim`: the historical one you should use +2. `wrapNeovimUnstable` intended to replace the former. It has more features but + the interface is not stable yet. + +You can configure the former via: ```nix neovim.override { @@ -14,9 +24,17 @@ neovim.override { customRC = '' # here your custom configuration goes! ''; + packages.myVimPackage = with pkgs.vimPlugins; { + # See examples below on how to use custom packages. + start = [ ]; + # If a Vim plugin has a dependency that is not explicitly listed in + # `opt`, that dependency will always be added to `start` to avoid confusion. + opt = [ ]; + }; }; } ``` +`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like. If you want to use `neovim-qt` as a graphical editor, you can configure it by overriding Neovim in an overlay or passing it an overridden Neovim: @@ -33,7 +51,77 @@ neovim-qt.override { } ``` +You can use the new unstable wrapper but the interface may change: +- `autoconfigure`: certain plugins need a custom configuration to work with nix. +For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs historically patched these in the plugins with several drawbacks: harder maintenance and making upstream work harder. Per convention, these mandatory bits of configuration are bookmarked in nixpkgs in `passthru.initLua`. Enabling `autoconfigure` automatically adds the snippets required for the plugins to work. +- `autowrapRuntimeDeps`: Appends plugin's runtime dependencies to `PATH`. For instance, `rest.nvim` requires `curl` to work. Enabling `autowrapRuntimeDeps` adds it to the `PATH` visible by your Neovim wrapper (but not your global `PATH`). +- `luaRcContent`: Extra lua code to add to the generated `init.lua`. +- `neovimRcContent`: Extra vimL code sourced by the generated `init.lua`. +- `wrapperArgs`: Extra arguments forwarded to the `makeWrapper` call. +- `wrapRc`: Nix, not being able to write in your `$HOME`, loads the + generated Neovim configuration via its `-u` argument, i.e. : `-u /nix/store/...generatedInit.lua`. This has side effects like preventing Neovim from reading your config in `$XDG_CONFIG_HOME` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#_initialization) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse while reusing the logic of the nixpkgs wrapper and access the generated config via `neovim.passthru.initRc`. +- `plugins`: A list of plugins to add to the wrapper. + +``` +wrapNeovimUnstable { + autoconfigure = true; + autowrapRuntimeDeps = true; + luaRcContent = '' + vim.o.sessionoptions = 'buffers,curdir,help,tabpages,winsize,winpos,localoptions' + vim.g.mapleader = ' ' + vim.g.maplocalleader = ' ' + vim.opt.smoothscroll = true + vim.opt.colorcolumn = { 100 } + vim.opt.termguicolors = true + ''; + # plugins accepts a list of either plugins or { plugin = ...; config = ..vimscript.. }; + plugins = with vimPlugins; [ + { + plugin = vim-obsession; + config = '' + map $ Obsession + ''; + } + (nvim-treesitter.withPlugins (p: [ p.nix p.python ])) + hex-nvim + ]; +} +``` + +You can explore the configuration with`nix repl` to discover these options and +override them. For instance: +```nix +neovim.overrideAttrs(oldAttrs: { + autowrapRuntimeDeps = false; +}) +``` + ### Specificities for some plugins {#neovim-plugin-specificities} + +### Plugin optional configuration {#neovim-plugin-required-snippet} + +Some plugins require specific configuration to work. We choose not to +patch those plugins but expose the necessary configuration under +`PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin +needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`. + +#### {#neovim-luarocks-based-plugins} + +In order to automatically handle plugin dependencies, several neovim plugins +upload their package to [](www.luarocks.org). This means less work for nixpkgs maintainers in the long term as dependencies get updated automatically. +This means several neovim plugins are first packaged as nixpkgs [lua +packages](#packaging-a-library-on-luarocks), and converted via `buildNeovimPlugin` in +a vim plugin. This conversion is necessary because neovim expects lua folders to be +top-level while luarocks installs them in varous subfolders by default. + +For instance: +```nix +rtp-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.rtp-nvim; +}; +``` +To update these packages, you should use the lua updater rather than vim's. + #### Treesitter {#neovim-plugin-treesitter} By default `nvim-treesitter` encourages you to download, compile and install diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 9d7dab9eb496..9a591bd0129a 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -58,25 +58,6 @@ vim-full.customize { } ``` -`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like. -For Neovim the syntax is: - -```nix -neovim.override { - configure = { - customRC = '' - # here your custom configuration goes! - ''; - packages.myVimPackage = with pkgs.vimPlugins; { - # see examples below how to use custom packages - start = [ ]; - # If a Vim plugin has a dependency that is not explicitly listed in - # opt that dependency will always be added to start to avoid confusion. - opt = [ ]; - }; - }; -} -``` The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable: @@ -178,15 +159,6 @@ To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-upda Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. - -### Plugin optional configuration {#vim-plugin-required-snippet} - -Some plugins require specific configuration to work. We choose not to -patch those plugins but expose the necessary configuration under -`PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin -needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`. - - ## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs} Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). diff --git a/doc/redirects.json b/doc/redirects.json index 254e6ceb6fc6..dfc5bc5a1eaa 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -8,6 +8,9 @@ "neovim-custom-configuration": [ "index.html#neovim-custom-configuration" ], + "neovim-luarocks-based-plugins": [ + "index.html#neovim-luarocks-based-plugins" + ], "nixpkgs-manual": [ "index.html#nixpkgs-manual" ], @@ -3799,7 +3802,8 @@ "testing-neovim-plugins-neovim-require-check": [ "index.html#testing-neovim-plugins-neovim-require-check" ], - "vim-plugin-required-snippet": [ + "neovim-plugin-required-snippet": [ + "index.html#neovim-plugin-required-snippet", "index.html#vim-plugin-required-snippet" ], "updating-plugins-in-nixpkgs": [ diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b609e2db2e6..3dceccfee268 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4401,6 +4401,12 @@ github = "CnTeng"; githubId = 56501688; }; + cobalt = { + email = "cobalt@cobalt.rocks"; + github = "Chaostheorie"; + githubId = 42151227; + name = "Cobalt"; + }; CobaltCause = { name = "Charles Hall"; email = "charles@computer.surgery"; @@ -7426,7 +7432,7 @@ felbinger = { name = "Nico Felbinger"; email = "nico@felbinger.eu"; - matrix = "@nico:felbinger.eu"; + matrix = "@nicof2000:matrix.org"; github = "felbinger"; githubId = 26925347; keys = [ { fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; } ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c95cd32f5a58..6816b26cfb7f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -858,6 +858,7 @@ ./services/misc/radarr.nix ./services/misc/radicle.nix ./services/misc/readarr.nix + ./services/misc/realmd.nix ./services/misc/redlib.nix ./services/misc/redmine.nix ./services/misc/renovate.nix diff --git a/nixos/modules/services/misc/realmd.nix b/nixos/modules/services/misc/realmd.nix new file mode 100644 index 000000000000..a62bba6e9eef --- /dev/null +++ b/nixos/modules/services/misc/realmd.nix @@ -0,0 +1,44 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + inherit (lib) mkEnableOption mkIf mkPackageOption; + cfg = config.services.realmd; +in +{ + options.services.realmd = { + enable = mkEnableOption "realmd service for managing system enrollment in Active Directory domains"; + + package = mkPackageOption pkgs "realmd" { }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + services.dbus = { + enable = true; + packages = [ cfg.package ]; + }; + + systemd.services.realmd = { + description = "Realm and Domain Configuration"; + wantedBy = [ "multi-user.target" ]; + partOf = [ "dbus.service" ]; + requires = [ "dbus.service" ]; + after = [ + "network.target" + "dbus.service" + ]; + serviceConfig = { + Type = "dbus"; + BusName = "org.freedesktop.realmd"; + ExecStart = "${cfg.package}/libexec/realmd"; + RuntimeDirectory = "realmd"; + }; + }; + }; +} diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 637672bef595..a6f5ef942fa0 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.5.0"; + version = "33.5.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -172,11 +172,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-TlmDsZKHolTS+y+1BymyY49+AvqUv8zmUXCGNHCRPL0="; + hash = "sha256-N3z03c4DsEG/L3T4BjOSx7XOGT988ZDshYhgl9TuOQM="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-f6vLHbpmvVfkjZr7x0DiCFoGGvfxHfFZ3KTagq2Mwp4="; + hash = "sha256-L+SgmjzilFFK8FcutINVac4MCAPvgJ3OqpwBaQqNlCI="; }; }; diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index ed6eecf8c50d..821fe67fee87 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -26,13 +26,13 @@ }: let - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-tKdzTfqKCSRf/cPw3AcvpuZ3ETQYSKm98r5Py14aC9w="; + hash = "sha256-UUxHLC35au4Valy/ArFdBjI5uGsIQ8aMdNLMPz0gSTs="; }; goDeps = diff --git a/pkgs/by-name/cc/cc2538-bsl/package.nix b/pkgs/by-name/cc/cc2538-bsl/package.nix index 1716511e545f..10a77623d62a 100644 --- a/pkgs/by-name/cc/cc2538-bsl/package.nix +++ b/pkgs/by-name/cc/cc2538-bsl/package.nix @@ -1,37 +1,28 @@ { lib, fetchFromGitHub, - fetchpatch, python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "cc2538-bsl"; - version = "2.1-unstable-2023-10-03"; - format = "pyproject"; + version = "2.1-unstable-2025-01-14"; + pyproject = true; src = fetchFromGitHub { owner = "JelmerT"; repo = "cc2538-bsl"; - rev = "4d64ac633dbaf29d098842c5937ed6eea2fd7c45"; - hash = "sha256-NX2jPYAz15bSucj/YR5E/0eJy/cbszSrNxyJHRsbXxo="; + rev = "bb6471103c2bddd319e5fda46fe4e872ce1de407"; + hash = "sha256-iVdwwZozoFsHpLMiZq3i9wldfusAsCCZy6isKfvGqKo="; }; - patches = [ - (fetchpatch { - # fix extras specification in setup.py; https://github.com/JelmerT/cc2538-bsl/pull/143 - url = "https://github.com/JelmerT/cc2538-bsl/commit/c70f58ec0222357db8020176711d6d45cf24da35.patch"; - hash = "sha256-Rxm/TRcm87WgRfq60cu0loyrbJmZou09XYR7uhrhhj8="; - }) - ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev0+g${lib.substring 0 7 src.rev}"; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ intelhex pyserial python-magic diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 338dba7ad7a2..b321b6ef16bf 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${version}"; - hash = "sha256-CeRMcMuwER6LnLGAheGS+v4FDw7KADefB3p5ve1HsfE="; + hash = "sha256-tJskyj9jbtnrGQ48SUJadTM/ZVmCMbQ+YH/XXtMeyaQ="; }; - cargoHash = "sha256-m/cg5ElXf7vKNvUjrRbVAdYppqsAeHxlGw/bHafBgOg="; + cargoHash = "sha256-7hO2B0z4h1asWlAHdTNxo/dC8ZX/3XTrqMUft6Aads8="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index 4eaa81d68fa8..2a36ce429223 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -6,24 +6,31 @@ libiconv, openssl, pkg-config, + cmake, xclip, darwin, + nix-update-script, }: - -rustPlatform.buildRustPackage rec { +let pname = "gitui"; - version = "0.26.3"; + version = "0.27.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "extrawurst"; repo = "gitui"; rev = "v${version}"; - hash = "sha256-j3y+KjC+o9p2omf4bN8+XevwU7WqiaQ0sfPqHySD2ik="; + hash = "sha256-jKJ1XnF6S7clyFGN2o3bHnYpC4ckl/lNXscmf6GRLbI="; }; - cargoHash = "sha256-vVEo0kSghOQsH3T6ZTAzN7gIUku0n7rDbKwNmOM9GZc="; + cargoHash = "sha256-T00TqxR2EWnDkZo3MUQhiG0oAUf1PgpkUMZLt7f4FH0="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + cmake + ]; buildInputs = [ openssl ] @@ -54,12 +61,14 @@ rustPlatform.buildRustPackage rec { "--skip=keys::key_config::tests::test_symbolic_links" ]; + passthru.updateScript = nix-update-script { }; + meta = { + changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; - changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; - mainProgram = "gitui"; license = lib.licenses.mit; + mainProgram = "gitui"; maintainers = with lib.maintainers; [ Br1ght0ne yanganto diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 0bdbc37ba1d5..c2920a11f96d 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -7,21 +7,20 @@ buildPackages, versionCheckHook, nix-update-script, - hugo, }: buildGoModule rec { pname = "hugo"; - version = "0.140.2"; + version = "0.141.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${version}"; - hash = "sha256-4W/iUJHVsmCrIR5z0qSQ/Fsa4qtiuSie6/cot6oYQNM="; + hash = "sha256-NjxHsS1VG/B1+rjmwTdoHOKraMh6z54pQqw8k9Nbuss="; }; - vendorHash = "sha256-gyXvxg1pKf0MYbwf2FTUnDLSBf0Bcb4uNZ5rDq/2QGY="; + vendorHash = "sha256-2OZajJZnbD3Ks3xq501Ta5ba+3jDnI1GFiI5u2Y/i3A="; checkFlags = let diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index 94e34d40423d..e23cab5ffb20 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.48.31907.7"; + version = "24.52.32224.5"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-1YWPCVvG4jjEIDrkAfljhnXYlW0TTiPBCp2mhInuOfY="; + hash = "sha256-Unoh33bZFsMCqJ2hWEYVEdMF2V/aSIDynThz1pUyM7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 3567a2607a25..bd2ea5951233 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ # Regression in go1.23 see https://github.com/jesseduffield/lazygit/issues/4002 buildGo122Module rec { pname = "lazygit"; - version = "0.45.0"; + version = "0.45.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-hGJDsx0klccbueP7h5HtcYioFLL4gf3W3lbOHIA36FA="; + hash = "sha256-B8z0NqCFdCAYVZnujfDJ9Y4qFXuhy5A/RG51Qb2J4ts="; }; vendorHash = null; diff --git a/pkgs/by-name/rc/rc-9front/package.nix b/pkgs/by-name/rc/rc-9front/package.nix index 995aa8e35b6a..9b921013babd 100644 --- a/pkgs/by-name/rc/rc-9front/package.nix +++ b/pkgs/by-name/rc/rc-9front/package.nix @@ -5,6 +5,11 @@ unstableGitUpdater, byacc, installShellFiles, + coreutils, + # for tests only + rc-9front, + runCommand, + nawk, }: stdenv.mkDerivation { @@ -25,7 +30,15 @@ stdenv.mkDerivation { installShellFiles ]; enableParallelBuilding = true; - patches = [ ./path.patch ]; + # Rc bootstraps the new $path by hardcoding a common list + # of binary locations common to most POSIX-y systems. + # On NixOS the average $PATH is a lot more involved and + # as such the resulting environment that rcmain.unix dumps you + # into is not particularly useful. This patch instead makes + # rc bootstrap the new $path using the existing $PATH. + postPatch = '' + substituteInPlace ./rcmain.unix --replace-fail 'path=(. /bin /usr/bin /usr/local/bin)' 'path=`:{${coreutils}/bin/env echo -n $PATH}' + ''; makeFlags = [ "PREFIX=$(out)" ]; installPhase = '' @@ -42,15 +55,28 @@ stdenv.mkDerivation { passthru = { shellPath = "/bin/rc"; updateScript = unstableGitUpdater { shallowClone = false; }; + tests = { + simple = runCommand "rc-test" { } '' + ${lib.getExe rc-9front} -c 'nl=`{echo} && \ + res=`$nl{for(i in `{seq 1 10}) echo $i} && \ + echo -n $res' >$out + [ "$(wc -l $out | ${lib.getExe nawk} '{ print $1 }' )" = 10 ] + [ "$(${lib.getExe nawk} '{ a=a+$1 } END{ print a }' < $out)" = "$((10+9+8+7+6+5+4+3+2+1))" ] + ''; + path = runCommand "rc-path" { } '' + PATH='${coreutils}/bin:/a:/b:/c' ${lib.getExe rc-9front} -c 'echo $path(2-)' >$out + [ '/a /b /c' = "$(cat $out)" ] + ''; + }; }; - meta = with lib; { + meta = { description = "9front shell"; longDescription = "unix port of 9front rc"; homepage = "http://shithub.us/cinap_lenrek/rc/HEAD/info.html"; - license = licenses.mit; - maintainers = with maintainers; [ moody ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moody ]; mainProgram = "rc"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/rc/rc-9front/path.patch b/pkgs/by-name/rc/rc-9front/path.patch deleted file mode 100644 index 7deef2cebfcd..000000000000 --- a/pkgs/by-name/rc/rc-9front/path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/rcmain.unix b/rcmain.unix -index 7ccbe1b..691f493 100644 ---- a/rcmain.unix -+++ b/rcmain.unix -@@ -13,7 +13,7 @@ if(~ $rcname ?.out) prompt=('broken! ' ' ') - if(flag p) path=/bin - if not { - finit -- if(~ $#path 0) path=(. /bin /usr/bin /usr/local/bin) -+ if(~ $#path 0) path=`:{/usr/bin/env echo -n $PATH} - } - fn sigexit - if(! ~ $#cflag 0){ diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index ac4af1f2ad22..5f222d833fad 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.2", - "hash": "sha256-lYWqgjYOyh4pg+TdkgqeFhi8OMI1p9IOvSntVXo5zvE=" + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,68 +16,68 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.2", - "hash": "sha256-Mmp7Mjy9Y6uvkfjE8KLWoJWcVZHiJwqmhQupsxYRExo=" + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.2", - "hash": "sha256-RbkISZEp55N9dtqvPp0Ej2/wpU/YzI4wgJjBCJnIGl4=" + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.2", - "hash": "sha256-ucd2SH0CAjwE5TSgwhhzYZqMD1zuTlR7qLQDl3mYGvg=" + "version": "11.2.3", + "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.2", - "hash": "sha256-aOji+/TYSP0l3dpn62bvWMdce2YkYi5xzRPC3nS6ZGc=" + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.2", - "hash": "sha256-H1h+PQBW8vrvJnKQZ+vcFaxCVssBcuHGBQw1Jj8dMR0=" + "version": "11.2.3", + "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.2", - "hash": "sha256-c/u6TX1Hl2h8B5xe7Zo1AJ6cR5BazI19NRnw56a36y0=" + "version": "11.2.3", + "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" }, { "pname": "Avalonia.Native", - "version": "11.2.2", - "hash": "sha256-2Scuc+OCtfLChDYCi4feCh9XUrgJpbVaek3xRnpOGDE=" + "version": "11.2.3", + "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.2", - "hash": "sha256-Rr/wmmS47korAK0nAplpWCWrS1O9YZZD6i+efR7btN0=" + "version": "11.2.3", + "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.2", - "hash": "sha256-lMb3VvHXQGxn0dyEGkzKXxFocvPJUaNnOpRJpHF9ORU=" + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" }, { "pname": "Avalonia.Skia", - "version": "11.2.2", - "hash": "sha256-YmOT+r4OfyOyg8epho6bVaEW2HImEfsZ5rNqhWIY5Fk=" + "version": "11.2.3", + "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.2", - "hash": "sha256-HXkfpUuTN8hSBMXCCGW78+2GC5w3VdTUp1qm7HvUZPI=" + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" }, { "pname": "Avalonia.Win32", - "version": "11.2.2", - "hash": "sha256-pouvlprL9VeEi1dG5zR6nFj+I/4CIjH1rHbV3N9/FHg=" + "version": "11.2.3", + "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" }, { "pname": "Avalonia.X11", - "version": "11.2.2", - "hash": "sha256-86EIfm1zEvKleliP58xAs7KGxP/n7x2m8ca8C9W1XqA=" + "version": "11.2.3", + "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" }, { "pname": "CliWrap", @@ -176,13 +176,13 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.2", - "hash": "sha256-64eayKF+P3qrUZIOOVliqnZ8zK7ZCCxFz1RkD5kJSxM=" + "version": "11.2.1.3", + "hash": "sha256-AtJSFLa/zHk/58fJ+1h6IDowNDLTaRNUVaQ7lfQyYAw=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.2", - "hash": "sha256-zEEmBjgksVgv9qwnKAFfDhDkrHphKe1/836Ax1gyazc=" + "version": "11.2.1.3", + "hash": "sha256-CEjvrgPSxqubAQ6aOiag7SukA19WJ2s4G3zeLrk9810=" }, { "pname": "SkiaSharp", @@ -351,8 +351,8 @@ }, { "pname": "YamlDotNet", - "version": "16.2.1", - "hash": "sha256-Nu/rD43sihE4PTHC5r2Ua2gafclqcd2U95RcNFvGFhc=" + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" }, { "pname": "ZXing.Net", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index e0a13d03aedd..73969743821d 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -11,21 +11,21 @@ openssl, lttng-ust_2_12, krb5, - imagemagick, makeDesktopItem, copyDesktopItems, bash, xorg, + xdg-utils, }: buildDotnetModule rec { pname = "v2rayn"; - version = "7.4.1"; + version = "7.6.2"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-mtmuEwZy72LPYFf7hzE8TYiSh2kK6xe2CRdkOSbg2h4="; + hash = "sha256-o+aeBdV/OT4cFovCeivM2i60r4mbZ0FPOY8XNdKRrpg="; }; projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"; @@ -35,9 +35,13 @@ buildDotnetModule rec { postPatch = '' substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \ --replace-fail "/bin/bash" "${bash}/bin/bash" + substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \ + --replace-fail "Utils.GetExePath())" '"${placeholder "out"}/bin/v2rayN")' + substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \ + --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open" ''; - dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ]; + dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ]; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -46,7 +50,6 @@ buildDotnetModule rec { executables = [ "v2rayN" ]; nativeBuildInputs = [ - imagemagick copyDesktopItems autoPatchelfHook ]; @@ -71,24 +74,6 @@ buildDotnetModule rec { xorg.libXext ]; - postBuild = - let - selectSystem = - attrs: - attrs.${stdenv.hostPlatform.system} - or (throw "v2rayn: ${stdenv.hostPlatform.system} is not supported"); - arch = selectSystem { - x86_64-linux = "x64"; - aarch64-linux = "arm64"; - }; - in - '' - mv ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/linux-${arch} ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn - rm -r ./v2rayN/v2rayN.Desktop/bin/Release/net8.0 - mv ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn ./v2rayN/v2rayN.Desktop/bin/Release/net8.0 - ln -s . ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/linux-${arch} - ''; - desktopItems = [ (makeDesktopItem { name = "v2rayn"; @@ -96,14 +81,21 @@ buildDotnetModule rec { icon = "v2rayn"; genericName = "v2rayN"; desktopName = "v2rayN"; + categories = [ + "Network" + "Application" + ]; + terminal = false; + comment = "A GUI client for Windows and Linux, support Xray core and sing-box-core and others"; }) ]; postInstall = '' - mkdir -p $out/share/pixmaps - magick "v2rayN/v2rayN.Desktop/Assets/v2rayN.ico[11]" $out/share/pixmaps/v2rayn.png + install -Dm644 v2rayN/v2rayN.Desktop/v2rayN.png $out/share/pixmaps/v2rayn.png ''; + passthru.updateScript = ./update.sh; + meta = { description = "GUI client for Windows and Linux, support Xray core and sing-box-core and others"; homepage = "https://github.com/2dust/v2rayN"; diff --git a/pkgs/by-name/v2/v2rayn/update.sh b/pkgs/by-name/v2/v2rayn/update.sh new file mode 100755 index 000000000000..b8356be9f83c --- /dev/null +++ b/pkgs/by-name/v2/v2rayn/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix nix-update + +set -eou pipefail + +nix-update v2rayn + +$(nix-build -A v2rayn.fetch-deps) diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index 8eca5d228869..463cec95f523 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-WB0blQLxQOTkK8UGsH6WISZAisUAtGIDfjoc4RnPSew="; + hash = "sha256-05EuPjVokzfJxhrnvFHD7prwt5y7gPxemeDIkLML7lw="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 3233a73cc792..0ed176805199 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -44,36 +44,27 @@ llvmPackages.stdenv.mkDerivation rec { strictDeps = true; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc cargo - git - vulkan-headers - vulkan-loader - shaderc + shaderc # for glslc rustc wayland-scanner rustPlatform.cargoSetupHook - autoPatchelfHook rust-bindgen ]; + buildInputs = [ - # Optional dependencies: mesa lz4 zstd ffmpeg - libva vulkan-headers - ]; - runtimeDependencies = [ - vulkan-tools vulkan-loader - wayland - egl-wayland ]; meta = with lib; { diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index 0717a38b084b..a6ba3a65a30a 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-filesystem"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-filesystem"; tag = version; - hash = "sha256-HZp0kR7vCXRg04aiRbefbTMprgOH3Chy7X2x8X9urTk="; + hash = "sha256-V35nqrTUQb5Emn6kgGubvVkTHYQHDz82p3S7pk0Aagg="; }; - cargoHash = "sha256-HXxlgAszm2HbuKRhoWjluu/U9PMRHxs4/TRxEsl0Cgg="; + cargoHash = "sha256-qpubYs7JEdL1iSYrMQ2HXPXrkCmFLjHyC0+MhiolEFk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index 0da5f92644e2..aafd5a14b1c2 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-influxdb"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-influxdb"; tag = version; - hash = "sha256-VQoJO+9DYDkIKTTqLy/i2uBeFPuXO2Y0NnYrJTa1tvc="; + hash = "sha256-X8COHoAf+VG5RXg6KLozxe39a/4oVuiEJLESnEKaCEE="; }; - cargoHash = "sha256-kaaOcRDqqZvVNfCuIKYJAPK+KLUE41/1R/Cih4cpVjw="; + cargoHash = "sha256-4V0blfTQ5plFD4MNJeIIuztVlhOlzOgtycsg8J/pZjQ="; meta = { description = "Backend and Storages for zenoh using InfluxDB"; diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index f47ab1cd931b..d119a40a61b9 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-rocksdb"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-rocksdb"; tag = version; - hash = "sha256-QCUS3jiWa2gbD/X/Va8s5WX4+3RKFOizh8FB/nsqWGM="; + hash = "sha256-+dA/4VA1oHhTiMcSXful2Z1B+IYykPMC/2p0mjEbako="; }; - cargoHash = "sha256-k7u4P3ropwgzaqN/bom4mfOsXvNHmn3VQc7NUakgusA="; + cargoHash = "sha256-bQQWewhKibUKmJ9sJGcgvsNJhdCu67qOwFTNsCkjlO0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 55caabff898d..7a5953cbdad0 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -6,16 +6,19 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-mqtt"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-mqtt"; tag = version; - hash = "sha256-GsYT46mBsvvSW3BG2stVpERvelbRIiUaWTco39IY6/A="; + hash = "sha256-boe4AI0U0JHNuChhHOlfCMlKJ0Zo5yUGG3xubR/Msrc="; }; - cargoHash = "sha256-8q8pMUMciB8cPSpkeu9sjGJm6DxXicd0k/NJ+1uz4VU="; + cargoHash = "sha256-uB/geIBpNStXx82zL2sX6e6sLsoWRkbUsx14xLvDdsw="; + + # Some test time out + doCheck = false; meta = { description = "A Zenoh plug-in that allows to integrate and/or route MQTT pub/sub with Eclipse Zenoh"; diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index 551b9d048148..0b2360458f33 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-webserver"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-webserver"; tag = version; - hash = "sha256-fdnag/IcGMZUti62y3rLMZ3lt42cd3SSa8kZFXVn6BQ="; + hash = "sha256-DduYSy8jO0LtpEadhBhVFW5uht9LFmTbmSJ0jGTh/TQ="; }; - cargoHash = "sha256-YckyHArQG/mYmDdA2qt4Wmw7Agx/CItjIgajJD0O5WA="; + cargoHash = "sha256-W1vmrKP4aS6O/+8sCzPb5Rs9kAm8ePnowtYEhcS7yMo="; meta = { description = "Implements an HTTP server mapping URLs to zenoh paths"; diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 823025666682..622acf3e180e 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -2,21 +2,22 @@ lib, rustPlatform, fetchFromGitHub, + nixosTests, testers, zenoh, }: rustPlatform.buildRustPackage rec { pname = "zenoh"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh"; rev = version; - hash = "sha256-Ydmd3eCXn+svMak1I5LU4rJNhzEEc2MiG5MoSMNOJ00="; + hash = "sha256-5lFs/t1Otmp8C0j5LQN/GV19ukfLq4alBpgwsA934FU="; }; - cargoHash = "sha256-AjMgnZ+GJPGMQsyeOQGyXpVrdw2zb7B9/KXWKlvKT1Q="; + cargoHash = "sha256-NF131RKn3G5wINRMEkfgI5eE25gKlIsaZA98YN9ZWS8="; cargoBuildFlags = [ "--workspace" @@ -33,9 +34,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; - passthru.tests.version = testers.testVersion { - package = zenoh; - version = "v" + version; + passthru.tests = { + version = testers.testVersion { + package = zenoh; + version = "v" + version; + }; + zenohd = nixosTests.zenohd; }; meta = { diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 444ea101c050..2c28eaabbf35 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.6"; + version = "0.20.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; tag = "v${version}"; - hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE="; + hash = "sha256-tOX/KQrECeEV3/0q3tpO4brUdalmw6IincF6pHzsEE8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/napalm/ros.nix b/pkgs/development/python-modules/napalm/ros.nix new file mode 100644 index 000000000000..6b37f5437995 --- /dev/null +++ b/pkgs/development/python-modules/napalm/ros.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + napalm, + librouteros, + pytestCheckHook, + pythonAtLeast, +}: +buildPythonPackage rec { + pname = "napalm-ros"; + version = "1.2.6"; + pyproject = true; + + disabled = pythonAtLeast "3.13"; + + src = fetchFromGitHub { + owner = "napalm-automation-community"; + repo = "napalm-ros"; + tag = version; + hash = "sha256-Fv11Blx44vZZ8NuhQQIFpDr+dH2gDJtQP7b0kAk3U/s="; + }; + + build-system = [ setuptools ]; + + dependencies = [ librouteros ]; + + nativeCheckInputs = [ + napalm + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: Some methods vary. + "test_method_signatures" + ]; + + pythonImportsCheck = [ "napalm_ros" ]; + + meta = { + description = "MikroTik RouterOS NAPALM driver"; + homepage = "https://github.com/napalm-automation-community/napalm-ros"; + changelog = "https://github.com/napalm-automation-community/napalm-ros/releases/tag/${src.tag}"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix new file mode 100644 index 000000000000..b08b3a845198 --- /dev/null +++ b/pkgs/development/python-modules/netbox-dns/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dnspython, +}: +buildPythonPackage rec { + pname = "netbox-plugin-dns"; + version = "1.1.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "peteeckel"; + repo = "netbox-plugin-dns"; + tag = version; + hash = "sha256-wrVTsVKjGPJCIoSo6uuWtorJBjn4Kh2kYkBXxM88kCo"; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dnspython + ]; + + # pythonImportsCheck fails due to improperly configured django app + + meta = { + description = "Netbox plugin for managing DNS data"; + homepage = "https://github.com/peteeckel/netbox-plugin-dns"; + changelog = "https://github.com/peteeckel/netbox-plugin-dns/releases/tag/${src.tag}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix b/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix new file mode 100644 index 000000000000..41e9cc5c0d16 --- /dev/null +++ b/pkgs/development/python-modules/netbox-floorplan-plugin/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + pythonAtLeast, +}: +buildPythonPackage rec { + pname = "netbox-floorplan-plugin"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonAtLeast "3.13"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox-floorplan-plugin"; + tag = version; + hash = "sha256-cJrqSXRCBedZh/pIozz/bHyhQosTy8cFYyji3KJva9Q="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + pythonImportsCheck = [ "netbox_floorplan" ]; + + meta = with lib; { + description = "Netbox plugin providing floorplan mapping capability for locations and sites"; + homepage = "https://github.com/netbox-community/netbox-floorplan-plugin"; + changelog = "https://github.com/netbox-community/netbox-floorplan-plugin/releases/tag/${src.tag}"; + license = licenses.lgpl3; + maintainers = with maintainers; [ cobalt ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix new file mode 100644 index 000000000000..de537ae3fdc2 --- /dev/null +++ b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, +}: +buildPythonPackage rec { + pname = "netbox-interface-synchronization"; + version = "4.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NetTech2001"; + repo = "netbox-interface-synchronization"; + tag = version; + hash = "sha256-ikorJa5kCaVfxXsr8PSzuBME3PUc+UM+VDcq82WtDVs="; + }; + + build-system = [ setuptools ]; + + # netbox is required for the pythonImportsCheck; plugin does not provide unit tests + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + pythonImportsCheck = [ "netbox_interface_synchronization" ]; + + meta = { + description = "Netbox plugin to compare and synchronize interfaces between devices and device types"; + homepage = "https://github.com/NetTech2001/netbox-interface-synchronization"; + changelog = "https://github.com/NetTech2001/netbox-interface-synchronization/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix new file mode 100644 index 000000000000..d3b03558148e --- /dev/null +++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + pythonAtLeast, + napalm, +}: +buildPythonPackage rec { + pname = "netbox-napalm-plugin"; + version = "0.3.1"; + pyproject = true; + + disabled = pythonAtLeast "3.13"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox-napalm-plugin"; + rev = "v${version}"; + hash = "sha256-nog6DymnnD0ABzG21jy00yNWhSTHfd7vJ4vo1DjsfKs="; + }; + + build-system = [ setuptools ]; + + dependencies = [ napalm ]; + + nativeCheckInputs = [ netbox ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'napalm<5.0' 'napalm' + ''; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + pythonImportsCheck = [ "netbox_napalm_plugin" ]; + + meta = { + description = "Netbox plugin for Napalm integration"; + homepage = "https://github.com/netbox-community/netbox-napalm-plugin"; + changelog = "https://github.com/netbox-community/netbox-napalm-plugin/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix new file mode 100644 index 000000000000..cb00f63f6df7 --- /dev/null +++ b/pkgs/development/python-modules/netbox-topology-views/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + pythonAtLeast, +}: +buildPythonPackage rec { + pname = "netbox-topology-views"; + version = "4.1.0"; + pyproject = true; + + disabled = pythonAtLeast "3.13"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox-topology-views"; + rev = "v${version}"; + hash = "sha256-4ehIF6r4fCgBAaHImzofdQIywtD7ITQFP6DkHXHKMro="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + pythonImportsCheck = [ "netbox_topology_views" ]; + + meta = { + description = "Netbox plugin for generate topology views/maps from your devices"; + homepage = "https://github.com/netbox-community/netbox-topology-views"; + changelog = "https://github.com/netbox-community/netbox-topology-views/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 51cf9021c22c..53312c5fc25c 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.59.3"; + version = "1.59.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-gMykGfNgpTlh8LiFXL2p5ECSpeYCfS0LTsgHIzT1c1I="; + hash = "sha256-0NiueCUB5w4H1B5cXSyoO641DGB2J2rF2vGwPQSJJPM="; }; build-system = [ diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 121f64dd535b..db684def89bc 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -10,10 +10,10 @@ jsonpatch, keystoneauth1, munch, - netifaces, openstackdocstheme, os-service-types, pbr, + psutil, pythonOlder, pyyaml, requestsexceptions, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "4.0.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-54YN2WtwUxMJI8EdVx0lgCuWjx4xOIRct8rHxrMzv0s="; + hash = "sha256-XLlFDczoBUosr4nYvp5VBX3fohmpVOeBAyJB6ykoBEU="; }; postPatch = '' @@ -61,9 +61,9 @@ buildPythonPackage rec { jsonpatch keystoneauth1 munch - netifaces os-service-types pbr + psutil requestsexceptions pyyaml ]; diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix index 210a06acc4ab..9aad7913c8d8 100644 --- a/pkgs/development/python-modules/python-neutronclient/default.nix +++ b/pkgs/development/python-modules/python-neutronclient/default.nix @@ -35,20 +35,14 @@ buildPythonPackage rec { pname = "python-neutronclient"; - version = "11.3.1"; + version = "11.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-U82ZI/Q6OwdypA41YfdGVa3IA4+QJhqz3gW2IR0S7cs="; + hash = "sha256-h0Ehk2Lkv5wuQ/LmyuTUmR7Y+d+QY/Q0CKC2WLA9YuI="; }; - patches = [ - # fix wheel metadata to support python 3.12 - # based on https://github.com/openstack/python-neutronclient/commit/f882f1ddb60bcd77096eb8a74e9e86d10723e8be - ./python-3.12.diff - ]; - build-system = [ setuptools pbr diff --git a/pkgs/development/python-modules/python-neutronclient/python-3.12.diff b/pkgs/development/python-modules/python-neutronclient/python-3.12.diff deleted file mode 100644 index 2ff78436737e..000000000000 --- a/pkgs/development/python-modules/python-neutronclient/python-3.12.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- a/setup.cfg 2024-12-25 04:00:53.429397282 +0100 -+++ b/setup.cfg 2024-12-25 04:03:48.308447471 +0100 -@@ -6,7 +6,7 @@ - author = OpenStack Networking Project - author_email = openstack-discuss@lists.openstack.org - home_page = https://docs.openstack.org/python-neutronclient/latest/ --python_requires = >=3.8 -+python_requires = >=3.9 - classifier = - Environment :: OpenStack - Intended Audience :: Developers -@@ -18,8 +18,10 @@ - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3 -- Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 -+ Programming Language :: Python :: 3.10 -+ Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: 3.12 - - [files] - packages = diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix index 5c671398eed5..bbd3b5f4d02a 100644 --- a/pkgs/development/python-modules/python-octaviaclient/default.nix +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -7,8 +7,10 @@ fetchPypi, hacking, keystoneauth1, + makePythonPath, openstackclient, openstackdocstheme, + installer, osc-lib, oslotest, oslo-serialization, @@ -28,14 +30,20 @@ buildPythonPackage rec { pname = "python-octaviaclient"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wrYhCY3gqcklSK8lapsgFq25Yi3awEGgarW2a7W1kO4="; + hash = "sha256-cXReOIfgC5Fx5gT0vF/pV7QwEuC2YfnW4OE+m7nqr20="; }; + postPatch = '' + # somehow python-neutronclient cannot be found despite it being supplied + substituteInPlace requirements.txt \ + --replace-fail "python-neutronclient>=6.7.0" "" + ''; + build-system = [ setuptools pbr @@ -58,6 +66,11 @@ buildPythonPackage rec { requests ]; + preInstall = '' + # TODO: I have really no idea why installer is missing... + export PYTHONPATH=$PYTHONPATH:${makePythonPath [ installer ]} + ''; + nativeCheckInputs = [ hacking requests-mock @@ -73,6 +86,9 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + # TODO: no idea why PYTHONPATH is broken here + export PYTHONPATH=$PYTHONPATH:${makePythonPath nativeCheckInputs} + stestr run runHook postCheck @@ -82,7 +98,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenStack Octavia Command-line Client"; - homepage = "https://opendev.org/openstack/python-octaviaclient/"; + homepage = "https://github.com/openstack/python-octaviaclient"; license = licenses.asl20; maintainers = teams.openstack.members; }; diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index ffc946a56f54..b4c3731a76cb 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -4,6 +4,7 @@ fetchPypi, libcap, pytestCheckHook, + distutils, }: buildPythonPackage rec { @@ -18,7 +19,17 @@ buildPythonPackage rec { buildInputs = [ libcap ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + distutils + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace test_prctl.py \ + --replace-fail \ + 'sys.version[0:3]' \ + '"cpython-%d%d" % (sys.version_info.major, sys.version_info.minor)' + ''; disabledTests = [ # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6 diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index ea87dd8e7a3f..a38555846362 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -99,7 +99,9 @@ rec { varDefs = concatStringsSep "\n" ( map (x: " --set ${x} \\") ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs) ); - jnaLibraryPath = lib.makeLibraryPath [ udev ]; + jnaLibraryPath = if stdenv.hostPlatform.isLinux then lib.makeLibraryPath [ udev ] else ""; + jnaFlag = + if stdenv.hostPlatform.isLinux then "--add-flags \"-Djna.library.path=${jnaLibraryPath}\"" else ""; in '' mkdir -pv $out/lib/gradle/ @@ -109,7 +111,7 @@ rec { test -f $gradle_launcher_jar makeWrapper ${java}/bin/java $out/bin/gradle \ ${varDefs} - --add-flags "-Djna.library.path=${jnaLibraryPath}" \ + ${jnaFlag} \ --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}" ''; @@ -157,7 +159,7 @@ rec { # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses. echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies - echo ${udev} >> $out/nix-support/manual-runtime-dependencies + ${lib.optionalString stdenv.hostPlatform.isLinux "echo ${udev} >> $out/nix-support/manual-runtime-dependencies"} ''; passthru.tests = { diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 7f41d04321a8..57927aaad218 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -10,7 +10,7 @@ libidn, pkg-config, spidermonkey_78, - boost, + boost183, icu, libxml2, libpng, @@ -43,7 +43,7 @@ let # the game requires a special version 78.6.0 of spidermonkey, otherwise # we get compilation errors. We override the src attribute of spidermonkey_78 - # in order to reuse that declartion, while giving it a different source input. + # in order to reuse that declaration, while giving it a different source input. spidermonkey_78_6 = spidermonkey_78.overrideAttrs (old: rec { version = "78.6.0"; src = fetchurl { @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { buildInputs = [ spidermonkey_78_6 - boost + # boost 1.86 fails with the following error: + # error: 'boost::filesystem::wpath' {aka 'class boost::filesystem::path'} has no member named 'leaf' + boost183 icu libxml2 libpng @@ -106,6 +108,8 @@ stdenv.mkDerivation rec { "-I${SDL2}/include/SDL2" "-I${fmt.dev}/include" "-I${nvidia-texture-tools.dev}/include" + # TODO: drop with next update + "-Wno-error=implicit-function-declaration" ]; NIX_CFLAGS_LINK = toString [ diff --git a/pkgs/servers/akkoma/0001-fix-tzdata.patch b/pkgs/servers/akkoma/0001-fix-tzdata.patch deleted file mode 100644 index 95360f1adf5d..000000000000 --- a/pkgs/servers/akkoma/0001-fix-tzdata.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/mix.lock b/mix.lock -index 810356345..99a5a92c3 100644 ---- a/mix.lock -+++ b/mix.lock -@@ -75,7 +75,7 @@ - "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, - "mfm_parser": {:git, "https://akkoma.dev/AkkomaGang/mfm-parser.git", "b21ab7754024af096f2d14247574f55f0063295b", [ref: "b21ab7754024af096f2d14247574f55f0063295b"]}, - "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"}, -- "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, -+ "mimerl": {:hex, :mimerl, "1.3.0", "d0cd9fc04b9061f82490f6581e0128379830e78535e017f7780f37fea7545726", [:rebar3], [], "hexpm", "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"}, - "mint": {:hex, :mint, "1.5.2", "4805e059f96028948870d23d7783613b7e6b0e2fb4e98d720383852a760067fd", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "d77d9e9ce4eb35941907f1d3df38d8f750c357865353e21d335bdcdf6d892a02"}, - "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"}, - "mogrify": {:hex, :mogrify, "0.9.3", "238c782f00271dace01369ad35ae2e9dd020feee3443b9299ea5ea6bed559841", [:mix], [], "hexpm", "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"}, -@@ -123,7 +123,7 @@ - "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"}, - "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"}, - "trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"}, -- "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"}, -+ "tzdata": {:hex, :tzdata, "1.1.2", "45e5f1fcf8729525ec27c65e163be5b3d247ab1702581a94674e008413eef50b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cec7b286e608371602318c414f344941d5eb0375e14cfdab605cca2fe66cba8b"}, - "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"}, - "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, - "unsafe": {:hex, :unsafe, "1.0.2", "23c6be12f6c1605364801f4b47007c0c159497d0446ad378b5cf05f1855c0581", [:mix], [], "hexpm", "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"}, diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 54d4a8633286..4c12179bfae3 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -10,18 +10,16 @@ }: beamPackages.mixRelease rec { pname = "akkoma"; - version = "3.13.2"; + version = "3.14.1"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; rev = "v${version}"; - hash = "sha256-WZAkpJIPzAbqXawNiM3JqE9tJzxrNs/2dGAWVMwLpN4="; + hash = "sha256-Ygb51jQatdyX/DzJk84X1AEliBGD938f83UnI5OqBPM="; }; - patches = [ ./0001-fix-tzdata.patch ]; - postPatch = '' # Remove dependency on OS_Mon sed -E -i 's/(^|\s):os_mon,//' \ @@ -31,7 +29,7 @@ beamPackages.mixRelease rec { postBuild = '' # Digest and compress static files rm -f priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE - mix phx.digest --no-deps-check + mix phx.digest --no-compile ''; mixNixDeps = import ./mix.nix { @@ -76,8 +74,8 @@ beamPackages.mixRelease rec { group = "pleroma"; owner = "elixir-libraries"; repo = "elixir-captcha"; - rev = "90f6ce7672f70f56708792a98d98bd05176c9176"; - hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po="; + rev = "6630c42aaaab124e697b4e513190c89d8b64e410"; + hash = "sha256-KLsKBfCt6bUylSTTqRQi6ic0MyimanvIZRhU4Iv5Fmw="; }; # the binary is not getting installed by default @@ -107,21 +105,9 @@ beamPackages.mixRelease rec { hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; }; }; - linkify = beamPackages.buildMix rec { - name = "linkify"; - version = "0.5.2"; - - src = fetchFromGitea { - domain = "akkoma.dev"; - owner = "AkkomaGang"; - repo = "linkify"; - rev = "2567e2c1073fa371fd26fd66dfa5bc77b6919c16"; - hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg="; - }; - }; mfm_parser = beamPackages.buildMix rec { name = "mfm_parser"; - version = "0.1.1"; + version = "0.1.0"; src = fetchFromGitea { domain = "akkoma.dev"; @@ -171,14 +157,14 @@ beamPackages.mixRelease rec { }; http_signatures = beamPackages.buildMix rec { name = "http_signatures"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "http_signatures"; - rev = "6640ce7d24c783ac2ef56e27d00d12e8dc85f396"; - hash = "sha256-Q/IoVbM/TBgGCmx8AxiBHF2hARb0FbPml8N1HjN3CsE="; + rev = "d44c43d66758c6a73eaa4da9cffdbee0c5da44ae"; + hash = "sha256-o5xF++AIJLVMFuQwldNyWpYJGWFHZZTfGy1V80TZzR8="; }; beamDeps = with final; [ credo ex_doc dialyxir temple ]; @@ -189,7 +175,7 @@ beamPackages.mixRelease rec { }; majic = beamPackages.buildMix { name = "majic"; - version = "0.1.2"; + version = "1.0.0"; src = fetchFromGitea { domain = "akkoma.dev"; @@ -219,11 +205,11 @@ beamPackages.mixRelease rec { elixirPackage = beamPackages.elixir; }; - meta = with lib; { + meta = { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ mvs ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix index 7e124660939b..bf67c1b04a30 100644 --- a/pkgs/servers/akkoma/mix.nix +++ b/pkgs/servers/akkoma/mix.nix @@ -62,12 +62,12 @@ let benchee = buildMix rec { name = "benchee"; - version = "1.2.0"; + version = "1.3.1"; src = fetchHex { pkg = "benchee"; version = "${version}"; - sha256 = "ee729e53217898b8fd30aaad3cce61973dab61574ae6f48229fe7ff42d5e4457"; + sha256 = "76224c58ea1d0391c8309a8ecbfe27d71062878f59bd41a390266bf4ac1cc56d"; }; beamDeps = [ deep_merge statistex ]; @@ -75,12 +75,12 @@ let bunt = buildMix rec { name = "bunt"; - version = "0.2.1"; + version = "1.0.0"; src = fetchHex { pkg = "bunt"; version = "${version}"; - sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; + sha256 = "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"; }; beamDeps = []; @@ -114,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.5"; + version = "1.0.9"; src = fetchHex { pkg = "castore"; version = "${version}"; - sha256 = "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"; + sha256 = "5ea956504f1ba6f2b4eb707061d8e17870de2bee95fb59d512872c2ef06925e7"; }; beamDeps = []; @@ -153,12 +153,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.4.0"; + version = "5.5.0"; src = fetchHex { pkg = "comeonin"; version = "${version}"; - sha256 = "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"; + sha256 = "6287fc3ba0aad34883cbe3f7949fc1d1e738e5ccdce77165bc99490aa69f47fb"; }; beamDeps = []; @@ -192,12 +192,12 @@ let cowboy = buildErlangMk rec { name = "cowboy"; - version = "2.10.0"; + version = "2.12.0"; src = fetchHex { pkg = "cowboy"; version = "${version}"; - sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; + sha256 = "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"; }; beamDeps = [ cowlib ranch ]; @@ -218,12 +218,12 @@ let cowlib = buildRebar3 rec { name = "cowlib"; - version = "2.12.1"; + version = "2.13.0"; src = fetchHex { pkg = "cowlib"; version = "${version}"; - sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; + sha256 = "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"; }; beamDeps = []; @@ -231,12 +231,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.1"; + version = "1.7.8"; src = fetchHex { pkg = "credo"; version = "${version}"; - sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; + sha256 = "cb9e87cc64f152f3ed1c6e325e7b894dea8f5ef2e41123bd864e3cd5ceb44968"; }; beamDeps = [ bunt file_system jason ]; @@ -257,12 +257,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.6.0"; + version = "2.7.0"; src = fetchHex { pkg = "db_connection"; version = "${version}"; - sha256 = "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"; + sha256 = "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"; }; beamDeps = [ telemetry ]; @@ -296,12 +296,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.4.2"; + version = "1.4.4"; src = fetchHex { pkg = "dialyxir"; version = "${version}"; - sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; + sha256 = "cd6111e8017ccd563e65621a4d9a4a1c5cd333df30cebc7face8029cacb4eff6"; }; beamDeps = [ erlex ]; @@ -322,12 +322,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.39"; + version = "1.4.41"; src = fetchHex { pkg = "earmark_parser"; version = "${version}"; - sha256 = "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"; + sha256 = "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto_psql_extras = buildMix rec { name = "ecto_psql_extras"; - version = "0.7.14"; + version = "0.8.2"; src = fetchHex { pkg = "ecto_psql_extras"; version = "${version}"; - sha256 = "22f5f98592dd597db9416fcef00effae0787669fdcb6faf447e982b553798e98"; + sha256 = "6149c1c4a5ba6602a76cb09ee7a269eb60dab9694a1dbbb797f032555212de75"; }; beamDeps = [ ecto_sql postgrex table_rex ]; @@ -400,25 +400,25 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.7.7"; + version = "0.8.4"; src = fetchHex { pkg = "elixir_make"; version = "${version}"; - sha256 = "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"; + sha256 = "6e7f1d619b5f61dfabd0a20aa268e575572b542ac31723293a4c1a567d5ef040"; }; - beamDeps = [ castore ]; + beamDeps = [ castore certifi ]; }; elixir_xml_to_map = buildMix rec { name = "elixir_xml_to_map"; - version = "3.0.0"; + version = "3.1.0"; src = fetchHex { pkg = "elixir_xml_to_map"; version = "${version}"; - sha256 = "11222dd7f029f8db7a6662b41c992dbdb0e1c6e4fdea6a42056f9d27c847efbb"; + sha256 = "8fe5f2e75f90bab07ee2161120c2dc038ebcae8135554f5582990f1c8c21f911"; }; beamDeps = [ erlsom ]; @@ -426,12 +426,12 @@ let erlex = buildMix rec { name = "erlex"; - version = "0.2.6"; + version = "0.2.7"; src = fetchHex { pkg = "erlex"; version = "${version}"; - sha256 = "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"; + sha256 = "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"; }; beamDeps = []; @@ -465,12 +465,12 @@ let ex_aws = buildMix rec { name = "ex_aws"; - version = "2.5.0"; + version = "2.5.6"; src = fetchHex { pkg = "ex_aws"; version = "${version}"; - sha256 = "971b86e5495fc0ae1c318e35e23f389e74cf322f2c02d34037c6fc6d405006f1"; + sha256 = "c69eec59e31fdd89d0beeb1d97e16518dd1b23ad95b3d5c9f1dcfec23d97f960"; }; beamDeps = [ hackney jason mime sweet_xml telemetry ]; @@ -478,12 +478,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.5.2"; + version = "2.5.4"; src = fetchHex { pkg = "ex_aws_s3"; version = "${version}"; - sha256 = "cc5bd945a22a99eece4721d734ae2452d3717e81c357a781c8574663254df4a1"; + sha256 = "c06e7f68b33f7c0acba1361dbd951c79661a28f85aa2e0582990fccca4425355"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -491,12 +491,12 @@ let ex_const = buildMix rec { name = "ex_const"; - version = "0.2.4"; + version = "0.3.0"; src = fetchHex { pkg = "ex_const"; version = "${version}"; - sha256 = "96fd346610cc992b8f896ed26a98be82ac4efb065a0578f334a32d60a3ba9767"; + sha256 = "76546322abb9e40ee4a2f454cf1c8a5b25c3672fa79bed1ea52c31e0d2428ca9"; }; beamDeps = []; @@ -504,12 +504,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.31.0"; + version = "0.34.2"; src = fetchHex { pkg = "ex_doc"; version = "${version}"; - sha256 = "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"; + sha256 = "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -517,12 +517,12 @@ let ex_machina = buildMix rec { name = "ex_machina"; - version = "2.7.0"; + version = "2.8.0"; src = fetchHex { pkg = "ex_machina"; version = "${version}"; - sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; + sha256 = "79fe1a9c64c0c1c1fab6c4fa5d871682cb90de5885320c187d117004627a7729"; }; beamDeps = [ ecto ecto_sql ]; @@ -569,12 +569,12 @@ let fast_html = buildMix rec { name = "fast_html"; - version = "2.2.0"; + version = "2.3.0"; src = fetchHex { pkg = "fast_html"; version = "${version}"; - sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; + sha256 = "f18e3c7668f82d3ae0b15f48d48feeb257e28aa5ab1b0dbf781c7312e5da029d"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -595,12 +595,12 @@ let file_system = buildMix rec { name = "file_system"; - version = "0.2.10"; + version = "1.0.1"; src = fetchHex { pkg = "file_system"; version = "${version}"; - sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; + sha256 = "4414d1f38863ddf9120720cd976fce5bdde8e91d8283353f0e31850fa89feb9e"; }; beamDeps = []; @@ -608,12 +608,12 @@ let finch = buildMix rec { name = "finch"; - version = "0.16.0"; + version = "0.18.0"; src = fetchHex { pkg = "finch"; version = "${version}"; - sha256 = "f660174c4d519e5fec629016054d60edd822cdfe2b7270836739ac2f97735ec5"; + sha256 = "69f5045b042e531e53edc2574f15e25e735b522c37e2ddb766e15b979e03aa65"; }; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; @@ -634,12 +634,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.35.2"; + version = "0.36.3"; src = fetchHex { pkg = "floki"; version = "${version}"; - sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; + sha256 = "fe0158bff509e407735f6d40b3ee0d7deb47f3f3ee7c6c182ad28599f9f6b27a"; }; beamDeps = []; @@ -738,12 +738,12 @@ let inet_cidr = buildMix rec { name = "inet_cidr"; - version = "1.0.4"; + version = "1.0.8"; src = fetchHex { pkg = "inet_cidr"; version = "${version}"; - sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; + sha256 = "d5b26da66603bb56c933c65214c72152f0de9a6ea53618b56d63302a68f6a90e"; }; beamDeps = []; @@ -751,12 +751,12 @@ let jason = buildMix rec { name = "jason"; - version = "1.4.1"; + version = "1.4.4"; src = fetchHex { pkg = "jason"; version = "${version}"; - sha256 = "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"; + sha256 = "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"; }; beamDeps = [ decimal ]; @@ -764,12 +764,12 @@ let joken = buildMix rec { name = "joken"; - version = "2.6.0"; + version = "2.6.2"; src = fetchHex { pkg = "joken"; version = "${version}"; - sha256 = "5a95b05a71cd0b54abd35378aeb1d487a23a52c324fa7efdffc512b655b5aaa7"; + sha256 = "5134b5b0a6e37494e46dbf9e4dad53808e5e787904b7c73972651b51cce3d72b"; }; beamDeps = [ jose ]; @@ -777,12 +777,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.6"; + version = "1.11.10"; src = fetchHex { pkg = "jose"; version = "${version}"; - sha256 = "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"; + sha256 = "0d6cd36ff8ba174db29148fc112b5842186b68a90ce9fc2b3ec3afe76593e614"; }; beamDeps = []; @@ -801,14 +801,27 @@ let beamDeps = []; }; + linkify = buildMix rec { + name = "linkify"; + version = "0.5.3"; + + src = fetchHex { + pkg = "linkify"; + version = "${version}"; + sha256 = "3ef35a1377d47c25506e07c1c005ea9d38d700699d92ee92825f024434258177"; + }; + + beamDeps = []; + }; + mail = buildMix rec { name = "mail"; - version = "0.3.1"; + version = "0.4.2"; src = fetchHex { pkg = "mail"; version = "${version}"; - sha256 = "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"; + sha256 = "08e5b70c72b8d1605cb88ef2df2c7e41d002210a621503ea1c13f1a7916b6bd3"; }; beamDeps = []; @@ -816,12 +829,12 @@ let makeup = buildMix rec { name = "makeup"; - version = "1.1.1"; + version = "1.1.2"; src = fetchHex { pkg = "makeup"; version = "${version}"; - sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"; + sha256 = "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"; }; beamDeps = [ nimble_parsec ]; @@ -829,12 +842,12 @@ let makeup_elixir = buildMix rec { name = "makeup_elixir"; - version = "0.16.1"; + version = "0.16.2"; src = fetchHex { pkg = "makeup_elixir"; version = "${version}"; - sha256 = "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"; + sha256 = "41193978704763f6bbe6cc2758b84909e62984c7752b3784bd3c218bb341706b"; }; beamDeps = [ makeup nimble_parsec ]; @@ -842,12 +855,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.3"; + version = "1.0.1"; src = fetchHex { pkg = "makeup_erlang"; version = "${version}"; - sha256 = "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"; + sha256 = "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"; }; beamDeps = [ makeup ]; @@ -881,12 +894,12 @@ let mime = buildMix rec { name = "mime"; - version = "2.0.5"; + version = "2.0.6"; src = fetchHex { pkg = "mime"; version = "${version}"; - sha256 = "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"; + sha256 = "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"; }; beamDeps = []; @@ -946,25 +959,38 @@ let mox = buildMix rec { name = "mox"; - version = "1.1.0"; + version = "1.2.0"; src = fetchHex { pkg = "mox"; version = "${version}"; - sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; + sha256 = "c7b92b3cc69ee24a7eeeaf944cd7be22013c52fcb580c1f33f50845ec821089a"; + }; + + beamDeps = [ nimble_ownership ]; + }; + + nimble_options = buildMix rec { + name = "nimble_options"; + version = "1.1.1"; + + src = fetchHex { + pkg = "nimble_options"; + version = "${version}"; + sha256 = "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"; }; beamDeps = []; }; - nimble_options = buildMix rec { - name = "nimble_options"; - version = "1.1.0"; + nimble_ownership = buildMix rec { + name = "nimble_ownership"; + version = "1.0.0"; src = fetchHex { - pkg = "nimble_options"; + pkg = "nimble_ownership"; version = "${version}"; - sha256 = "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"; + sha256 = "7c16cc74f4e952464220a73055b557a273e8b1b7ace8489ec9d86e9ad56cb2cc"; }; beamDeps = []; @@ -985,12 +1011,12 @@ let nimble_pool = buildMix rec { name = "nimble_pool"; - version = "1.0.0"; + version = "1.1.0"; src = fetchHex { pkg = "nimble_pool"; version = "${version}"; - sha256 = "80be3b882d2d351882256087078e1b1952a28bf98d0a287be87e4a24a710b67a"; + sha256 = "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"; }; beamDeps = []; @@ -998,12 +1024,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.4"; + version = "2.17.12"; src = fetchHex { pkg = "oban"; version = "${version}"; - sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; + sha256 = "7a647d6cd6bb300073db17faabce22d80ae135da3baf3180a064fa7c4fa046e3"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1011,15 +1037,15 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.18.0"; + version = "3.21.2"; src = fetchHex { pkg = "open_api_spex"; version = "${version}"; - sha256 = "37849887ab67efab052376401fac28c0974b273ffaecd98f4532455ca0886464"; + sha256 = "f42ae6ed668b895ebba3e02773cfb4b41050df26f803f2ef634c72a7687dc387"; }; - beamDeps = [ jason plug poison ]; + beamDeps = [ decimal jason plug poison ]; }; parse_trans = buildRebar3 rec { @@ -1037,12 +1063,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.7.10"; + version = "1.7.14"; src = fetchHex { pkg = "phoenix"; version = "${version}"; - sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; + sha256 = "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1050,25 +1076,25 @@ let phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.3"; + version = "4.6.3"; src = fetchHex { pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; + sha256 = "909502956916a657a197f94cc1206d9a65247538de8a5e186f7537c895d95764"; }; - beamDeps = [ ecto phoenix_html plug ]; + beamDeps = [ ecto phoenix_html plug postgrex ]; }; phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.3"; + version = "3.3.4"; src = fetchHex { pkg = "phoenix_html"; version = "${version}"; - sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"; + sha256 = "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"; }; beamDeps = [ plug ]; @@ -1115,12 +1141,12 @@ let phoenix_swoosh = buildMix rec { name = "phoenix_swoosh"; - version = "1.2.0"; + version = "1.2.1"; src = fetchHex { pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; + sha256 = "4000eeba3f9d7d1a6bf56d2bd56733d5cadf41a7f0d8ffe5bb67e7d667e204a2"; }; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1128,12 +1154,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.3"; + version = "1.0.4"; src = fetchHex { pkg = "phoenix_template"; version = "${version}"; - sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"; + sha256 = "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"; }; beamDeps = [ phoenix_html ]; @@ -1141,12 +1167,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.3"; + version = "2.0.4"; src = fetchHex { pkg = "phoenix_view"; version = "${version}"; - sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"; + sha256 = "4e992022ce14f31fe57335db27a28154afcc94e9983266835bb3040243eb620b"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1154,12 +1180,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.15.2"; + version = "1.16.1"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; + sha256 = "a13ff6b9006b03d7e33874945b2755253841b238c34071ed85b0e86057f8cddc"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1167,12 +1193,12 @@ let plug_cowboy = buildMix rec { name = "plug_cowboy"; - version = "2.6.1"; + version = "2.7.2"; src = fetchHex { pkg = "plug_cowboy"; version = "${version}"; - sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; + sha256 = "245d8a11ee2306094840c000e8816f0cbed69a23fc0ac2bcf8d7835ae019bb2f"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1180,12 +1206,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "2.0.0"; + version = "2.1.0"; src = fetchHex { pkg = "plug_crypto"; version = "${version}"; - sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"; + sha256 = "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"; }; beamDeps = []; @@ -1232,12 +1258,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.17.4"; + version = "0.17.5"; src = fetchHex { pkg = "postgrex"; version = "${version}"; - sha256 = "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"; + sha256 = "50b8b11afbb2c4095a3ba675b4f055c416d0f3d7de6633a595fc131a828a67eb"; }; beamDeps = [ db_connection decimal jason ]; @@ -1271,12 +1297,12 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.4"; + version = "2.5.6"; src = fetchHex { pkg = "recon"; version = "${version}"; - sha256 = "e9ab01ac7fc8572e41eb59385efeb3fb0ff5bf02103816535bacaedf327d0263"; + sha256 = "96c6799792d735cc0f0fd0f86267e9d351e63339cbe03df9d162010cefc26bb0"; }; beamDeps = []; @@ -1297,12 +1323,12 @@ let sleeplocks = buildRebar3 rec { name = "sleeplocks"; - version = "1.1.2"; + version = "1.1.3"; src = fetchHex { pkg = "sleeplocks"; version = "${version}"; - sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; + sha256 = "d3b3958552e6eb16f463921e70ae7c767519ef8f5be46d7696cc1ed649421321"; }; beamDeps = []; @@ -1349,12 +1375,12 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.14.2"; + version = "1.14.4"; src = fetchHex { pkg = "swoosh"; version = "${version}"; - sha256 = "01d8fae72930a0b5c1bb9725df0408602ed8c5c3d59dc6e7a39c57b723cd1065"; + sha256 = "081c5a590e4ba85cc89baddf7b2beecf6c13f7f84a958f1cd969290815f0f026"; }; beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug plug_cowboy telemetry ]; @@ -1375,12 +1401,12 @@ let table_rex = buildMix rec { name = "table_rex"; - version = "3.1.1"; + version = "4.0.0"; src = fetchHex { pkg = "table_rex"; version = "${version}"; - sha256 = "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"; + sha256 = "c35c4d5612ca49ebb0344ea10387da4d2afe278387d4019e4d8111e815df8f55"; }; beamDeps = []; @@ -1388,12 +1414,12 @@ let telemetry = buildRebar3 rec { name = "telemetry"; - version = "1.2.1"; + version = "1.3.0"; src = fetchHex { pkg = "telemetry"; version = "${version}"; - sha256 = "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"; + sha256 = "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"; }; beamDeps = []; @@ -1401,12 +1427,12 @@ let telemetry_metrics = buildMix rec { name = "telemetry_metrics"; - version = "0.6.1"; + version = "0.6.2"; src = fetchHex { pkg = "telemetry_metrics"; version = "${version}"; - sha256 = "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"; + sha256 = "9b43db0dc33863930b9ef9d27137e78974756f5f198cae18409970ed6fa5b561"; }; beamDeps = [ telemetry ]; @@ -1440,12 +1466,12 @@ let telemetry_poller = buildRebar3 rec { name = "telemetry_poller"; - version = "1.0.0"; + version = "1.1.0"; src = fetchHex { pkg = "telemetry_poller"; version = "${version}"; - sha256 = "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"; + sha256 = "9eb9d9cbfd81cbd7cdd24682f8711b6e2b691289a0de6826e58452f28c103c8f"; }; beamDeps = [ telemetry ]; @@ -1453,15 +1479,15 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.8.0"; + version = "1.13.0"; src = fetchHex { pkg = "tesla"; version = "${version}"; - sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"; + sha256 = "7b8fc8f6b0640fa0d090af7889d12eb396460e044b6f8688a8e55e30406a2200"; }; - beamDeps = [ castore finch hackney jason mime mint poison telemetry ]; + beamDeps = [ castore finch hackney jason mime mint mox poison telemetry ]; }; timex = buildMix rec { @@ -1544,12 +1570,12 @@ let vex = buildMix rec { name = "vex"; - version = "0.9.1"; + version = "0.9.2"; src = fetchHex { pkg = "vex"; version = "${version}"; - sha256 = "a0f9f3959d127ad6a6a617c3f607ecfb1bc6f3c59f9c3614a901a46d1765bafe"; + sha256 = "76e709a9762e98c6b462dfce92e9b5dfbf712839227f2da8add6dd11549b12cb"; }; beamDeps = []; @@ -1583,12 +1609,12 @@ let websock_adapter = buildMix rec { name = "websock_adapter"; - version = "0.5.5"; + version = "0.5.7"; src = fetchHex { pkg = "websock_adapter"; version = "${version}"; - sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; + sha256 = "d0f478ee64deddfec64b800673fd6e0c8888b079d9f3444dd96d2a98383bdbd1"; }; beamDeps = [ plug plug_cowboy websock ]; diff --git a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix new file mode 100644 index 000000000000..b95ac46d9fca --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + aiofiles, + bcrypt, + jinja2, + python-jose, +}: + +buildHomeAssistantComponent rec { + owner = "christaangoossens"; + domain = "auth_oidc"; + version = "0.5.1-alpha"; + + src = fetchFromGitHub { + owner = "christiaangoossens"; + repo = "hass-oidc-auth"; + tag = "v${version}"; + hash = "sha256-GT82LWzfZzmCACS51mJctT/NeCTckJsJGl3x+wCQGjs="; + }; + + dependencies = [ + aiofiles + bcrypt + jinja2 + python-jose + ]; + + meta = { + changelog = "https://github.com/christiaangoossens/hass-oidc-auth/releases/tag/v${version}"; + description = "OpenID Connect authentication provider for Home Assistant"; + homepage = "https://github.com/christiaangoossens/hass-oidc-auth"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c82a53cf8c55..d12ba27586ca 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -65,14 +65,14 @@ in }; nextcloud29 = generic { - version = "29.0.10"; - hash = "sha256-pYY9nxOvF38n2IMxf5bD0XbnscpwsN3XlYSUWCtJRXc="; + version = "29.0.11"; + hash = "sha256-UGf8F91zICzC39m5ccp7uUy5UEghRgJ9rGILEjweztE="; packages = nextcloud29Packages; }; nextcloud30 = generic { - version = "30.0.4"; - hash = "sha256-62qrqazvRC8rPkqZa37ope0kRC+bumgSN/so7ZcOH6U="; + version = "30.0.5"; + hash = "sha256-JIxubmEs7usXDE0luFebCvDmYTq9+gfy/mmTQmt4G+o="; packages = nextcloud30Packages; }; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 8b88e94b5e1b..6267021e208c 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -34,6 +34,7 @@ , xcb-imdkit , libxkbfile , nixosTests +, gettext }: let enDictVer = "20121020"; @@ -62,9 +63,11 @@ stdenv.mkDerivation rec { extra-cmake-modules pkg-config wayland-scanner + gettext ]; buildInputs = [ + extra-cmake-modules # required to please CMake expat fmt isocodes @@ -94,6 +97,8 @@ stdenv.mkDerivation rec { libxkbfile ]; + strictDeps = true; + passthru = { updateScript = ./update.py; tests = { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index a9c3d561561c..b604a7e838bf 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext # msgfmt pkg-config zstd ]; buildInputs = [ fcitx5 anthy - gettext ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index bc8da47b5e37..101db511b155 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -6,6 +6,7 @@ cmake, extra-cmake-modules, boost, + gettext, libime, fcitx5, fcitx5-qt, @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - boost + gettext fcitx5-lua ]; @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ + boost fcitx5 fcitx5-qt libime diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 3f4eeb16855a..ec040d344998 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext ]; buildInputs = [ fcitx5 lua - gettext ]; passthru = { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 0028eb5fc4e6..e7ada4963a1a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -5,6 +5,7 @@ cmake, extra-cmake-modules, fcitx5, + gettext, qtbase, qtwayland, wrapQtAppsHook, @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 467321147145..4d8845c0c2d3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -26,10 +26,13 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext libime - boost fcitx5 ]; + buildInputs = [ + boost + ]; + meta = with lib; { description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; homepage = "https://github.com/fcitx/fcitx5-table-extra"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 5dc95a6186d5..8a584ec67202 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -26,10 +26,13 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext libime - boost fcitx5 ]; + buildInputs = [ + boost + ]; + meta = with lib; { description = "Some other tables for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-table-other"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index d0d4f515fafe..07ae7b36fb77 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + gettext # msgfmt ]; buildInputs = [ qtbase fcitx5 fcitx5-qt - gettext ]; cmakeFlags = [ diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 55666e349a0d..f2846c846abf 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -106,11 +106,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "284"; + version = "285"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-e30JIFoRxPc3+EVCLoaUbHSZd1EjHMpZ/2k6uYg9tPg="; + hash = "sha256-OTS4Lr2OF1mdIAiPGK31Ptc/gr3D216Z1kvKOMNeaJI="; }; outputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66c667f53249..8c4a818ac9b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9058,6 +9058,8 @@ self: super: with self; { napalm-hp-procurve = callPackage ../development/python-modules/napalm/hp-procurve.nix { }; + napalm-ros = callPackage ../development/python-modules/napalm/ros.nix { }; + napari = callPackage ../development/python-modules/napari { inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook; }; @@ -9160,14 +9162,24 @@ self: super: with self; { netbox-bgp = callPackage ../development/python-modules/netbox-bgp { }; + netbox-dns = callPackage ../development/python-modules/netbox-dns { }; + netbox-documents = callPackage ../development/python-modules/netbox-documents { }; + netbox-floorplan-plugin = callPackage ../development/python-modules/netbox-floorplan-plugin { }; + + netbox-interface-synchronization = callPackage ../development/python-modules/netbox-interface-synchronization { }; + + netbox-napalm-plugin = callPackage ../development/python-modules/netbox-napalm-plugin { }; + netbox-plugin-prometheus-sd = callPackage ../development/python-modules/netbox-plugin-prometheus-sd { }; netbox-qrcode = callPackage ../development/python-modules/netbox-qrcode { }; netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { }; + netbox-topology-views = callPackage ../development/python-modules/netbox-topology-views { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; netdata = callPackage ../development/python-modules/netdata { };