mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
2456ad7686
101 changed files with 2560 additions and 1879 deletions
4
.github/workflows/periodic-merge-24h.yml
vendored
4
.github/workflows/periodic-merge-24h.yml
vendored
|
|
@ -35,10 +35,14 @@ jobs:
|
|||
into: staging-next-25.11
|
||||
- from: staging-next-25.11
|
||||
into: staging-25.11
|
||||
- from: release-25.11
|
||||
into: staging-nixos-25.11
|
||||
- from: release-26.05
|
||||
into: staging-next-26.05
|
||||
- from: staging-next-26.05
|
||||
into: staging-26.05
|
||||
- from: release-26.05
|
||||
into: staging-nixos-26.05
|
||||
- name: merge-base(master,staging) → haskell-updates
|
||||
from: master staging
|
||||
into: haskell-updates
|
||||
|
|
|
|||
|
|
@ -442,6 +442,7 @@ The staging workflow is used for all stable branches with corresponding names:
|
|||
- `master`/`release-YY.MM`
|
||||
- `staging`/`staging-YY.MM`
|
||||
- `staging-next`/`staging-next-YY.MM`
|
||||
- `staging-nixos`/`staging-nixos-YY.MM`
|
||||
|
||||
[^1]: Except changes that cause no more rebuilds than kernel updates
|
||||
|
||||
|
|
@ -505,7 +506,7 @@ These PRs go to `staging-nixos`, see [the next section for more context](#change
|
|||
Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
|
||||
These changes pose a significant impact on the build infrastructure.
|
||||
|
||||
Hence, these PRs should either target a `staging`-branch or `staging-nixos`, provided one of following conditions applies:
|
||||
Hence, these PRs should either target a `staging`-branch or `staging-nixos`-branch, provided one of following conditions applies:
|
||||
|
||||
* The label `10.rebuild-nixos-tests` is set, or
|
||||
* The PR is a change affecting the Linux kernel.
|
||||
|
|
|
|||
|
|
@ -102,9 +102,8 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
|||
changed.attrdiff.changed.includes('nixosTests.simple-container') ||
|
||||
changed.attrdiff.changed.includes('nixosTests.simple-vm')
|
||||
|
||||
// https://github.com/NixOS/nixpkgs/pull/481205#issuecomment-3790123921
|
||||
// These should go to staging-nixos instead of master,
|
||||
// but release-xx.xx (not staging-xx.xx) when backported
|
||||
// https://github.com/NixOS/nixpkgs/pull/521157
|
||||
// These should go to master and release-xx.xx when backported
|
||||
let isExemptKernelUpdate = false
|
||||
if (prInfo.changed_files === 1) {
|
||||
const changedFiles = (
|
||||
|
|
@ -115,11 +114,8 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
|||
).data
|
||||
isExemptKernelUpdate =
|
||||
changedFiles.length === 1 &&
|
||||
(changedFiles[0].filename ===
|
||||
'pkgs/os-specific/linux/kernel/xanmod-kernels.nix' ||
|
||||
(base.startsWith('release-') &&
|
||||
changedFiles[0].filename ===
|
||||
'pkgs/os-specific/linux/kernel/kernels-org.json'))
|
||||
changedFiles[0].filename ===
|
||||
'pkgs/os-specific/linux/kernel/xanmod-kernels.nix'
|
||||
}
|
||||
|
||||
// https://github.com/NixOS/nixpkgs/pull/483194#issuecomment-3793393218
|
||||
|
|
@ -164,8 +160,10 @@ async function checkTargetBranch({ github, context, core, dry }) {
|
|||
branchText = '(probably either `staging-nixos` or `staging`)'
|
||||
} else if (base === 'master') {
|
||||
branchText = '(probably `staging-nixos`)'
|
||||
} else if (maxRebuildCount >= 500) {
|
||||
branchText = `(probably either \`staging-nixos-${split(base).version}\` or \`staging-${split(base).version}\`)`
|
||||
} else {
|
||||
branchText = `(probably \`staging-${split(base).version}\`)`
|
||||
branchText = `(probably \`staging-nixos-${split(base).version}\`)`
|
||||
}
|
||||
const body = [
|
||||
`The PR's base branch is set to \`${base}\`, but this PR rebuilds all NixOS tests.`,
|
||||
|
|
|
|||
|
|
@ -6,46 +6,68 @@ In this document and related Nix expressions, we use the term, _BEAM_, to descri
|
|||
|
||||
## Available versions and deprecations schedule {#available-versions-and-deprecations-schedule}
|
||||
|
||||
### Erlang OTP {#erlang}
|
||||
|
||||
Nixpkgs follows upstream Erlang in their [support lifecycle](https://erlang.org/download/otp_versions_tree.html) and keeps up to the last 3 released versions of Erlang available. Due to upstream and NixOS release timings, this may mean removal of the oldest release prior to upstream fully dropping support.
|
||||
|
||||
### Elixir {#elixir}
|
||||
|
||||
Nixpkgs follows the [official elixir deprecation schedule](https://hexdocs.pm/elixir/compatibility-and-deprecations.html) and keeps the last 5 released versions of Elixir available.
|
||||
Nixpkgs follows the [official elixir deprecation schedule](https://hexdocs.pm/elixir/compatibility-and-deprecations.html) and keeps up to the last 5 released versions of Elixir available.
|
||||
|
||||
## Structure {#beam-structure}
|
||||
|
||||
All BEAM-related expressions are available via the top-level `beam` attribute, which includes:
|
||||
All BEAM-related expressions are available via top-level package sets. It is recommended to work with a single package set to ensure consistent versions.
|
||||
|
||||
- `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlang_22`, etc), Elixir (`beam.interpreters.elixir`) and LFE (Lisp Flavoured Erlang) (`beam.interpreters.lfe`).
|
||||
- `beamPackages` - default OTP version
|
||||
- `beamMinimalPackages` - default OTP version, without wxwidgets, which saves ~1GB in closure size
|
||||
|
||||
- `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlang22`.
|
||||
There are also OTP version specific package sets, e.g. for OTP 28:
|
||||
|
||||
The default Erlang compiler, defined by `beam.interpreters.erlang`, is aliased as `erlang`. The default BEAM package set is defined by `beam.packages.erlang` and aliased at the top level as `beamPackages`.
|
||||
- `beam28Packages`
|
||||
- `beamMinimal28Packages`
|
||||
|
||||
To create a package builder built with a custom Erlang version, use the lambda, `beam.packagesWith`, which accepts an Erlang/OTP derivation and produces a package builder similar to `beam.packages.erlang`.
|
||||
Inside each package set are:
|
||||
|
||||
Many Erlang/OTP distributions available in `beam.interpreters` have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's `beam.interpreters.erlang_22_odbc_javac`, which corresponds to `beam.interpreters.erlang_22` and `beam.interpreters.erlang_22_nox`, which corresponds to `beam.interpreters.erlang_22`.
|
||||
- erlang itself (version comes from package set)
|
||||
- interpreters: elixir (multiple versions, e.g. elixir_1_18) and lfe
|
||||
- packages: rebar3, hex, etc
|
||||
- builders: mixRelease, buildRebar3, etc
|
||||
- hooks: for composing builders and packages
|
||||
|
||||
## Build Tools {#build-tools}
|
||||
To use a non-default Elixir it's important to keep the rest of the package set consistent, so it's recommended to use `.extend`. This ensures that builders like `mixRelease`, `fetchMixDeps`, and `buildMix` all pick up the overridden Elixir:
|
||||
|
||||
### Rebar3 {#build-tools-rebar3}
|
||||
```nix
|
||||
let
|
||||
beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; });
|
||||
in
|
||||
beamPackages.mixRelease {
|
||||
# ...
|
||||
}
|
||||
```
|
||||
|
||||
We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `fetchRebar3Deps`.
|
||||
## Build Tools {#beam-build-tools}
|
||||
|
||||
We also provide a version on Rebar3 with plugins included, under `rebar3WithPlugins`. This package is a function which takes two arguments: `plugins`, a list of nix derivations to include as plugins (loaded only when specified in `rebar.config`), and `globalPlugins`, which should always be loaded by rebar3. Example: `rebar3WithPlugins { globalPlugins = [beamPackages.pc]; }`.
|
||||
### Rebar3 {#beam-build-tools-rebar3}
|
||||
|
||||
We provide a version of Rebar3, under `beamPackages.rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `beamPackages.fetchRebar3Deps`.
|
||||
|
||||
We also provide a version on Rebar3 with plugins included, under `beamPackages.rebar3WithPlugins`. This package is a function which takes two arguments: `plugins`, a list of nix derivations to include as plugins (loaded only when specified in `rebar.config`), and `globalPlugins`, which should always be loaded by rebar3. Example: `beamPackages.rebar3WithPlugins { globalPlugins = [beamPackages.pc]; }`.
|
||||
|
||||
When adding a new plugin it is important that the `name` attribute is the same as the atom used by rebar3 to refer to the plugin.
|
||||
|
||||
### Mix & Erlang.mk {#build-tools-other}
|
||||
### Erlang.mk {#beam-build-tools-erlangmk}
|
||||
|
||||
Erlang.mk works exactly as expected. There is a bootstrap process that needs to be run, which is supported by the `buildErlangMk` derivation.
|
||||
|
||||
For Elixir applications use `mixRelease` to make a release. See examples for more details.
|
||||
### Mix {#beam-build-tools-mix}
|
||||
|
||||
There is also a `buildMix` helper, whose behavior is closer to that of `buildErlangMk` and `buildRebar3`. The primary difference is that mixRelease makes a release, while buildMix only builds the package, making it useful for libraries and other dependencies.
|
||||
For Elixir applications that use [mix release](https://hexdocs.pm/mix/Mix.Release.html), use the `mixRelease` builder to make a release. See examples for more details.
|
||||
|
||||
There is also a `buildMix` helper, whose behavior is closer to that of `buildErlangMk` and `buildRebar3`. The primary difference is that `mixRelease` makes a release, while `buildMix` only builds the package, which is more useful for libraries and other dependencies.
|
||||
|
||||
## How to Install BEAM Packages {#how-to-install-beam-packages}
|
||||
|
||||
BEAM builders are not registered at the top level, because they are not relevant to the vast majority of Nix users.
|
||||
To use any of those builders into your environment, refer to them by their attribute path under `beamPackages`, e.g. `beamPackages.rebar3`:
|
||||
To use any of these builders in your environment, refer to them by their attribute path under `beamPackages` (or another BEAM package set), e.g. `beamPackages.rebar3`:
|
||||
|
||||
::: {.example #ex-beam-ephemeral-shell}
|
||||
# Ephemeral shell
|
||||
|
|
@ -75,35 +97,39 @@ pkgs.mkShell { packages = [ pkgs.beamPackages.rebar3 ]; }
|
|||
|
||||
#### Rebar3 Packages {#rebar3-packages}
|
||||
|
||||
The Nix function, `buildRebar3`, defined in `beam.packages.erlang.buildRebar3` and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project.
|
||||
|
||||
If a package needs to compile native code via Rebar3's port compilation mechanism, add `compilePort = true;` to the derivation.
|
||||
The builder `beamPackages.buildRebar3` can be used to build a derivation that understands how to build a Rebar3 project.
|
||||
|
||||
#### Erlang.mk Packages {#erlang-mk-packages}
|
||||
|
||||
Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead of `buildRebar3`.
|
||||
Erlang.mk functions similarly to Rebar3, except we use `beamPackages.buildErlangMk` instead of `beamPackages.buildRebar3`.
|
||||
|
||||
If a package needs to compile native code via Erlang.mk's port compilation mechanism, add `compilePorts = true;` to the derivation.
|
||||
|
||||
### Elixir Applications {#packaging-elixir-applications}
|
||||
|
||||
#### Mix Packages {#mix-packages}
|
||||
|
||||
`mixRelease` is used to make a release in the mix sense. Dependencies will need to be fetched with `fetchMixDeps` and passed to it.
|
||||
`beamPackages.mixRelease` is used to make a release in the mix sense. Dependencies will need to be fetched with `beamPackages.fetchMixDeps` and passed to it.
|
||||
|
||||
#### mixRelease - Elixir Phoenix example {#mix-release-elixir-phoenix-example}
|
||||
|
||||
there are 3 steps: frontend dependencies (javascript), backend dependencies (elixir), and the final derivation that puts both of those together
|
||||
There are 3 steps: frontend dependencies (javascript), backend dependencies (elixir), and the final derivation that puts both of those together.
|
||||
|
||||
##### mixRelease - Frontend dependencies (javascript) {#mix-release-javascript-deps}
|
||||
|
||||
For phoenix projects, inside of Nixpkgs you can either use `fetchYarnDeps` or `buildNpmPackage`. An example with `fetchYarnDeps` can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pl/plausible/package.nix). An example with `fetchYarnDeps` will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage)
|
||||
For phoenix projects, inside of Nixpkgs you can either use `fetchYarnDeps` or `buildNpmPackage`. An example with `buildNpmPackage` can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pl/plausible/package.nix), and an example with `fetchYarnDeps` can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pi/pinchflat/package.nix).
|
||||
|
||||
##### mixRelease - backend dependencies (mix) {#mix-release-mix-deps}
|
||||
|
||||
There are 2 ways to package backend dependencies. With mix2nix and with a fixed-output-derivation (FOD).
|
||||
There are 2 ways to package backend dependencies: either per-dependency mix2nix or with a fixed-output-derivation (FOD).
|
||||
|
||||
When writing an elixir project targeting `mixRelease`, you can also consider using [deps_nix](https://github.com/code-supply/deps_nix) with `mixNixDeps`. `deps_nix` supports git dependencies, but is intended to be added to the project's `mix.exs` directly.
|
||||
|
||||
###### mix2nix {#mix2nix}
|
||||
|
||||
`mix2nix` is a cli tool available in Nixpkgs. It will generate a Nix expression from a `mix.lock` file. It is quite standard in the 2nix tool series.
|
||||
|
||||
Note that currently mix2nix can't handle git dependencies inside the mix.lock file. If you have git dependencies, you can either add them manually (see [example](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/pleroma/default.nix#L20)) or use the FOD method.
|
||||
Note that currently mix2nix can't handle git dependencies inside the mix.lock file. If you have git dependencies, you can either add them manually (see [example](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pl/pleroma/package.nix)) or use the FOD method.
|
||||
|
||||
The advantage of using mix2nix is that nix will know your whole dependency graph. On a dependency update, this won't trigger a full rebuild and download of all the dependencies, where FOD will do so.
|
||||
|
||||
|
|
@ -151,7 +177,7 @@ You will need to run the build process once to fix the hash to correspond to you
|
|||
|
||||
###### FOD {#fixed-output-derivation}
|
||||
|
||||
A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir-ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD.
|
||||
A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [akkoma](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/ak/akkoma/package.nix) for a usage example of FOD.
|
||||
|
||||
Practical steps
|
||||
|
||||
|
|
@ -176,12 +202,11 @@ Note that if after you've replaced the value, nix suggests another hash, then mi
|
|||
Here is how your `default.nix` file would look for a Phoenix project.
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> { };
|
||||
|
||||
{
|
||||
# beam27Packages or beam29Packages is available if you need a particular version
|
||||
beamPackages,
|
||||
}:
|
||||
let
|
||||
# beam.interpreters.erlang_26 is available if you need a particular version
|
||||
packages = beam.packagesWith beam.interpreters.erlang;
|
||||
|
||||
pname = "your_project";
|
||||
version = "0.0.1";
|
||||
|
||||
|
|
@ -191,7 +216,7 @@ let
|
|||
};
|
||||
|
||||
# if using mix2nix you can use the mixNixDeps attribute
|
||||
mixFodDeps = packages.fetchMixDeps {
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version;
|
||||
# nix will complain and tell you the right value to replace this with
|
||||
|
|
@ -200,11 +225,8 @@ let
|
|||
# if you have build time environment variables add them here
|
||||
MY_ENV_VAR = "my_value";
|
||||
};
|
||||
|
||||
nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies;
|
||||
|
||||
in
|
||||
packages.mixRelease {
|
||||
beamPackages.mixRelease {
|
||||
inherit
|
||||
src
|
||||
pname
|
||||
|
|
@ -215,9 +237,6 @@ packages.mixRelease {
|
|||
MY_ENV_VAR = "my_value";
|
||||
|
||||
postBuild = ''
|
||||
ln -sf ${nodeDependencies}/lib/node_modules assets/node_modules
|
||||
npm run deploy --prefix ./assets
|
||||
|
||||
# for external task you need a workaround for the no deps check flag
|
||||
# https://github.com/phoenixframework/phoenix/issues/2690
|
||||
mix do deps.loadpaths --no-deps-check, phx.digest
|
||||
|
|
@ -229,7 +248,7 @@ packages.mixRelease {
|
|||
Setup will require the following steps:
|
||||
|
||||
- Move your secrets to runtime environment variables. For more information refer to the [runtime.exs docs](https://hexdocs.pm/mix/Mix.Tasks.Release.html#module-runtime-configuration). On a fresh Phoenix build that would mean that both `DATABASE_URL` and `SECRET_KEY` need to be moved to `runtime.exs`.
|
||||
- `cd assets` and `nix-shell -p node2nix --run "node2nix --development"` will generate a Nix expression containing your frontend dependencies
|
||||
- Generate a Nix expression for your frontend dependencies using `fetchNpmDeps`/`buildNpmPackage` or `fetchYarnDeps`, depending on whether the project uses npm or yarn
|
||||
- commit and push those changes
|
||||
- you can now `nix-build .`
|
||||
- To run the release, set the `RELEASE_TMP` environment variable to a directory that your program has write access to. It will be used to store the BEAM settings.
|
||||
|
|
@ -248,7 +267,7 @@ in your project with the following
|
|||
}:
|
||||
|
||||
let
|
||||
release = pkgs.callPackage ./default.nix;
|
||||
release = pkgs.callPackage ./default.nix { };
|
||||
release_name = "app";
|
||||
working_directory = "/home/app";
|
||||
in
|
||||
|
|
@ -320,9 +339,10 @@ Usually, we need to create a `shell.nix` file and do our development inside the
|
|||
|
||||
with pkgs;
|
||||
let
|
||||
elixir = beam.packages.erlang_27.elixir_1_18;
|
||||
# pin OTP via beam27Packages/beam28Packages/... and Elixir via .extend
|
||||
beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; });
|
||||
in
|
||||
mkShell { buildInputs = [ elixir ]; }
|
||||
mkShell { buildInputs = [ beamPackages.elixir ]; }
|
||||
```
|
||||
|
||||
### Using an overlay {#beam-using-overlays}
|
||||
|
|
@ -337,7 +357,7 @@ let
|
|||
self: super: {
|
||||
elixir_1_18 = super.elixir_1_18.override {
|
||||
version = "1.18.1";
|
||||
sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
|
@ -355,18 +375,17 @@ Here is an example `shell.nix`.
|
|||
with import <nixpkgs> { };
|
||||
|
||||
let
|
||||
# pin OTP via beam27Packages/beam28Packages/... and Elixir via .extend
|
||||
beamPackages = beam27Packages.extend (self: super: { elixir = self.elixir_1_18; });
|
||||
|
||||
# define packages to install
|
||||
basePackages = [
|
||||
git
|
||||
# replace with beam.packages.erlang.elixir_1_18 if you need
|
||||
beam.packages.erlang.elixir
|
||||
beamPackages.elixir
|
||||
nodejs
|
||||
postgresql_14
|
||||
# only used for frontend dependencies
|
||||
# you are free to use yarn2nix as well
|
||||
nodePackages.node2nix
|
||||
# formatting js file
|
||||
nodePackages.prettier
|
||||
prettier
|
||||
];
|
||||
|
||||
inputs = basePackages ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ];
|
||||
|
|
@ -379,13 +398,13 @@ let
|
|||
export HEX_HOME=$PWD/.nix-mix
|
||||
# make hex from Nixpkgs available
|
||||
# `mix local.hex` will install hex into MIX_HOME and should take precedence
|
||||
export MIX_PATH="${beam.packages.erlang.hex}/lib/erlang/lib/hex/ebin"
|
||||
export MIX_PATH="${beamPackages.hex}/lib/erlang/lib/hex/ebin"
|
||||
export PATH=$MIX_HOME/bin:$HEX_HOME/bin:$PATH
|
||||
export LANG=C.UTF-8
|
||||
# keep your shell history in iex
|
||||
export ERL_AFLAGS="-kernel shell_history enabled"
|
||||
|
||||
# postges related
|
||||
# postgres related
|
||||
# keep all your db data in a folder inside the project
|
||||
export PGDATA="$PWD/db"
|
||||
|
||||
|
|
|
|||
|
|
@ -119,11 +119,10 @@ $ pkgs/os-specific/linux/kernel/update.sh
|
|||
The change gets submitted like this:
|
||||
|
||||
* File a PR against `staging-nixos`.
|
||||
* Add a `backport release-XX.XX` label for an automated backport.
|
||||
We don't expect many other changes on that branch to require a backport, hence there's no such branch for stable.
|
||||
* Add a `backport staging-nixos-XX.XX` label for an automated backport.
|
||||
By using an additional PR, we get the automatic backport against stable without manual cherry-picks.
|
||||
* Merge into `staging-nixos`.
|
||||
* File as PR from `staging-nixos` against `master`.
|
||||
* Merge into `staging-nixos` or `staging-nixos-XX.XX`.
|
||||
* File as PR from `staging-nixos` against `master` or `staging-nixos-XX.XX` against `release-xx.xx`.
|
||||
* When all status checks are green, merge.
|
||||
|
||||
### Add a new (major) version of the Linux kernel {#sec-linux-add-new-kernel-version}
|
||||
|
|
|
|||
|
|
@ -3091,19 +3091,28 @@
|
|||
"available-versions-and-deprecations-schedule": [
|
||||
"index.html#available-versions-and-deprecations-schedule"
|
||||
],
|
||||
"erlang": [
|
||||
"index.html#erlang"
|
||||
],
|
||||
"elixir": [
|
||||
"index.html#elixir"
|
||||
],
|
||||
"beam-structure": [
|
||||
"index.html#beam-structure"
|
||||
],
|
||||
"build-tools": [
|
||||
"beam-build-tools": [
|
||||
"index.html#beam-build-tools",
|
||||
"index.html#build-tools"
|
||||
],
|
||||
"build-tools-rebar3": [
|
||||
"beam-build-tools-rebar3": [
|
||||
"index.html#beam-build-tools-rebar3",
|
||||
"index.html#build-tools-rebar3"
|
||||
],
|
||||
"build-tools-other": [
|
||||
"beam-build-tools-erlangmk": [
|
||||
"index.html#beam-build-tools-erlangmk"
|
||||
],
|
||||
"beam-build-tools-mix": [
|
||||
"index.html#beam-build-tools-mix",
|
||||
"index.html#build-tools-other"
|
||||
],
|
||||
"how-to-install-beam-packages": [
|
||||
|
|
@ -3121,6 +3130,9 @@
|
|||
"packaging-erlang-applications": [
|
||||
"index.html#packaging-erlang-applications"
|
||||
],
|
||||
"packaging-elixir-applications": [
|
||||
"index.html#packaging-elixir-applications"
|
||||
],
|
||||
"rebar3-packages": [
|
||||
"index.html#rebar3-packages"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -173,6 +173,8 @@
|
|||
|
||||
- `services.home-assistant.config.lovelace.mode` has been renamed to `lovelace.dashboards` and `lovelace.resource_mode` to match the [configuration format](https://www.home-assistant.io/dashboards/dashboards/) required by Home Assistant 2026.8. Users who explicitly set `lovelace.mode` should remove it; the module generates the correct entries automatically.
|
||||
|
||||
- `fulcrum` has been updated to 2.x. If run against an existing v1.x database without the `--db-upgrade` flag it refuses to start; the upgrade takes around an hour on Bitcoin mainnet.
|
||||
|
||||
- `opentrack`, `slushload`, `synthesia`, `vtfedit`, `winbox`, `wineasio`, and `yabridge` use wineWow64Packages instead of wineWowPackages as wine versions >= 11.0 have deprecated wineWowPackages. As such, the prefixes for these packages are NOT backwards compatible and need to be regenerated with potential for data loss.
|
||||
|
||||
- []{#sec-release-26.05-incompatibilities-profiles-hardened-removed} `profiles/hardened` has been removed, because:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ in
|
|||
{
|
||||
REQUEST_TIMEOUT = "3000";
|
||||
REQUEST_RETRY = "10";
|
||||
PUPPETEER_EXECUTABLE_PATH = lib.getExe pkgs.chromium";
|
||||
CHROMIUM_EXECUTABLE_PATH = lib.getExe pkgs.chromium;
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -369,7 +369,8 @@ lib.makeScope pkgs.newScope (
|
|||
# =============== simple script files ====================
|
||||
|
||||
lightning = scriptDerivation {
|
||||
name = "Lightning";
|
||||
pname = "Lightning";
|
||||
version = "0-unstable-2017-08-25";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/Lightning.scm";
|
||||
sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49";
|
||||
|
|
|
|||
|
|
@ -51,5 +51,12 @@ symlinkJoin {
|
|||
ln -s ${gimp.man} $man
|
||||
'';
|
||||
|
||||
inherit (gimp) meta;
|
||||
meta = gimp.meta // {
|
||||
description = "${gimp.meta.description} with plugins";
|
||||
longDescription = ''
|
||||
Plugins:
|
||||
|
||||
${lib.concatMapStringsSep "\n" (p: "- ${p.pname}") selectedPlugins}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,138 +1,138 @@
|
|||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "b91a3ffe046a2a3c6938352a0698da76bb88766df71c30e47ecf1ba41cd91da7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "dd6d234775759b8abdd3a87a1a748f92db648f096cc9381eb27afd8ae8186f20"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "ba406b694207371dd59a08a4e22b6b8ad2506c5a617df1399d7084f52c04f383"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "1c10516660617d6db897bec16e362b4c4e4a0c1f43f08bb9a87663e051d8b806"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "60004be2877bc9e018c47b76f82779e754acd4931b19bfa4bb158c5013a44362"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "02a2df53bea7805ee124e17db2263d17588a74d091c9656dd07052bcaf7fc159"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "d7eb347708ea97b387e90eed671c64b4e0a1e11fb60af4f94995d21e0ba840d4"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "7b8e832bfde832d24335786c43a8c0aeede3c04e2aee4c8349822383f2fa390e"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "45709e41c8b5d1ff3c9e780c8f22754cb1102d25e78932572033a716ebf7b0f7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "16275efc94e4a399f0edbbf5ebfe46d8c5c7784d5a4ea300c7313ebbb24190d8"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "d513d2d3887b6d6a9b91f24a177aaae736fe34af64d67b772b0e5c322c717437"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "75afdb00dc9bf90a0bf153909df0886ea41d28c39387a6440d4830e00dd05f95"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "14fb90f2931bea3f030e7ba6c682013911260177bce91eadb2b45f23936465a5"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "be15ffd05156b50b27cdac28768005a27484c0b16946f9ef2531bb1d0a6185e2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "fa2d53df0ec302f5a5f418cb0eb4dc7c19e653c2345b1f4f9ae9a46f267013ad"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "59f494c03d9aa0f96d99d28e505fae57dd2c30907ea055b888705555ae289d3c"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "ce5325e6bd901a241bf0f06929da7ac35352c304f9180598b89502adbde603cf"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "21ebfe2078b4ef92b2ac3dfe664fd48556cf2b79f9058dd3cd6ed5ed10fcbe1b"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "cadcaa43d750d68ea137b63b1a4bf36eea64b4c05d3d7573420ea065b58c9803"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "766acd7cbff87a3eab89cc0dc433df34c5d44bfc5304872adfffa432f968450c"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "7099afbc3ea21b9969cbb90a694093f91d862c6da671340753f01ddbdb7c6d25"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "6bd03722d01aa1d281da47318ddca6e1dafbac7acf23f7dc864c7799b4616479"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "92e2f3d822fdd264a133680a909aa03104e75ab784e8b819c5ab3c6e7452ba79"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "4b61e3e97e6770b9a2625a21925282e1774bc9114f0a9df5392cd1199b4df744"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "3916099fd9c991ce5f837dad902f187aed47d7fce066cc5ffcc37ad43a909ece"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "c9a0fe7e3a747fb01d19b0a846df97d4d53a31f563e5308d86401d6b000b031b"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "24a3e2a68b8f4c16dea632ebe2b10876737c8fb5a457273cef83f0b935e3e793"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "899f8e8b8ece3d85384de407fd3f8d375daa9b6f0c1bbd54108426e22fa4a623"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "1440c406f7c9def8170e8b279de5298cbc2a91f72fda2290581660fcd614e1a8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "be6bc62be91cef6ebb9f995fb4a3e7ca68ab485eec7eb304d129c9d44d543e0c"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "de3abd803043588ae3c349a276dd52093528a3ae86115c9d4979982b6a1d59d3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "56c322cf540988649257018f8be4cac80ff1fafb206c3efeb7cfc190d76eff6f"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "68b492ed357fcc513adc0baf0a5306a625d5eccfda4389ab303e4f03d1d54ca3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "046f1884d788be8fcc343c73d7ff699d8be89fe6c607e0536b4a8732c5d27a13"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "ffc90536663d1edd4cd101e492d84dcd79dd1af1b3b16643786ab8a5d2fcccb7"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "0d1c03990ca8e243ba4a291312f1a1ce62b52e28170ee6f85b0a95f8032b3eef"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "b0f286a53c7da0f9275da9a4e648913b588ccfcf70c8289886e48008f256ea51"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "93e0f6a8e5024f054cdce242aea4fdb833e476d7b2531b454f5f3267f724594e"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "4d4340241b1e417cac9be28f60b6a4f48bb6e513fb01f261bb72e47b162b8917"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "2b72f3bf1485a986d4a325cd15cb12163f4acabcdd4fcf77400a4c226a26c097"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "a5a225e9b8d57bccbb04095ab86d77897ef39beda4c9db56fe43152f7922e213"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "4e675fca42ba1862810e021570f58462046e11fb92552d699e20d314be4dd54f"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "3786e9642a9ad14a55c87917ca8a3b2a03b9cb8cf7ee7320d0ea4e122c566a8f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "c642cadb4f1ccf8439e3c47b10933cae6db0d29c2d9bb9b45267ca69191b0c3f"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "a6d84f504820e9199859f7943662e1232621ece3bd1559c1e630dfac2726f344"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "080cbffc7710eb25167e65619101b9cbfbd80d6510da2c857a7fe2d70140358d"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "d2084cdb68c8a68d70854b68d15382baddc197980d48de0d45707391f252656e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "ceb393f3f89bd550de3ac4bfdbfa4d090fa6693d7f0b3428bd0db5dc4ebd7ac0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "1009e845edf77dbe04e8d815ce036c73f1309c0a4a2ec69abafb3e058365513c"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "fe7cda504690bcc90694b9c88c6bab70ea4e89d14c17ab0b726de6eaa3c3055d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "f76f06cd2344a2c44283733c0e02a94b1bea6c63bc0b7cb6aa2871a474661628"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "d24aeb2d60ee5009dcf663b6edea6a5a30ff4486a98b91f87661b02d83fc116c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "4268db05101d1022ee1002f46516aebeac1b9f8171288ea2d14ddd4763b35ff1"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "2fbbcb3af0673dfd2f046150fb0775468f6139dd41537bd8bff77f3bdfb5ffbe"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "ae97992ad44e403271ce5b54ed5856c06ab8a2decade2768debc06d3ca6e0486"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "39381c15bf462071edeb8f735d447ec6d750cc23f6dd3efb45d7b38193ccb7a2"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c458b9de8dd82d2f39b071551ce3605fd602ece178e03bb81b756dabf69471e8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "857457306f280f261deb1bea6663a8146ca3d0539311920a81252ad611b93a72"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "6bcd307750c4077eca4cf934dffa4e93277479512639f4c2458f0b0b0eb2cddb"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.11%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "c78e808f09935dd0c633ed4b63c9fadbe6577b7992b2111a9c884bf042710a97"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "707374e5a6066ec39b70f46ac43e5ca7c10a04811c509dbbacd3edd2cbc8fc0f"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
rke2Version = "1.33.11+rke2r1";
|
||||
rke2Commit = "9e559b0969f73df7242fd618386ffb475ae2d460";
|
||||
rke2TarballHash = "sha256-+OnesNR5rnT/jwANvHGyM9ZLoBm/yvTyDD/idP7ncT0=";
|
||||
rke2VendorHash = "sha256-9zXirLuvIR/su5irILDgOI6OqbatSeTrenBLgSZEAqY=";
|
||||
k8sImageTag = "v1.33.11-rke2r1-build20260416";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260415";
|
||||
rke2Version = "1.33.12+rke2r1";
|
||||
rke2Commit = "2cf00d600ee7064fe19efee3e35195ad92c006ef";
|
||||
rke2TarballHash = "sha256-CESLU8qyr0MnVmXRKaPZ7CFvBmIqpLAiklBrsuw9W/k=";
|
||||
rke2VendorHash = "sha256-I09PTw359mW9b8j/tjbedu7gJ0cp+NPEvmikxJMOufQ=";
|
||||
k8sImageTag = "v1.33.12-rke2r1-build20260512";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260512";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.33.11-0.20260415182038-2566e39d309b-build20260416";
|
||||
dockerizedVersion = "v1.33.11-rke2r1";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
dockerizedVersion = "v1.33.12-rke2r1";
|
||||
helmJobVersion = "v0.10.0-build20260513";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,138 +1,138 @@
|
|||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "a1dceccd822e24281f715a4a608539507968ffd97810484d3e370b96017f16ff"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "9191dccc4fa6bdb8bc589d20d34c643227fe2c1e3d198eaf600780a1c44dfd5d"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "a9de3a4aef52e0ead9a69156556f8432d9026a7fd1716770185863f14c7d7f07"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "707eaba12e9e9d5e5090bb5fb3e066b893c0b0aeeee6f3627c1153e2db380567"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "df74183ec867c9c607d8ab3286fa3bc19dd92088e1074a1f8a75be7a4a290e57"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "33421abe9967b3f00799b3251f84a3a36ab03378a4f1c556663ac2b829f59cf4"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "8c91f98adc2f4ee970d13e230525692b5622124627163e956e7a597e24fc5c80"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "f727fa092650bf685b68358cf41422c260fe9eee7a2aebecc68f14a2fd24a678"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "51ba6ed5197c381f2303e8a09cf4a453026b910bf265b077c3fc7ab3428f6ced"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "b46d57b12bd62a5f4c4227fc1339ba8785853e55f81031c97774f44844c6769d"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "924e92a89d33e1cd8ffbcf15787d4d5b02883a8b3714f3671d239670aef59ecc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "d4d14e4ae3f34d0615fd6007e7048b54bc5a15be9f57fa6be6cd72346c39ccdf"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "2e2386f91dc12d6f50a69d04e90322d0075bc0881263b2566679e94a9da11873"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "977c126339368ac55ccd3cb658dcc6530d46426292735dc8cff95dad99543ebd"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "be15ffd05156b50b27cdac28768005a27484c0b16946f9ef2531bb1d0a6185e2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "e3773afb1951f0c21eb37e155fa7375bbf12c8fa884dca2cd5338dcc918d0151"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "2ad31cd1bcb0ba5ca050bda0942a0b6b79f21ae4dfc70f70001be08921c4c3cb"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "944c1785483bffb7f20559432fea2d1b7d3ce6a37ac344557c7a1c8293fa4e8c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "c812ea710fcac1dd25e1be8f45e9fd3218296fdd6414c90a5b856fc16a5835f5"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "8426be3703efc7126d1a25b2fc2738d6b63ca202c32dc3b3d9c72d4b1e0f8757"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "07507811563e82578142bd56c2b394b32b55bd53c965f8fc9a9881570feac68d"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "7136a51e4c62479664010d19fb4acb05794cdbea9c0d7c9ab0f2cd1486ba96ae"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "0d5813611f47a460c7762f1902e1be7785f52903b8340fc112dd67c5ba9e0adf"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "11659fecf1ec1b98a2fabfdc4b9db4fac79513b383b0ae51c0bd4d359317548d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "4716d37e4c4974c50d88a6c4a4dd1ae59e5d416b06161dc97af267ac91005200"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "2fe0b9b21ad6db41b7d6d6d682353844efb9e44d520d69824b7e46c503a73a67"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "c326f685c5037ae41a76d0a57d81ad365664fdb4f09dd8ed1c085daef6e8898c"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "0bdcf82427f6fe49e211c28023ea0a4390f0abf4811f1c94b5b3442cdab9c2e0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "8439de0d0159a2d0458a94c48d4f856dd499106bb97a1228315172a8ccf7a227"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "44212de2ccbed50fccd9c9c5c2648a3883b3efcc1ee00fc4554defe61bb64ffa"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "dbfb0ba0d552b9f09d6fd7c3f1313c2d3a65b1fe9d003925f90206bb908ceb1c"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "7ad8b7519b8b7faed7788eb362a0f667da81021466c6bd5a911be2095be47c87"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "2b65ebfff9edad28dc5df77d58a9f9191ae6ed1ffd47e001c61979940dbd30cc"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "05d378074e3886f42858bd67dedcda0ad1f926faf69f2ce5bdc6e2a97a29a436"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "618934aaa80d160f8b39466f260b7d47946eda18ed8c0f52e3a1545e087f01cf"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "17393dba1ce79c78739381ba2c6dc9383f41bf78e511b04a3eca0564d88a58d9"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "26803301b9d26b82afeaa7aa94b66ec80825c3cb2b42f7468f60a3770926744f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "bd9f7cf98e625f62b10bbdfded475f3f05d04e80f07deb195f6778fb1b9c9df0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "8d6e85fbf15c10faa6c50098f462e1f042e37e80df8aaa67f4e4a4cfbb61b3f7"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "532ee3aef895744d85899634cbd65023f6026b3b494c97ab9ac8b38188ce3bdf"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "44bca782f1503b189e17248edbfc344c129ffedeabf886c5ecae89717a68e6df"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "63c55631be709190646f5e70a17dd7ba54f5593420b83496e252e01543f02096"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "0af1f6bf05788880ac4617271b8896662c41ed3b099ad617bae21aa41f669f68"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "cd12831ceb77a071fdbd9f0ec37fbcc60cb99d6dfd4f3901803b27ea318fa38d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "085489645c3bdeb44216be70e0194f6e356a4e0116e861fac7009dfc671f99b8"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "00a39e85d561fac062c000bc8e663b10d44c9d14a425ee6cff343f2869bf2ed5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "6c759cc8ce3e9ae7b6aef0b5cdf4094762f6f69d55dd70b6d9a405db796f1cb3"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "cfb4cea40d0ff547033bb75eb5ff3fb160633284bd433e0acee57e88c6b697cd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "530f83485923076b7769c4ced5c87b88979dff0e4d28faf33fc5e9b67fc5dadf"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "753a1715fc153dfe940778bdc00fb86ff5b0de1c590261777e6e280d838aa02a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "efc94b4850aef8d2973f51bff0df31ce0689949e22bd05161fd5c12cfa9672ce"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "d84f65ba2aae7706313d3009fc471335a1acb8ef091e1369ccd3054bf010f0c0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "883d23d8ef3733d9747251c8a1d223571153fd233eb93e5d32a76129a6c64f2c"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "dc97c8fc3016eae77ef15de114d7d26b850d5ad6d15555a1e827a7fb78c0573a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "282c456cbcdaf42f2b4c62b110aaa459e5517dba0a7dd8c6fd539ce93c9fd632"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "2fbbcb3af0673dfd2f046150fb0775468f6139dd41537bd8bff77f3bdfb5ffbe"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "a067bc1b29dd65e7c96fee7e69659bb254abfccd77451d357f17c0c017849b1b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "4ffe8a7b25bc4c116f34b29f51de69ffbe7702f473f8b68577ac086f88e0c5fb"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c458b9de8dd82d2f39b071551ce3605fd602ece178e03bb81b756dabf69471e8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "5f1e96e34a1ba8d3e5aa703a259ac0726b994efab1a9f38a058ee6c7b056b41b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "b15c7523c8ece5525acdd1e04bdcde1a3e54435fcdb1a8ec949de9395f69a3aa"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "3a7cb81f2635f5771c95e57029c0a6538b2b470857b92188a5180ecffc665624"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "ca086d7c16de41dfd1fd5f2e745949f0a51d4de45f9bacdaa3b1955936f595e9"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
rke2Version = "1.34.7+rke2r1";
|
||||
rke2Commit = "6fb975ad761d191a245a4c0215843e8c19423ac9";
|
||||
rke2TarballHash = "sha256-2+EVvexT0oco6xI/nAfau4yz9wotynD4ejm6xC8JssQ=";
|
||||
rke2VendorHash = "sha256-eX29l/K8UIWkSKIcJBn9Be2zPqxqoWlsmK0xs/bdxOo=";
|
||||
k8sImageTag = "v1.34.7-rke2r1-build20260416";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260415";
|
||||
rke2Version = "1.34.8+rke2r1";
|
||||
rke2Commit = "4fdfd151975bbc58c8d392620db8eea72fea2abc";
|
||||
rke2TarballHash = "sha256-n98pZhWARQMyKj8G9+ymmMZyzoiGo+KPMr0F5KDphqU=";
|
||||
rke2VendorHash = "sha256-752RlnL+7reFk4G/X8kgHdad71fatY+Ss714MbJDvg8=";
|
||||
k8sImageTag = "v1.34.8-rke2r1-build20260512";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260512";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.34.7-0.20260415182025-e7567db58dd7-build20260416";
|
||||
dockerizedVersion = "v1.34.7-rke2r1";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
dockerizedVersion = "v1.34.8-rke2r1";
|
||||
helmJobVersion = "v0.10.0-build20260513";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,138 +1,138 @@
|
|||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "1563bfb894ac077320a8ef535c3c3caa541b7ed19ca9181920702bfdd7e6e57d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "483d18ab6a64d279b4411098dec8b6f4219839bdb0d3e023f87679e6c71905de"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "30a3c779a7b87884d6a2185345407842c42d4d5de16e1303f4a86cb07de316ac"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "c8ab27e9f5cd0d85cc20ed8c02c71128f021199a0256c5a051734817193e913c"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "b4afde3c8932c286bbaa0835a50dc7854cc951a84dddfa1d376aaf49e97bc3d2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "01339c90624d6745e16b7706585fdb32825df66adb892a9bd265257d2de315a5"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "3d7536615244d0f60d666c95fad1efa834b93e64b7b1117e2a0d33d7869136bd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "9816fa61d5b89ab40ba59db3c0593ed37f712c6bfd1f3b763641b0bfad8b5d04"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "e031ac4cd1c2e5152b751370af1905404edd15e6bf662213dc22441c535c8985"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "cc4d48fde0650c666f87322ef3fec4987de06d99b4f008a07b667a7650451069"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "d513d2d3887b6d6a9b91f24a177aaae736fe34af64d67b772b0e5c322c717437"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "9ee8839e3060464ff0d3c8aabf9d992bcffc97df7e0ec04445b56d0a36fb341b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "977c126339368ac55ccd3cb658dcc6530d46426292735dc8cff95dad99543ebd"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "837a399259b8fd41e52d7e9f7f9d263c4678b76954fd280966b012a2516a00aa"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "a86d13c29b8c7cc65d1bb4575352ea4106c7a893fa34071b00d8abf7c96fdb3f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "0877802ec5502223f1b233573b2e87e3347a7922f2bb52702f9461958ac0c043"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "96757062b058c0a3617a4b20c3749ad9be738f884f70d2ace87f18b9a943d77e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "345afdae010cf3c77e02c4e339749f3c3a5d4d62c3ed486edab0bb1d4089c67e"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "af212d7b0925dedd7099b212a7d6ae3b315cf87cb744d0448bbc10a7b3754dfc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "00161836b5f27f1ce07be67337d08781033d6df4efe429bd922459738145ecdc"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "1b1faaa36f90cfe78e74008a68af69919fb661c34cc8a567e8a06bdb4a398f06"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "32b275bc86c35471d9deea33b6119a33667a28477c06500db3ea9d1d0cdf7d4b"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "4a01c3364f5891fbcb329e17e9f6662631d303be63b545373f483377f055257c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "e0519dd39f2f3297a84fa7c2e9c6fdda508386169474a47ebbb570c66f51c27c"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "e8355a07f9fbb1e2d3442a07796d8a5e0f359ec0f1cbd10f372812970542fabb"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "6f63f6cf296f828ef1ff98041691e9a6126490000ae2e90648c0699ab1bde91f"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "3875876ee6d45d3bcb1fcbb97cf738c8afd64242d590f896100b1f71c531d8c0"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "b66332a3a903e1d18c783a7d58d9eb74aef9d4cb0fe91a4aa75a63cff5b3e92a"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "ddfc6020222b15fc0eed8a5e9f9aefdee8334a039a20d0000801f40c81dd22d1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "98abe8232378ef17f9890e3c77cd405a90e7aa2fdf5d612bd7d42ee174714cf6"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "7df86fe7e2481bb9c04ec775d48f832899bd456c19208271ec23fd05f4176d2d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "4ea4b1fb4a653a5ad00dd206406482abddf9f53a1b1c4f884e7e7fb4fe720c90"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "05d378074e3886f42858bd67dedcda0ad1f926faf69f2ce5bdc6e2a97a29a436"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "2db5385f6d06d08296eb936bec9cad3db3d37620cd48b2b6def2deca58b11e78"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "d4dcaa35507a5f9d407a5d3a3fccee3e52061256bd0b420123bf888a24915758"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "26803301b9d26b82afeaa7aa94b66ec80825c3cb2b42f7468f60a3770926744f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "5c3f8ea51103b12549d64bb790ec511aebd7ce53bd34fcbdc8564e641ae029ed"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "b47becfdf139af069eaf1f691498ff689b577af43ed934edba119257bf652cab"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "61804cf3ed8347bbea0dd47f7805bbbc550b3eb39844782beae442f8b7ef44dc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "b00afa052e7b67d4111f19a4eefb22095c836a7972911880e65dee2044975898"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "b9aec99429066e3cea35ddd6aaa16b1eb84435a2feb156f8a0a5af541f87bb07"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "1e9a034a075472ecaa6f9e66c7ff2ada6f97b4a02a5e070ce36208b4eb4f1fcc"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "d359809efb1030af287b2077e534e1ae0e2c1b777280ef65b614939026f9ae0f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "8ddfde1b1ceea2f08db9fef9da9cb9745bbe74b2520cfceeb150c623102401a3"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "725862931f0675fa8699ce8a1167914d222d1d2fc3e689a20e662b9319a48683"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "b75549d8d650823ac9c8f5b5ba247901a8c5681ac91d909aea5a0d4f66d0b5bd"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "c2015d80e510d2a9a3d8f0eebadaa65c8c4a4eed7f63948011ab8d0a3549a97f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "69b950a05bc980405a0f7a7ae96233924b33685d812def46cfae11fb30891010"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "c0f20bbcc6b238af7249c265a7c6458c30f9358007c1380c7b99de01ee219398"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "f5f6ffdfd37164d12624390c9292ee7436c4c6dfa5c8cc889852f356e6964167"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "eee8c18cf3bfea3df603e2d9fb0c30c75fcc7e88dc58c1cab1b8d5926aa8dd52"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "6c98ce847abbd827e9c48ecba380084348dd6abca838de34d748c502bf3a7978"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "1aed02afe45b0f6abe3b8934bdd6beee5a8018b31e81be896e9bbfbf75cd2bc5"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "2fbbcb3af0673dfd2f046150fb0775468f6139dd41537bd8bff77f3bdfb5ffbe"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "ff9491f09bb3c8e0444209c1070542d2381bc1ff450cda26ff9c000bb929a614"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "4ffe8a7b25bc4c116f34b29f51de69ffbe7702f473f8b68577ac086f88e0c5fb"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "c458b9de8dd82d2f39b071551ce3605fd602ece178e03bb81b756dabf69471e8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "311aa5805c5a6e947e65f1d48dac789428ee056679d142d8b96e791e78868b6b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "4d1a7ba7c43d474d796d7b05a0f24a423b6c3a5a53388e9d803fd31c54efb912"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "4000891ee00df8441d49b8d1864208dfd4d1287efcfed59fbb6c44626144ceaa"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "d2f8909d694493222aa1051f8c013ffa73615567141336b872ada5c9e6312cd8"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
rke2Version = "1.35.4+rke2r1";
|
||||
rke2Commit = "5dc4f4390d27d77b17b6506d8b22aed72aa4fbe6";
|
||||
rke2TarballHash = "sha256-VWhml35keKn9Fhj/SeySpusi8yzz9dwgPC2rfABXPrk=";
|
||||
rke2VendorHash = "sha256-uaPjOFSwCxMWH/LD8tvE0VttPWJ9agMYm4E2mWiuYfw=";
|
||||
k8sImageTag = "v1.35.4-rke2r1-build20260416";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260415";
|
||||
rke2Version = "1.35.5+rke2r1";
|
||||
rke2Commit = "e28e7c1a0404f1e9bf36e8b7222d64aec6b7a004";
|
||||
rke2TarballHash = "sha256-t++HKNbR4WGzZiR6rVMke7lbixXA8H5ibovfitwPuXE=";
|
||||
rke2VendorHash = "sha256-LV3ISu7bW6kxlKFe0GUqkB9Jte1Ey5DaWm+OKq1/1uY=";
|
||||
k8sImageTag = "v1.35.5-rke2r1-build20260512";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260512";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.35.4-0.20260415195656-e51c0636351d-build20260415";
|
||||
dockerizedVersion = "v1.35.4-rke2r1";
|
||||
helmJobVersion = "v0.9.17-build20260422";
|
||||
dockerizedVersion = "v1.35.5-rke2r1";
|
||||
helmJobVersion = "v0.10.0-build20260513";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ rec {
|
|||
rke2_1_35 = common (import ./1_35/versions.nix) extraArgs;
|
||||
|
||||
# Automatically set by update script, changes shouldn't be backported
|
||||
rke2_stable = rke2_1_34;
|
||||
rke2_stable = rke2_1_35;
|
||||
rke2_latest = rke2_1_35;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
diff --git a/src/daemon.c b/src/daemon.c
|
||||
index aa9d050..861430f 100644
|
||||
index 48c310e..cd36e60 100644
|
||||
--- a/src/daemon.c
|
||||
+++ b/src/daemon.c
|
||||
@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
|
||||
@@ -1806,7 +1806,7 @@ daemon_create_user_backend (Daemon *daemon,
|
||||
const gchar *argv[9] = { NULL };
|
||||
int i = 0;
|
||||
|
||||
sys_log (context, "create user '%s'", cd->user_name);
|
||||
|
||||
- argv[0] = "/usr/sbin/useradd";
|
||||
+ argv[0] = "@shadow@/bin/useradd";
|
||||
argv[1] = "-m";
|
||||
argv[2] = "-c";
|
||||
argv[3] = cd->real_name;
|
||||
@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
|
||||
- argv[i++] = "/usr/sbin/useradd";
|
||||
+ argv[i++] = "@shadow@/bin/useradd";
|
||||
argv[i++] = "-m";
|
||||
argv[i++] = "-c";
|
||||
argv[i++] = cd->real_name;
|
||||
@@ -2040,7 +2040,7 @@ daemon_delete_shadow_user (Daemon *daemon,
|
||||
}
|
||||
free (resolved_homedir);
|
||||
|
||||
- argv[0] = "/usr/sbin/userdel";
|
||||
+ argv[0] = "@shadow@/bin/userdel";
|
||||
if (ud->remove_files) {
|
||||
argv[1] = "-f";
|
||||
argv[2] = "-r";
|
||||
- argv[i++] = "/usr/sbin/userdel";
|
||||
+ argv[i++] = "@shadow@/bin/userdel";
|
||||
argv[i++] = "-f";
|
||||
|
||||
if (rm_files)
|
||||
diff --git a/src/user.c b/src/user.c
|
||||
index 917d427..28170db 100644
|
||||
index da6428c..682842d 100644
|
||||
--- a/src/user.c
|
||||
+++ b/src/user.c
|
||||
@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
|
||||
new_gecos = g_strdup (name);
|
||||
}
|
||||
@@ -1947,7 +1947,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
|
||||
new_gecos = g_strdup (name);
|
||||
}
|
||||
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-c";
|
||||
argv[2] = new_gecos;
|
||||
argv[3] = "--";
|
||||
@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-c";
|
||||
argv[2] = new_gecos;
|
||||
argv[3] = "--";
|
||||
@@ -2022,7 +2022,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)),
|
||||
name);
|
||||
|
||||
|
|
@ -42,25 +42,25 @@ index 917d427..28170db 100644
|
|||
argv[1] = "-l";
|
||||
argv[2] = name;
|
||||
argv[3] = "--";
|
||||
@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)));
|
||||
@@ -2609,7 +2609,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon
|
||||
days_to_warn = g_strdup_printf ("%ld", pwd_expiration->days_to_warn);
|
||||
days_after_exp_until_lock = g_strdup_printf ("%ld", pwd_expiration->days_after_expiration_until_lock);
|
||||
|
||||
g_object_freeze_notify (G_OBJECT (user));
|
||||
- argv[0] = "/usr/bin/chage";
|
||||
+ argv[0] = "@shadow@/bin/chage";
|
||||
argv[1] = "-m";
|
||||
argv[2] = pwd_expiration->min_days_between_changes;
|
||||
argv[3] = "-M";
|
||||
@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon,
|
||||
} else {
|
||||
expiration_time = g_strdup ("-1");
|
||||
}
|
||||
- argv[0] = "/usr/bin/chage";
|
||||
+ argv[0] = "@shadow@/bin/chage";
|
||||
argv[1] = "-E";
|
||||
argv[2] = expiration_time;
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
|
||||
- argv[0] = "/usr/bin/chage";
|
||||
+ argv[0] = "@shadow@/bin/chage";
|
||||
argv[1] = "-m";
|
||||
argv[2] = min_days_bt_changes;
|
||||
argv[3] = "-M";
|
||||
@@ -2735,7 +2735,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon,
|
||||
expiration_time = g_strdup ("-1");
|
||||
}
|
||||
|
||||
- argv[0] = "/usr/bin/chage";
|
||||
+ argv[0] = "@shadow@/bin/chage";
|
||||
argv[1] = "-E";
|
||||
argv[2] = expiration_time;
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2861,7 +2861,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)),
|
||||
home_dir);
|
||||
|
||||
|
|
@ -69,16 +69,16 @@ index 917d427..28170db 100644
|
|||
argv[1] = "-m";
|
||||
argv[2] = "-d";
|
||||
argv[3] = home_dir;
|
||||
@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)),
|
||||
shell);
|
||||
@@ -2957,7 +2957,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
|
||||
} else {
|
||||
const gchar *argv[6];
|
||||
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-s";
|
||||
argv[2] = shell;
|
||||
argv[3] = "--";
|
||||
@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-s";
|
||||
argv[2] = shell;
|
||||
argv[3] = "--";
|
||||
@@ -3163,7 +3163,7 @@ user_change_icon_file_classic_authorized_cb (Daemon *daemon,
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -87,34 +87,34 @@ index 917d427..28170db 100644
|
|||
argv[1] = filename;
|
||||
argv[2] = NULL;
|
||||
|
||||
@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
|
||||
locked ? "locking" : "unlocking",
|
||||
accounts_user_get_user_name (ACCOUNTS_USER (user)),
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)));
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = locked ? "-L" : "-U";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
|
||||
@@ -3279,7 +3279,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
|
||||
} else {
|
||||
const gchar *argv[5];
|
||||
|
||||
g_free (groups);
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = locked ? "-L" : "-U";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -3471,7 +3471,7 @@ user_change_account_type_shadow (GDBusMethodInvocation *context,
|
||||
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-G";
|
||||
argv[2] = str->str;
|
||||
argv[3] = "--";
|
||||
@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
g_free (groups);
|
||||
|
||||
if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
|
||||
mode == PASSWORD_MODE_NONE) {
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-G";
|
||||
argv[2] = str->str;
|
||||
argv[3] = "--";
|
||||
@@ -3604,7 +3604,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
}
|
||||
} else if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
|
||||
mode == PASSWORD_MODE_NONE) {
|
||||
- argv[0] = "/usr/bin/passwd";
|
||||
+ argv[0] = "/run/wrappers/bin/passwd";
|
||||
argv[1] = "-d";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
@@ -3616,7 +3616,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
}
|
||||
|
||||
if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
|
||||
|
|
@ -123,7 +123,7 @@ index 917d427..28170db 100644
|
|||
argv[1] = "-d";
|
||||
argv[2] = "0";
|
||||
argv[3] = "--";
|
||||
@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
@@ -3637,7 +3637,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
*/
|
||||
accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
|
||||
} else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
|
||||
|
|
@ -132,7 +132,7 @@ index 917d427..28170db 100644
|
|||
argv[1] = "-U";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon *daemon,
|
||||
@@ -3717,7 +3717,7 @@ user_change_password_authorized_cb (Daemon *daemon,
|
||||
|
||||
g_autoptr (GError) error = NULL;
|
||||
g_autoptr (GSubprocess) process = NULL;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
replaceVars,
|
||||
pkg-config,
|
||||
glib,
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
meson,
|
||||
mesonEmulatorHook,
|
||||
dbus,
|
||||
json_c,
|
||||
ninja,
|
||||
python3,
|
||||
vala,
|
||||
|
|
@ -22,16 +23,19 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "accountsservice";
|
||||
version = "23.13.9";
|
||||
version = "26.13.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "rdpM3q4k+gmS598///nv+nCQvjrCM6Pt/fadWpybkk8=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "accountsservice";
|
||||
repo = "accountsservice";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZIfkBlEaITX2rDcV5al4e2IFP238MXOlWeGoh+3+DoQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -73,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
dbus
|
||||
gettext
|
||||
glib
|
||||
json_c
|
||||
polkit
|
||||
systemdLibs
|
||||
libxcrypt
|
||||
|
|
@ -97,9 +102,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
|
||||
substituteInPlace meson.build \
|
||||
--replace-fail "run_command(['./generate-version.sh'], check: true).stdout().strip()" "'${finalAttrs.version}'"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/releases/${finalAttrs.src.tag}";
|
||||
description = "D-Bus interface for user account query and manipulation";
|
||||
homepage = "https://www.freedesktop.org/wiki/Software/AccountsService";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -1,26 +1,31 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromGitHub,
|
||||
libmowgli,
|
||||
pkg-config,
|
||||
git,
|
||||
gettext,
|
||||
pcre,
|
||||
pcre2,
|
||||
libidn,
|
||||
libxcrypt,
|
||||
cracklib,
|
||||
openssl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "atheme";
|
||||
version = "7.2.12";
|
||||
version = "7.2.12-unstable-2026-05-12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/atheme/atheme.git";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "atheme";
|
||||
repo = "atheme";
|
||||
rev = "23071cdf2c7b20210799218b485f97f06311b41f";
|
||||
hash = "sha256-e7pD4ZXQ3irrpJJSDRuJu2pVMjxVe8AUzzVL5yCb9PA=";
|
||||
# for modules and pinned libmowgli
|
||||
fetchSubmodules = true;
|
||||
# configure checks for git tree
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
|
|
@ -29,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
git
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libmowgli
|
||||
pcre
|
||||
pcre2
|
||||
libidn
|
||||
libxcrypt
|
||||
cracklib
|
||||
|
|
@ -47,6 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--enable-reproducible-builds"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Set of services for IRC networks";
|
||||
homepage = "https://atheme.github.io/";
|
||||
|
|
|
|||
|
|
@ -1,50 +1,44 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
python3,
|
||||
gettext,
|
||||
appstream-glib,
|
||||
gnome,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cantarell-fonts";
|
||||
version = "0.303.1";
|
||||
version = "0.311";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/cantarell-fonts/${lib.versions.majorMinor version}/cantarell-fonts-${version}.tar.xz";
|
||||
sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "cantarell-fonts";
|
||||
tag = version;
|
||||
hash = "sha256-FR53OZxJ7WRUDqMB2GriQ3UOxozWwbFiz3/9VaUWYrc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
python3.pkgs.psautohint
|
||||
python3.pkgs.afdko # for otfautohint
|
||||
python3.pkgs.cffsubr
|
||||
python3.pkgs.statmake
|
||||
python3.pkgs.ufo2ft
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.ufolib2
|
||||
python3.pkgs.uharfbuzz
|
||||
gettext
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-OjHj4h3n+/ozbrLaiH4bGppQ+2LA2RB/sZQVO9EPOEw=";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.gnome.org/GNOME/cantarell-fonts/-/blob/${src.tag}/NEWS";
|
||||
description = "Default typeface used in the user interface of GNOME since version 3.0";
|
||||
homepage = "https://cantarell.gnome.org/";
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = [ ];
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-guppy";
|
||||
version = "0.17.25";
|
||||
version = "0.17.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
tag = "guppy-${finalAttrs.version}";
|
||||
hash = "sha256-wH14RCNjqbuJsyJdV3Vthulyd5GbLdfpoojK3F2muwM=";
|
||||
hash = "sha256-y1P8w1nM//72afZeehsj8aQhjylL84FabAxw3iqvx0g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fNbuVXFCqrQPT0q00VkOVXm1H7/7HjuK9JYZ0TRxMJk=";
|
||||
cargoHash = "sha256-Pb0hXjuPoCoGDgoOyiyXG3DZNKRJ1ZIP8w38/KFRYHM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,21 +9,21 @@
|
|||
}:
|
||||
|
||||
let
|
||||
commitHash = "1ebda7ab9c9796369af484fccf4d3c54e7c97f5d"; # matches tag release
|
||||
commitHash = "b3e6599f43beff698f471c6f46888045453fa030"; # matches tag release
|
||||
shortCommitHash = builtins.substring 0 7 commitHash;
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "copywrite";
|
||||
version = "0.25.1";
|
||||
version = "0.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "copywrite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IRmcR2wQFoI7jDNY64ioRpTFNpyVKJlDq++DTeMNkMI=";
|
||||
hash = "sha256-/ltP6ySkmeRQSmgTtF2Fa1RFbhFqiK9iI6ttKirweBk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+wgUT72LzGrn+rnEfRtJ9J0oLodhR52zbQ8sAd2BQvg=";
|
||||
vendorHash = "sha256-tMKJGEAry9eL87y+yyEEQD4ZaDM573srNvAmAd59VwY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
|||
env.CGO_ENABLED = 0;
|
||||
|
||||
checkFlags = [
|
||||
"-skip=Test_FormatCopyrightYears_AutoDetect" # depends on git metadata
|
||||
"-skip=Test_FormatCopyrightYears_AutoDetect|Test_FormatCopyrightYearsForNewHeaders_AutoDetect" # depends on git metadata
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -2,33 +2,34 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
mp4v2Support ? true,
|
||||
mp4v2,
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "faac";
|
||||
version = "1.31.1";
|
||||
version = "1.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knik0";
|
||||
repo = "faac";
|
||||
tag = "faac-${finalAttrs.version}";
|
||||
hash = "sha256-mSdFnmOOpCJ9lvX1vLyAZdK7m+0cUSdLTScGs+Sh1Rc=";
|
||||
hash = "sha256-264+OHyqG5Ccwx15cHhDqsk+9Z6UsdYr0bvrPWHP5xw=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional mp4v2Support "--with-external-mp4v2";
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = lib.optional mp4v2Support mp4v2;
|
||||
mesonFlags = [
|
||||
"-Db_lto=false" # plugin needed to handle lto object
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/knik0/faac/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Open source MPEG-4 and MPEG-2 AAC encoder";
|
||||
homepage = "https://github.com/knik0/faac";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchsvn,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
dbus,
|
||||
fzssh,
|
||||
gettext,
|
||||
gnutls,
|
||||
libfilezilla,
|
||||
|
|
@ -20,14 +21,15 @@
|
|||
xdg-utils,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "filezilla";
|
||||
version = "3.69.6";
|
||||
version = "3.70.5";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk";
|
||||
rev = "11365";
|
||||
hash = "sha256-KJI+UxKiwmZfVG0CiS3lDnjz+YNjTy7IoTcOmlGkluk=";
|
||||
src = fetchurl {
|
||||
# Upstream download link was made unstable on purpose
|
||||
# See https://trac.filezilla-project.org/ticket/13186
|
||||
url = "https://sources.archlinux.org/other/filezilla/filezilla-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-d8FsJfsdlNUSlLAe/SDT5cwRmESFfktDmCrKa4mO5dY=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -44,6 +46,7 @@ stdenv.mkDerivation {
|
|||
buildInputs = [
|
||||
boost
|
||||
dbus
|
||||
fzssh
|
||||
gettext
|
||||
gnutls
|
||||
libfilezilla
|
||||
|
|
@ -75,4 +78,4 @@ stdenv.mkDerivation {
|
|||
pSub
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flow";
|
||||
version = "0.314.0";
|
||||
version = "0.315.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-98rtymAYp8MoPtgnuoMVKc8ss4JK2cQ/4dWVN1TGJsA=";
|
||||
hash = "sha256-AEiyI0RObGColAEiDXVg7wXxsHttce+6nL+uzKwcRcA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -4,21 +4,22 @@
|
|||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
python3,
|
||||
rocksdb_7_10,
|
||||
rocksdb_9_10,
|
||||
zeromq,
|
||||
nix-update-script,
|
||||
libsForQt5,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fulcrum";
|
||||
version = "1.12.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/RlvbZ6/f0Jxj6oCeHjGWqlktvtNUNczOXi2/wYw2LQ=";
|
||||
hash = "sha256-5DsZcnmqO8ZuD3+H/1lkfBrKeGq7efAjji0JDXTPQ1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,13 +30,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
python3
|
||||
libsForQt5.qtbase
|
||||
rocksdb_7_10
|
||||
rocksdb_9_10
|
||||
zeromq
|
||||
];
|
||||
|
||||
dontWrapQtApps = true; # no GUI
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC";
|
||||
|
|
@ -43,5 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with lib.maintainers; [ prusnak ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "Fulcrum";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
60
pkgs/by-name/fz/fzssh/package.nix
Normal file
60
pkgs/by-name/fz/fzssh/package.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
libargon2,
|
||||
libfilezilla,
|
||||
meson,
|
||||
nettle,
|
||||
ninja,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
testers,
|
||||
|
||||
autoreconfHook,
|
||||
gettext,
|
||||
gnutls,
|
||||
libiconv,
|
||||
libxcrypt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fzssh";
|
||||
version = "1.2.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchurl {
|
||||
# Upstream download link was made unstable on purpose
|
||||
# See https://trac.filezilla-project.org/ticket/13186
|
||||
url = "https://sources.archlinux.org/other/packages/fzssh/fzssh-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-oFj1meahLF00t0hu4Ra4zvfG5sq/6xchd5xDjGHx/h0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libargon2
|
||||
libfilezilla
|
||||
nettle
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
versionCheck = true;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://lib.filezilla-project.org/";
|
||||
description = "SSH/SFTP library based on libfilezilla";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
pkgConfigModules = [ "libfzssh-client" ];
|
||||
};
|
||||
})
|
||||
|
|
@ -8,18 +8,26 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ghost-complete";
|
||||
version = "0.9.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StanMarek";
|
||||
repo = "ghost-complete";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fsGrhQK28YFksI2pNiZ6fI6KjZOXxXxrhWjxOmBNk08=";
|
||||
hash = "sha256-SL0PRGppuiglP/BStlvc//6dn2lP472lLfhz3Hq7ZVw=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
cargoHash = "sha256-kiYdMczvnauhu/2ryO0NcK3PAI1P+xmYV8nRrIWaEB8=";
|
||||
# Upstream hardcodes `-fuse-ld=/usr/bin/ld` for darwin targets, which the
|
||||
# Nix clang wrapper rejects ("invalid linker name"). Drop the flag and let
|
||||
# the wrapper pick the right linker.
|
||||
postPatch = ''
|
||||
substituteInPlace .cargo/config.toml \
|
||||
--replace-fail '"-C", "link-arg=-fuse-ld=/usr/bin/ld",' ""
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-F568kxHWcbBQuAwUpkT1AwAr/u486/k094wVmB9SiqY=";
|
||||
|
||||
cargoBuildFlags = [ "--package=ghost-complete" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "harper";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8FTmeavSPH5OAkLbAaP69j98X5U3V4Trn7BMOw0BS8o=";
|
||||
hash = "sha256-cTJ6qehT2XuEBTiRESSAmJWXEvTnimqiFEhV9q4DyTc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cHtUPev09kRxu1X52fFWo/eBuc6t+uQDkwa21wVUrBc=";
|
||||
cargoHash = "sha256-NPtDUt5IaAw4ZWQQUAdLTLEFJ4MMbe4yPE04Ui0aN3k=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=harper-cli"
|
||||
|
|
|
|||
|
|
@ -50,21 +50,21 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.47.0";
|
||||
version = "0.47.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QI+h7LSpJ5VYae3XdwDhKmpLqEGpmSulXP/mTop3gio=";
|
||||
hash = "sha256-/FOeJiC9SNE/k7SzXl5nmwdfKiFlKa0C0IuIph4cRxQ=";
|
||||
};
|
||||
|
||||
goModules =
|
||||
(buildGo126Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-ZEiIGHj30h3l7mfJkOrPDTMI/GBtf/QDiG/lrqceggg=";
|
||||
vendorHash = "sha256-SuLcY8M+F9HijinaNr6jmsGlJ00o5LJN+Y04cfjyQ/c=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.1.1";
|
||||
version = "2.2.1";
|
||||
pname = "lcalc";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sagemath";
|
||||
repo = "lcalc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0CYrRGn5YQ07BaGu0Q5otnjwyh3sNq21EXp3M/KlRdw=";
|
||||
hash = "sha256-L9502+lwSPLk63C14Pxa8OZWhnY4OqKv9WudZO2vP7E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
--- a/math/m_sparse_factor.c
|
||||
+++ b/math/m_sparse_factor.c
|
||||
@@ -1236,7 +1236,6 @@ int I, NumberOfTies = 0;
|
||||
ElementPtr ChosenPivot, TiedElements[MAX_MARKOWITZ_TIES + 1];
|
||||
RealNumber Magnitude, LargestInCol, Ratio, MaxRatio;
|
||||
RealNumber LargestOffDiagonal;
|
||||
-RealNumber FindBiggestInColExclude();
|
||||
|
||||
/* Begin `QuicklySearchDiagonal'. */
|
||||
NumberOfTies = -1;
|
||||
@@ -1434,7 +1433,6 @@ register ElementPtr pDiag;
|
||||
int I;
|
||||
ElementPtr ChosenPivot, pOtherInRow, pOtherInCol;
|
||||
RealNumber Magnitude, LargestInCol, LargestOffDiagonal;
|
||||
-RealNumber FindBiggestInColExclude();
|
||||
|
||||
/* Begin `QuicklySearchDiagonal'. */
|
||||
ChosenPivot = NULL;
|
||||
@@ -1601,7 +1599,6 @@ register ElementPtr pDiag;
|
||||
int NumberOfTies = 0, Size = Matrix->Size;
|
||||
ElementPtr ChosenPivot;
|
||||
RealNumber Magnitude, Ratio, RatioOfAccepted = 0.0, LargestInCol;
|
||||
-RealNumber FindBiggestInColExclude();
|
||||
|
||||
/* Begin `SearchDiagonal'. */
|
||||
ChosenPivot = NULL;
|
||||
|
|
@ -4,54 +4,36 @@
|
|||
fetchurl,
|
||||
pkg-config,
|
||||
libtool,
|
||||
perl,
|
||||
bsdbuild,
|
||||
gettext,
|
||||
mandoc,
|
||||
libpng,
|
||||
libjpeg,
|
||||
libxinerama,
|
||||
freetype,
|
||||
SDL,
|
||||
libGL,
|
||||
libsndfile,
|
||||
portaudio,
|
||||
libmysqlclient,
|
||||
fontconfig,
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libagar";
|
||||
version = "1.5.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://stable.hypertriton.com/agar/agar-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42";
|
||||
hash = "sha256-0euZTIJizXDfHU2UYsVFMInbXcgV0BtXZ1CMKSOlllw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-conflicting-types.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure.in \
|
||||
--replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
|
||||
cat configure.in | ${bsdbuild}/bin/mkconfigure > configure
|
||||
substituteInPlace configure \
|
||||
--replace-fail '_BSD_SOURCE' '_DEFAULT_SOURCE'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-libtool=${libtool}/bin/libtool"
|
||||
"--enable-nls=yes"
|
||||
"--with-gettext=${gettext}"
|
||||
"--enable-nls=no"
|
||||
"--with-jpeg=${libjpeg.dev}"
|
||||
"--with-gl=${libGL}"
|
||||
"--with-mysql=${libmysqlclient}"
|
||||
"--with-manpages=yes"
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -61,26 +43,22 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
bsdbuild
|
||||
perl
|
||||
libxinerama
|
||||
SDL
|
||||
libGL
|
||||
libmysqlclient
|
||||
mandoc
|
||||
freetype.dev
|
||||
freetype
|
||||
libpng
|
||||
libjpeg.dev
|
||||
libjpeg
|
||||
fontconfig
|
||||
portaudio
|
||||
libsndfile
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform GUI toolkit";
|
||||
homepage = "http://libagar.org/index.html";
|
||||
license = with lib.licenses; bsd3;
|
||||
license = with lib.licenses; [ bsd3 ];
|
||||
maintainers = with lib.maintainers; [ ramkromberg ];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,37 +1,22 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bsdbuild,
|
||||
libagar,
|
||||
perl,
|
||||
libjpeg,
|
||||
libpng,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libagar-test";
|
||||
inherit (libagar) version src;
|
||||
|
||||
sourceRoot = "agar-${libagar.version}/tests";
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: textdlg.o:(.bss+0x0): multiple definition of `someString';
|
||||
# configsettings.o:(.bss+0x0): first defined here
|
||||
# TODO: the workaround can be removed once nixpkgs updates to 1.6.0.
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure.in \
|
||||
--replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
|
||||
cat configure.in | ${bsdbuild}/bin/mkconfigure > configure
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-agar=${libagar}" ];
|
||||
|
||||
buildInputs = [
|
||||
perl
|
||||
bsdbuild
|
||||
libagar
|
||||
libjpeg
|
||||
libpng
|
||||
|
|
@ -39,12 +24,12 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
meta = {
|
||||
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
|
||||
description = "Tests for libagar";
|
||||
mainProgram = "agartest";
|
||||
homepage = "http://libagar.org/index.html";
|
||||
license = with lib.licenses; bsd3;
|
||||
license = with lib.licenses; [ bsd3 ];
|
||||
maintainers = with lib.maintainers; [ ramkromberg ];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.linux;
|
||||
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libdeltachat";
|
||||
version = "2.50.0";
|
||||
version = "2.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UUMmfQq1zBn6c0dOH0A9t6ChxIE8d1th6MnQYwq9j08=";
|
||||
hash = "sha256-OXazjp3w4NxbcTUNsyeU46erbdj27n1I7dvt+Io/AZ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit (finalAttrs) version src;
|
||||
hash = "sha256-j2cYCAVMjFZaus/v7GJW3IeX5S/OwYkIWYFJ++CIFB4=";
|
||||
hash = "sha256-gt//65v9PF2nnX/zkZGU9hm73lfzOTmw36rbkWu9VX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchsvn,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
gettext,
|
||||
gnutls,
|
||||
|
|
@ -11,14 +11,15 @@
|
|||
libxcrypt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libfilezilla";
|
||||
version = "0.54.1";
|
||||
version = "0.55.5";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk";
|
||||
rev = "11363";
|
||||
hash = "sha256-m4CfnovtZPvwwjlyWKx/L1OkjiIlKfR7tqg+xB+nqzw=";
|
||||
src = fetchurl {
|
||||
# Upstream download link was made unstable on purpose
|
||||
# See https://trac.filezilla-project.org/ticket/13186
|
||||
url = "https://sources.archlinux.org/other/libfilezilla/libfilezilla-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-SQwDLvB8WOurdpe3xRAk3XceovgPxM3JKQjDSDV+BT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,4 +50,4 @@ stdenv.mkDerivation {
|
|||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,17 +2,22 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmowgli";
|
||||
version = "2.1.3";
|
||||
version = "2.1.3-unstable-2024-04-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atheme";
|
||||
repo = "libmowgli-2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0=";
|
||||
rev = "878f7e931b55d36e2e1b27807f7a620cbb0577d8";
|
||||
hash = "sha256-Ik0GDsC0vEFNW/s10u+kNubqVh95ZqXb2I5W9iyU1z4=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmt32emu";
|
||||
version = "2.8.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-xvPLOpTqKM+hcjwMYgG61sVQ4HDnVHG2S1TwGLIP8zs=";
|
||||
hash = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "150.0.2-1";
|
||||
version = "151.0.1-2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -46,8 +46,8 @@ stdenv.mkDerivation {
|
|||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-KMpSMcLJ/wkySo2gbiECJfH2/hcxdTSLXwKcZLMkvhk=";
|
||||
aarch64-linux = "sha256-Dxs7eRN6nj3e/6pQ3z0d27tnTtD6CefhUxPZGwTVL+Y=";
|
||||
x86_64-linux = "sha256-YqFUKUK4GoP2JAIa3aJqz/iAAmD8hh5UqVzbm4jjvm8=";
|
||||
aarch64-linux = "sha256-TIJEiffEa7X51RGmntCAR7NLP51qcJ08aTvKxVAYNsY=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "151.0.1-2",
|
||||
"packageVersion": "151.0.2-1",
|
||||
"source": {
|
||||
"rev": "151.0.1-2",
|
||||
"hash": "sha256-6C048VV6NECGTcdGla4qIa88z677ZTjORf5FM0a4xMM="
|
||||
"rev": "151.0.2-1",
|
||||
"hash": "sha256-Iq6Jf8Cw2AgkI5zehV5TJQBFHCGANtj4e13cy+ANoTo="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "151.0.1",
|
||||
"hash": "sha512-hJKhu5VrODcxU5OL0YsOGOOkrQ0qvCAXtF4CvCdoyPRo1cBjKaMkhaA6Z7ucIhAuar/x5zCAx3dkc11DDcdydw=="
|
||||
"version": "151.0.2",
|
||||
"hash": "sha512-hzCJU+01SieZqaRb5AAzv5/42A+iIPA0qs+9bnVHFpAdQWTDf6VgMsZZslkRZgPguitWbB82UaucwINdUCzXOQ=="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,33 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromCodeberg,
|
||||
autoreconfHook,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "log4shib";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.shibboleth.net/git/cpp-log4shib.git";
|
||||
rev = "a1afe19b7b49c32fcb03e6d72809501b8965cf85";
|
||||
sha256 = "06rrc5l6qxlc8abzim2jcxwz2c577qrjqx15cbfqq1zfqagj9hix";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "Shibboleth";
|
||||
repo = "cpp-log4shib";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PcIkn8LuB4zdYiV0LDM+pzDxeWdS1PiXQox2bGhhORs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
env.CXXFLAGS = "-std=c++11";
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Forked version of log4cpp that has been created for the Shibboleth project";
|
||||
mainProgram = "log4shib-config";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
license = lib.licenses.lgpl21;
|
||||
homepage = "http://log4cpp.sf.net";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-slack";
|
||||
version = "26.04";
|
||||
tag = "v0.2604.0";
|
||||
version = "26.05";
|
||||
tag = "v0.2605.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "slack";
|
||||
inherit tag;
|
||||
hash = "sha256-1BWzKqYNI4QftROuGOjPBNb0qOBQ0gLYkv5zTPsNesU=";
|
||||
hash = "sha256-v8Pinib2SJo5x3F1xYQno4kwzckMjoCi1iiPjJigUnc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w9N7gpO0KTFwawFKsmxdXZGrLLEYkjfbenP7G6hkJk4=";
|
||||
vendorHash = "sha256-DNsDK48/NWylJegqI42/mbbIcSURp1VBXPKVtdq6uak=";
|
||||
|
||||
buildInputs = lib.optional (!withGoolm) olm;
|
||||
tags = lib.optional withGoolm "goolm";
|
||||
|
|
|
|||
13
pkgs/by-name/me/mediawiki/keep-session-object-cache.diff
Normal file
13
pkgs/by-name/me/mediawiki/keep-session-object-cache.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/includes/Installer/DatabaseUpdater.php b/includes/Installer/DatabaseUpdater.php
|
||||
index 8ed996b9dee..733a3210096 100644
|
||||
--- a/includes/Installer/DatabaseUpdater.php
|
||||
+++ b/includes/Installer/DatabaseUpdater.php
|
||||
@@ -1380,7 +1380,7 @@ public function purgeCache() {
|
||||
// ObjectCache
|
||||
$this->db->newDeleteQueryBuilder()
|
||||
->deleteFrom( 'objectcache' )
|
||||
- ->where( ISQLPlatform::ALL_ROWS )
|
||||
+ ->where( "keyname NOT LIKE '%:MWSession:%'" )
|
||||
->caller( __METHOD__ )
|
||||
->execute();
|
||||
|
||||
|
|
@ -14,6 +14,12 @@ stdenvNoCC.mkDerivation rec {
|
|||
hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# NixOS runs the update script on every start as we might need to run some migrations.
|
||||
# Normally this clears all active sessions, for usability we do not do that.
|
||||
./keep-session-object-cache.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace includes/installer/CliInstaller.php \
|
||||
--replace-fail '$vars = Installer::getExistingLocalSettings();' '$vars = null;'
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "miniflux";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniflux";
|
||||
repo = "v2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AF5wiFLXtyf0ZxfVu0zdXcVExm7Zoh/wYS9FuSjfipk=";
|
||||
hash = "sha256-cUCekYGFzvqdLql2Z0YoJ4Ug1bOYFMpvhBinD3sOaB0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9qHe21/Qu2OInjcn4gQOh3LEQ1iqT6rzm8agj+YUD68=";
|
||||
vendorHash = "sha256-aTRc1SspNET3nki7dji0EKIBwSbplsNkKZWud8XJTNA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,18 +14,18 @@
|
|||
portaudio,
|
||||
withJack ? stdenv.hostPlatform.isUnix,
|
||||
libjack2,
|
||||
libsForQt5,
|
||||
qt6Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mt32emu-qt";
|
||||
version = "1.11.1";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}";
|
||||
hash = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
|
||||
hash = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
|
@ -35,26 +35,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'add_subdirectory(mt32emu)' "" \
|
||||
--replace-fail 'add_dependencies(mt32emu-qt mt32emu)' ""
|
||||
''
|
||||
# Bump CMake minimum to something our CMake supports
|
||||
# Fixed treewide in https://github.com/munt/munt/commit/e6af0c7e5d63680716ab350467207c938054a0df
|
||||
# Remove when version > 1.11.1
|
||||
+ ''
|
||||
substituteInPlace CMakeLists.txt mt32emu_qt/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 2.8.12)' 'cmake_minimum_required(VERSION 2.8.12...3.27)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libmt32emu
|
||||
portaudio
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
qt6Packages.qtbase
|
||||
qt6Packages.qtmultimedia
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
|
|
@ -63,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optional withJack libjack2;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "mt32emu-qt_WITH_QT_VERSION" "6")
|
||||
(lib.cmakeBool "mt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING" false)
|
||||
(lib.cmakeBool "munt_WITH_MT32EMU_QT" true)
|
||||
(lib.cmakeBool "munt_WITH_MT32EMU_SMF2WAV" false)
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mt32emu-smf2wav";
|
||||
version = "1.9.0";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
rev = "mt32emu_smf2wav_${lib.replaceString "." "_" finalAttrs.version}";
|
||||
sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
|
||||
sha256 = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
|
@ -30,13 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'add_subdirectory(mt32emu)' "" \
|
||||
--replace-fail 'add_dependencies(mt32emu-smf2wav mt32emu)' ""
|
||||
''
|
||||
# Bump CMake minimum to something our CMake supports
|
||||
# Fixed treewide in https://github.com/munt/munt/commit/e6af0c7e5d63680716ab350467207c938054a0df
|
||||
# Remove when version > 1.9.0
|
||||
+ ''
|
||||
substituteInPlace {./,mt32emu_smf2wav/,mt32emu_smf2wav/libsmf/}CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 2.8.12)' 'cmake_minimum_required(VERSION 2.8.12...3.27)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
cld2,
|
||||
cli11,
|
||||
fmt_11,
|
||||
coreutils,
|
||||
emacs,
|
||||
glib,
|
||||
gmime3,
|
||||
|
|
@ -20,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mu";
|
||||
version = "1.12.13";
|
||||
version = "1.14.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -31,16 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rz0bxgJtz4qHrfHRjJhnvxtFFNM89A39YH9oJ2YGC5g=";
|
||||
hash = "sha256-P2b0JuzgoZkWXSkJWUrjkcfW9oGVPeH1p/hVKfA9Yjc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/utils/mu-utils-file.cc \
|
||||
--replace-fail "/bin/rm" "${coreutils}/bin/rm"
|
||||
substituteInPlace lib/tests/bench-indexer.cc \
|
||||
--replace-fail "/bin/rm" "${coreutils}/bin/rm"
|
||||
substituteInPlace lib/mu-maildir.cc \
|
||||
--replace-fail "/bin/mv" "${coreutils}/bin/mv"
|
||||
patchShebangs build-aux/date.py
|
||||
'';
|
||||
|
||||
|
|
@ -76,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
mesonFlags = [
|
||||
(lib.strings.mesonEnable "guile" false)
|
||||
(lib.strings.mesonEnable "scm" false)
|
||||
(lib.strings.mesonEnable "readline" false)
|
||||
(lib.strings.mesonEnable "tests" finalAttrs.doCheck)
|
||||
(lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp")
|
||||
|
|
|
|||
|
|
@ -68,13 +68,13 @@ let
|
|||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "noctalia-shell";
|
||||
version = "4.7.6";
|
||||
version = "4.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noctalia-dev";
|
||||
repo = "noctalia-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oGMYWsP0qthxQisirZc/r/vpdGTZrInwkh75AC714AE=";
|
||||
hash = "sha256-QszLpoDPD7JEv8B/w1U2u1ksBw/CYBDmwUTLhJrekF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
DarwinTools,
|
||||
darwin,
|
||||
alsa-utils,
|
||||
at-spi2-core,
|
||||
cmake,
|
||||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
lsb-release
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
DarwinTools
|
||||
darwin.DarwinTools
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromCodeberg,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
boost,
|
||||
|
|
@ -11,16 +11,18 @@
|
|||
xml-security-c,
|
||||
xml-tooling-c,
|
||||
zlib,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opensaml-cpp";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.shibboleth.net/git/cpp-opensaml.git";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "Shibboleth";
|
||||
repo = "cpp-opensaml";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-iBfKM40SzCiDGHacnxc7zZdvOYbCy9NEWjhPzCvWQ1c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -46,12 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://shibboleth.net/products/opensaml-cpp.html";
|
||||
description = "Low-level library written in C++ that provides support for producing and consuming SAML messages";
|
||||
mainProgram = "samlsign";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
asio_1_32_0,
|
||||
glib,
|
||||
fmt_11,
|
||||
jsoncpp,
|
||||
libcap_ng,
|
||||
libnl,
|
||||
|
|
@ -23,29 +25,42 @@
|
|||
cmake,
|
||||
git,
|
||||
nix-update-script,
|
||||
unzip,
|
||||
enableSystemdResolved ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
# Derived from subprojects/fmt.wrap
|
||||
libfmt-meson-patch = fetchurl {
|
||||
url = "https://wrapdb.mesonbuild.com/v2/fmt_11.2.0-1/get_patch";
|
||||
hash = "sha256-ZFvxwzWiRgi0s08W7RC5I3u7ATFIhmj7hkVCAiOeCGw=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvpn3";
|
||||
version = "25";
|
||||
version = "27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenVPN";
|
||||
repo = "openvpn3-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Fme8OT49h2nZw5ypyeKdHlqv2Hk92LW2KVisd0jC66s=";
|
||||
hash = "sha256-H+QF0Z1IUKx2U0+V7KHaAd/AKbuJEKLIwqyK2srD8DM=";
|
||||
# `openvpn3-core` is a submodule.
|
||||
# TODO: make it into a separate package
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Should be fixed in v26: https://codeberg.org/OpenVPN/openvpn3-linux/issues/70
|
||||
./v25-latest-linux-fix.patch
|
||||
./0001-handle-result-from-DcoKeyConfig_ParseFromString.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
cp -r ${fmt_11.src} subprojects/fmt-11.2.0
|
||||
chmod +w -R subprojects/fmt-11.2.0 # Allow patches for subprojects to work
|
||||
tmp=$(mktemp -d)
|
||||
unzip ${libfmt-meson-patch} -d $tmp
|
||||
cp -r $tmp/*/* subprojects/fmt-11.2.0
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
echo '#define OPENVPN_VERSION "3.git:unknown:unknown"
|
||||
#define PACKAGE_GUIVERSION "v${builtins.replaceStrings [ "_" ] [ ":" ] version}"
|
||||
|
|
@ -72,6 +87,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
cmake
|
||||
git
|
||||
unzip
|
||||
|
||||
python3.pkgs.wrapPython
|
||||
python3.pkgs.docutils
|
||||
|
|
@ -107,6 +123,7 @@ stdenv.mkDerivation rec {
|
|||
(lib.mesonOption "dbus_policy_dir" "${placeholder "out"}/share/dbus-1/system.d")
|
||||
(lib.mesonOption "dbus_system_service_dir" "${placeholder "out"}/share/dbus-1/system-services")
|
||||
(lib.mesonOption "systemd_system_unit_dir" "${placeholder "out"}/lib/systemd/system")
|
||||
(lib.mesonOption "systemd_user_unit_dir" "${placeholder "out"}/lib/systemd/user")
|
||||
(lib.mesonOption "create_statedir" "false")
|
||||
(lib.mesonOption "sharedstatedir" "/etc")
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
diff --git a/openvpn3-core/openvpn/dco/ovpn_dco_linux.h b/openvpn3-core/openvpn/dco/ovpn_dco_linux.h
|
||||
index 238f71f7a..5b7fe8d8c 100644
|
||||
--- a/openvpn3-core/openvpn/dco/ovpn_dco_linux.h
|
||||
+++ b/openvpn3-core/openvpn/dco/ovpn_dco_linux.h
|
||||
@@ -239,22 +239,6 @@ enum ovpn_netlink_packet_attrs {
|
||||
OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1,
|
||||
};
|
||||
|
||||
-enum ovpn_ifla_attrs {
|
||||
- IFLA_OVPN_UNSPEC = 0,
|
||||
- IFLA_OVPN_MODE,
|
||||
-
|
||||
- __IFLA_OVPN_AFTER_LAST,
|
||||
- IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST - 1,
|
||||
-};
|
||||
-
|
||||
-enum ovpn_mode {
|
||||
- __OVPN_MODE_FIRST = 0,
|
||||
- OVPN_MODE_P2P = __OVPN_MODE_FIRST,
|
||||
- OVPN_MODE_MP,
|
||||
-
|
||||
- __OVPN_MODE_AFTER_LAST,
|
||||
-};
|
||||
-
|
||||
/// \endcond
|
||||
|
||||
#endif /* _UAPI_LINUX_OVPN_DCO_H_ */
|
||||
|
|
@ -20,12 +20,12 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "poco";
|
||||
|
||||
version = "1.15.2";
|
||||
version = "1.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocoproject";
|
||||
repo = "poco";
|
||||
hash = "sha256-Vx3aXKnka32dw0/6kA3000kmze2CMzCWBW8zDl1xqSA=";
|
||||
hash = "sha256-mUONqjbKHvdsTM6zk9/QLEr1lVV6f9I/shLW2B8iqMk=";
|
||||
tag = "poco-${version}-release";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,16 +24,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "qbz";
|
||||
version = "1.2.13";
|
||||
version = "1.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vicrodh";
|
||||
repo = "qbz";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LlpMCO8RHbC+MNCcsaUqAGNuaK2CSk4GEpVtmfKtsFo=";
|
||||
hash = "sha256-WWTigVnsCex/7DPu4way80UL6Tusj38qTAQe9WGwc04=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-X5YJb1Pu+phAHOLUX9YnKDL0lJQqUXxK4J3S4PVt1YY=";
|
||||
cargoHash = "sha256-Pj+60pr8IUXlDsDYVO9ahlZdeWDwTRzzYXIHn3y336o=";
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
npmDeps = fetchNpmDeps {
|
||||
name = "qbz-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-HfdYKnjXf6/LqdTy7RCPfVfh8NdXuGHYrqDWAT3ozk4=";
|
||||
hash = "sha256-FOj1wPFOiswm2GGfkgrUtMGtqPbwjjYqp09ccrDz8AY=";
|
||||
};
|
||||
|
||||
env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "r2modman";
|
||||
version = "3.2.16";
|
||||
version = "3.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebkr";
|
||||
repo = "r2modmanPlus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ya7VPb+bmOvtXNex9R80N6rZLSCVoyntqCzaHXIwb1M=";
|
||||
hash = "sha256-DXGgTezCcMl37Vu7R+2dwWJmuqsXXtlWRYMX9gqm7+w=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
|
@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Remove after upstream updates to Yarn 4.14
|
||||
# https://github.com/ebkr/r2modmanPlus/blob/develop/package.json#L118
|
||||
./yarn-4.14-support.patch
|
||||
|
||||
# Fix copying of wrapper files to game directory
|
||||
./wrapper-fix.patch
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
15
pkgs/by-name/r2/r2modman/wrapper-fix.patch
Normal file
15
pkgs/by-name/r2/r2modman/wrapper-fix.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue
|
||||
index a3d16f16..36d77fb1 100644
|
||||
--- a/src/pages/Splash.vue
|
||||
+++ b/src/pages/Splash.vue
|
||||
@@ -188,8 +188,8 @@ async function ensureWrapperInGameFolder(wrapperName: WrapperScript) {
|
||||
if (await FsProvider.instance.exists(path.join(PathResolver.MOD_ROOT, wrapperName))) {
|
||||
await FsProvider.instance.unlink(path.join(PathResolver.MOD_ROOT, wrapperName));
|
||||
}
|
||||
- const wrapperFileResult = await fetch(ProtocolProvider.getPublicAssetUrl(`/${wrapperName}`)).then(res => res.arrayBuffer());
|
||||
- const wrapperFileContent = Buffer.from(wrapperFileResult);
|
||||
+ const wrapperFilePath = path.join(staticsDirectory, wrapperName);
|
||||
+ const wrapperFileContent = await FsProvider.instance.readFile(wrapperFilePath);
|
||||
await FsProvider.instance.writeFile(path.join(PathResolver.MOD_ROOT, wrapperName), wrapperFileContent);
|
||||
await FsProvider.instance.writeFile(path.join(PathResolver.MOD_ROOT, wrapperName), wrapperFileContent);
|
||||
}
|
||||
|
|
@ -3,27 +3,36 @@
|
|||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
makeBinaryWrapper,
|
||||
openssl,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "railway";
|
||||
version = "4.36.1";
|
||||
version = "4.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PYTkYCggHvLPWy+YcnLJLdznxglBn4hSvMENAFs5GH0=";
|
||||
hash = "sha256-0Zgdazs6AANKa3QtRHuYmudLpkvMHAzsaTCg3/cSN2o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZxU/vq/A6O4ziEfLUSeQlwQLZEMnE1wnpyfyrYvOs5M=";
|
||||
cargoHash = "sha256-K1W8tn3Nr/PqWHHHF6mGsNqoAzekjEjqAoa6/4MZKfI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/railway \
|
||||
--set RAILWAY_NO_AUTO_UPDATE true
|
||||
'';
|
||||
|
||||
meta = {
|
||||
mainProgram = "railway";
|
||||
description = "Railway.app CLI";
|
||||
|
|
|
|||
|
|
@ -8,22 +8,29 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rgx";
|
||||
version = "0.12.1";
|
||||
version = "0.12.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevity1swos";
|
||||
repo = "rgx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-05WEJ3gefPjBHuMXWhr135VtYnbteZapiAtNKwm4wxU=";
|
||||
hash = "sha256-01JnU+vDkEIYrEhl9KUGZx2+p2Xw76qjI9mpGsaTPLA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CSGuf2jOjyLBfD0Fv3G01FioiyiXX8Bx/IiCkIBWbsQ=";
|
||||
cargoHash = "sha256-ZjfLh+vYlKP0JLxLvnkB9Qr3aQ/Oki/KvQmjCF7G1Mg=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
buildFeatures = [ "pcre2-engine" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(\\d+\\.\\d+\\.\\d+)$"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/brevity1swos/rgx";
|
||||
|
|
@ -33,7 +40,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ Cameo007 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
Cameo007
|
||||
kybe236
|
||||
];
|
||||
mainProgram = "rgx";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" false)
|
||||
(lib.cmakeBool "USE_SYSTEM_ZLIB" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_LIBUSB" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_LIBPNG" true)
|
||||
|
|
|
|||
|
|
@ -3,15 +3,8 @@
|
|||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
kdoctools,
|
||||
wrapQtAppsHook,
|
||||
knotifyconfig,
|
||||
kidletime,
|
||||
kwindowsystem,
|
||||
kstatusnotifieritem,
|
||||
ktextwidgets,
|
||||
kcrash,
|
||||
kdePackages,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -25,17 +18,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
wrapQtAppsHook
|
||||
kdePackages.extra-cmake-modules
|
||||
kdePackages.kdoctools
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
knotifyconfig
|
||||
kidletime
|
||||
kwindowsystem
|
||||
kstatusnotifieritem
|
||||
ktextwidgets
|
||||
kcrash
|
||||
kdePackages.knotifyconfig
|
||||
kdePackages.kidletime
|
||||
kdePackages.kwindowsystem
|
||||
kdePackages.kstatusnotifieritem
|
||||
kdePackages.ktextwidgets
|
||||
kdePackages.kcrash
|
||||
];
|
||||
|
||||
meta = {
|
||||
38
pkgs/by-name/ru/rura/package.nix
Normal file
38
pkgs/by-name/ru/rura/package.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rura";
|
||||
version = "1.3.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlipinski";
|
||||
repo = "rura";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cwL3Dw1qPYcKFzy0CV/XI7jZWHZZoZumdbB2kK+9jdc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T/7v1WxTfsilw5i592EoRWxpkaL4bnluXmCModO1WQg=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Interactive TUI scratchpad for building shell pipelines";
|
||||
homepage = "https://github.com/tlipinski/rura";
|
||||
changelog = "https://github.com/tlipinski/rura/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ frantathefranta ];
|
||||
mainProgram = "rura";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,30 +1,33 @@
|
|||
{
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromCodeberg,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rusty-diceware";
|
||||
version = "0.5.8";
|
||||
version = "0.5.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "yuvallanger";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "kakafarm";
|
||||
repo = "rusty-diceware";
|
||||
rev = "diceware-v${finalAttrs.version}";
|
||||
hash = "sha256-GDWvHHl4EztTaR0jI4XL1I9qE2KSL+q9C8IvLWQF4Ys=";
|
||||
rev = "53975f17f5f575720d724035bd715dd2dd75986d";
|
||||
hash = "sha256-uSbJFZ0wqo1RbRP9BWiT4cDg9CV/aSYz432a/qUk7qw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f+jvrokt5kuHYKKfluu4OvI7dzp9rFPlTo4KC4jKb0o=";
|
||||
|
||||
doCheck = true;
|
||||
cargoHash = "sha256-TCNHtDz7dgUx5lBwwIs67mnQcAZ5Xknc6otpl8zRaVc=";
|
||||
|
||||
meta = {
|
||||
description = "Commandline diceware, with or without dice, written in Rustlang";
|
||||
homepage = "https://gitlab.com/yuvallanger/rusty-diceware";
|
||||
changelog = "https://gitlab.com/yuvallanger/rusty-diceware/-/blob/v${finalAttrs.version}/CHANGELOG.md?ref_type=heads";
|
||||
homepage = "https://codeberg.org/kakafarm/rusty-diceware";
|
||||
changelog = "https://codeberg.org/kakafarm/rusty-diceware/src/branch/master/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ cherrykitten ];
|
||||
maintainers = with lib.maintainers; [
|
||||
cherrykitten
|
||||
kybe236
|
||||
];
|
||||
mainProgram = "diceware";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "SDL_net";
|
||||
version = "1.2.8-unstable-2026-03-17";
|
||||
version = "1.2.8-unstable-2026-05-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_net";
|
||||
rev = "cd5a2ebdea1a15b27f503cc7ffdcaf056d047b73";
|
||||
hash = "sha256-z3bJYf3PzS0ydoeL0Ay0HOZ9ImKZMyLbVZhD+u5BD6w=";
|
||||
rev = "8363cd02baf1b65c287691bdd22c3dc87da9759d";
|
||||
hash = "sha256-sAZ9I7jOo33Btitcl8mn4R7fYn2W8GWPttXELeEq7h4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromCodeberg,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
boost,
|
||||
|
|
@ -13,16 +13,18 @@
|
|||
xercesc,
|
||||
xml-security-c,
|
||||
xml-tooling-c,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shibboleth-sp";
|
||||
version = "3.0.4.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.shibboleth.net/git/cpp-sp.git";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "Shibboleth";
|
||||
repo = "cpp-sp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ub3TFKbRJKyiNy5+t5Aaiwt29ibOuBx4WiDMV/5qZOE=";
|
||||
};
|
||||
|
||||
# Upgrade to Clang 19 (and thereby LLVM19) causes `std::char_traits` to now be present,
|
||||
|
|
@ -34,13 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
patches = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") [
|
||||
(fetchpatch {
|
||||
name = "char-traits-ambig-1";
|
||||
url = "https://git.shibboleth.net/view/?p=cpp-sp.git;a=blobdiff_plain;f=shibsp/util/IPRange.cpp;h=532cf9e94c915667c091d127c696979f63939eb5;hp=d6f00bc36ea25997817a2308314bcdbea572936f;hb=49cd05fa6d9935a45069fa555db7a26ca77d23db;hpb=293ff2ab6454b0946b3b03719efa132bff461f1f";
|
||||
url = "https://codeberg.org/Shibboleth/cpp-sp/commit/49cd05fa6d9935a45069fa555db7a26ca77d23db.diff";
|
||||
hash = "sha256-ZF0jsZJoHaxaPPjVbT6Wlq+wjyPQLTnEKcUxONji/hE=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "char-traits-ambig-2";
|
||||
url = "https://git.shibboleth.net/view/?p=cpp-sp.git;a=blobdiff_plain;f=shibsp/util/IPRange.cpp;h=da954870eb03c7cd054ecc5c52a6c1f011787760;hp=354010d5f5e533262cb385ea16756df53fe0c241;hb=793663a67aaa4e9a4aa9172728d924f8cec45cf6;hpb=a43814935030930c49b7a08f5515b861906525c7";
|
||||
url = "https://codeberg.org/Shibboleth/cpp-sp/commit/793663a67aaa4e9a4aa9172728d924f8cec45cf6.diff";
|
||||
includes = [ "shibsp/util/IPRange.cpp" ];
|
||||
hash = "sha256-4iGwCGpGwAkriOwQmh5AgvHLX1o39NuQ2l4sAJbD2bc=";
|
||||
})
|
||||
];
|
||||
|
|
@ -66,16 +69,19 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--with-saml=${opensaml-cpp}"
|
||||
"--with-boost=${boost.dev}"
|
||||
"--with-fastcgi"
|
||||
"--with-boost=${boost.dev}"
|
||||
"CXXFLAGS=-std=c++14"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://shibboleth.net/products/service-provider.html";
|
||||
description = "Enables SSO and Federation web applications written with any programming language or framework";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ buildGoModule (finalAttrs: {
|
|||
--set XDG_DATA_DIRS ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name} \
|
||||
--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}
|
||||
|
||||
install -D frontend/src/assets/icons/spotiflac.svg $out/share/icons/hicolor/scalable/apps/SpotiFLAC.svg
|
||||
|
||||
runHook postInstall;
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stasis";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saltnpepper97";
|
||||
repo = "stasis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WgfBaBBQSbEgwl14BFiANiK77Mj7ptXqX9Q3CWA2MJ8=";
|
||||
hash = "sha256-xnEzGsUhB7ZAWgBlpZstJqIWcQNiu9o6P/eS7qMv/0w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rXyRvLQ1r7AxBgegOCtexGlBomd6tMDK2X2xUE50Mkg=";
|
||||
cargoHash = "sha256-CZ9TRtd+4KtHwZn8VjkuLMujP9eZHFkaiItGc6BqQsI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -129,10 +129,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
postgresqlTestUserOptions = "LOGIN CREATEDB";
|
||||
postgresqlTestUserOptions = "LOGIN SUPERUSER";
|
||||
|
||||
postgresqlTestSetupPost = ''
|
||||
for database in $(seq 0 15); do
|
||||
for database in $(seq 0 3); do
|
||||
createdb "test$database"
|
||||
done
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.81";
|
||||
version = "3.16.84";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TdfeoGfVEsrP1dIzchd++iMkVxQixSpJNIfcvV1Dl2c=";
|
||||
hash = "sha256-wt5NGa4K8/vda669UYUmTUt+BR9X5fPnuTZFfQdpLYo=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
2235
pkgs/by-name/st/stirling-pdf/deps.json
generated
2235
pkgs/by-name/st/stirling-pdf/deps.json
generated
File diff suppressed because it is too large
Load diff
33
pkgs/by-name/st/stirling-pdf/fix-cargo-lock.patch
Normal file
33
pkgs/by-name/st/stirling-pdf/fix-cargo-lock.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock
|
||||
index 87d5531..39b03ed 100644
|
||||
--- a/frontend/src-tauri/Cargo.lock
|
||||
+++ b/frontend/src-tauri/Cargo.lock
|
||||
@@ -1966,7 +1966,7 @@ dependencies = [
|
||||
"js-sys",
|
||||
"log",
|
||||
"wasm-bindgen",
|
||||
- "windows-core 0.61.2",
|
||||
+ "windows-core 0.62.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -6041,6 +6041,19 @@ dependencies = [
|
||||
"windows-core 0.61.2",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "windows-core"
|
||||
+version = "0.61.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
|
||||
+dependencies = [
|
||||
+ "windows-implement",
|
||||
+ "windows-interface",
|
||||
+ "windows-link 0.1.3",
|
||||
+ "windows-result 0.3.4",
|
||||
+ "windows-strings 0.4.2",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.62.2"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff --git a/frontend/src-tauri/stirling-pdf.desktop b/frontend/src-tauri/stirling-pdf.desktop
|
||||
index 45db59c..8068696 100644
|
||||
--- a/frontend/src-tauri/stirling-pdf.desktop
|
||||
+++ b/frontend/src-tauri/stirling-pdf.desktop
|
||||
@@ -3,13 +3,13 @@ Version=1.0
|
||||
Type=Application
|
||||
Name=Stirling-PDF
|
||||
Comment=Locally hosted web application that allows you to perform various operations on PDF files
|
||||
-Exec=/usr/bin/stirling-pdf
|
||||
+Exec=stirling-pdf
|
||||
Icon={{icon}}
|
||||
Terminal=false
|
||||
-MimeType=application/pdf;
|
||||
+MimeType=application/pdf;x-scheme-handler/stirlingpdf;
|
||||
Categories=Office;Graphics;Utility;
|
||||
Actions=open-file;
|
||||
|
||||
[Desktop Action open-file]
|
||||
Name=Open PDF File
|
||||
-Exec=/usr/bin/stirling-pdf %F
|
||||
\ No newline at end of file
|
||||
+Exec=stirling-pdf %F
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
cargo,
|
||||
cargo-tauri,
|
||||
go-task,
|
||||
gradle_8,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
|
|
@ -24,6 +25,7 @@
|
|||
nixosTests,
|
||||
|
||||
isDesktopVariant ? false,
|
||||
withAdditionalFeatures ? true,
|
||||
buildWithFrontend ? !isDesktopVariant,
|
||||
}:
|
||||
|
||||
|
|
@ -36,23 +38,21 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stirling-pdf" + lib.optionalString isDesktopVariant "-desktop";
|
||||
version = "2.8.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stirling-Tools";
|
||||
repo = "Stirling-PDF";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5MZwwBT8Qi1kO+DAO/3JIm0/yAFtQLBo1UXDRZUjK7s=";
|
||||
hash = "sha256-Qod8x8aB6qDxbRTE5rWUoqVka5kizfXJAWkKo5lhnFQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove timestamp from the header of a generated .properties file
|
||||
./remove-props-file-timestamp.patch
|
||||
|
||||
# Note: only affects the desktop variant
|
||||
# fix path to the stirling-pdf binary
|
||||
# and add support for the stirlingpdf:// protocol
|
||||
./fix-desktop-file.patch
|
||||
# upstream probably forgot to commit the lockfile after a bump
|
||||
./fix-cargo-lock.patch
|
||||
];
|
||||
|
||||
npmRoot = "frontend";
|
||||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src patches;
|
||||
postPatch = "cd ${finalAttrs.npmRoot}";
|
||||
hash = "sha256-HyQok7Cd1kfWKCtaeHAhvZgxSvaKCk32bdJoNKj//rA=";
|
||||
hash = "sha256-y+mviHatwhdIGCOKir1nnG/0Zm8oSoLKW345tU9upls=";
|
||||
};
|
||||
|
||||
cargoRoot = "frontend/src-tauri";
|
||||
|
|
@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
patches
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-t6TBUsfOadn3KNLxva6iajlhg21dFqxgH962e1bIRLI=";
|
||||
hash = "sha256-Tx6twcyFupNOzuXbW8uUulMJFObyPg/i2U0QnvyhIRQ=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
|
|
@ -85,29 +85,20 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# we'll trigger it manually in postBuild
|
||||
dontTauriBuild = true;
|
||||
|
||||
env = {
|
||||
PUPPETEER_SKIP_DOWNLOAD = "1";
|
||||
# taken from here https://github.com/Stirling-Tools/Stirling-PDF/blob/main/.github/workflows/tauri-build.yml#L346-L348
|
||||
VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY = "sb_publishable_UHz2SVRF5mvdrPHWkRteyA_yNlZTkYb";
|
||||
VITE_SAAS_SERVER_URL = "https://app.stirlingpdf.com";
|
||||
VITE_SAAS_BACKEND_API_URL = "https://api.stirlingpdf.com";
|
||||
DISABLE_ADDITIONAL_FEATURES = if withAdditionalFeatures then "false" else "true";
|
||||
};
|
||||
|
||||
# disable spotless because it tries to fetch files not in deps.json
|
||||
# and also because it slows down the build process
|
||||
gradleFlags = [
|
||||
"-x"
|
||||
"spotlessApply"
|
||||
"-DDISABLE_ADDITIONAL_FEATURES=true"
|
||||
"-PnoSpotless" # disable spotless because it tries to fetch files not in deps.json and also because it slows down the build process
|
||||
]
|
||||
++ lib.optionals buildWithFrontend [ "-PbuildWithFrontend=true" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
go-task
|
||||
gradle
|
||||
jre # one of the tests also require that the `java` command is available on the command line
|
||||
makeBinaryWrapper
|
||||
|
|
@ -133,14 +124,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
postBuild = lib.optionalString isDesktopVariant ''
|
||||
install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar -t ./frontend/src-tauri/libs
|
||||
mkdir -p ./frontend/src-tauri/runtime/
|
||||
ln -s ${jre} ./frontend/src-tauri/runtime/jre
|
||||
dontUseGradleBuild = isDesktopVariant; # we'll use the buildPhase from cargo-tauri-hook for the desktop app
|
||||
|
||||
# Unset these, since tauriBuildHook would recursively call them
|
||||
unset preBuild postBuild
|
||||
tauriBuildHook
|
||||
# prepare the resources before building the desktop app
|
||||
preBuild = lib.optionals isDesktopVariant ''
|
||||
MODE=desktop task frontend:prepare
|
||||
|
||||
# this simulates what the desktop:jlink:jar would do
|
||||
gradle bootJar
|
||||
install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar -t ./frontend/src-tauri/libs
|
||||
|
||||
# creates as minimal jre via jlink
|
||||
task desktop:jlink:runtime
|
||||
|
||||
substituteInPlace frontend/src-tauri/stirling-pdf.desktop \
|
||||
--replace-fail 'MimeType=application/pdf;' 'MimeType=application/pdf;x-scheme-handler/stirlingpdf;'
|
||||
'';
|
||||
|
||||
# we use the installPhase from cargo-tauri-hook when we're building the desktop variant
|
||||
|
|
@ -154,17 +152,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# tauri installs the jre without preserving symlinks
|
||||
# so we just symlink it again into the install location
|
||||
# on darwin, we also create a wrapper for the binary inside the app bundle
|
||||
postInstall = lib.optionalString isDesktopVariant ''
|
||||
res_dir="$out/lib/Stirling-PDF/"
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
res_dir="$out/Applications/Stirling-PDF.app/Contents/Resources"
|
||||
makeWrapper "$out/Applications/Stirling-PDF.app/Contents/MacOS/stirling-pdf" "$out/bin/stirling-pdf"
|
||||
''}
|
||||
rm -r "$res_dir/runtime/jre"
|
||||
ln -s ${jre} "$res_dir/runtime/jre"
|
||||
postInstall = lib.optionalString (isDesktopVariant && stdenv.hostPlatform.isDarwin) ''
|
||||
makeWrapper "$out/Applications/Stirling-PDF.app/Contents/MacOS/stirling-pdf" "$out/bin/stirling-pdf"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
@ -178,9 +167,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"Powerful, open-source PDF editing platform "
|
||||
+ (if isDesktopVariant then "runnable as a desktop app" else "hostable as a web app");
|
||||
homepage = "https://github.com/Stirling-Tools/Stirling-PDF";
|
||||
license = lib.licenses.mit;
|
||||
license = lib.licenses.mit; # TODO: figure out what proper licensing should be
|
||||
mainProgram = if isDesktopVariant then "stirling-pdf" else "Stirling-PDF";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
staticdev
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
|
|
|
|||
32
pkgs/by-name/th/threadcat/package.nix
Normal file
32
pkgs/by-name/th/threadcat/package.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromCodeberg,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "threadcat";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "blinry";
|
||||
repo = "threadcat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AbdxEgnUM5iqFTKrMK2FnFWvELk46PEEWSVAlv1MBzQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F46gEUWcKl1nFS1faXeWJLV0lmCrJhBN3XpOiTcGXEc=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Converts a Mastodon thread to Markdown, and downloads all contained media files";
|
||||
homepage = "https://codeberg.org/blinry/threadcat";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.aiyion ];
|
||||
mainProgram = "threadcat";
|
||||
};
|
||||
})
|
||||
|
|
@ -18,17 +18,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.11.16";
|
||||
version = "0.11.17";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5LJspcHj/RjOMv7eRB7n+tofX4s51M3kqHCPymCg90A=";
|
||||
hash = "sha256-pjQe/z2Es9k6lhlauo4ie0VCfHE1Co98i3y1RbdwPQw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2lg86WxPGVbJ91zi61lKrSqnzFgmmSrBrl+SfV5SJWU=";
|
||||
cargoHash = "sha256-r+bxTFVzf1wSq5JeAoerxIA32FlxVKfDjchQqviimkY=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "vhd2vl";
|
||||
version = "0-unstable-2022-12-26";
|
||||
version = "0-unstable-2026-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldoolitt";
|
||||
repo = "vhd2vl";
|
||||
rev = "869d442987dff6b9730bc90563ede89c1abfd28f";
|
||||
sha256 = "sha256-Hz2XkT5m4ri5wVR2ciL9Gx73zr+RdW5snjWnUg300c8=";
|
||||
rev = "a6ed1b45ce88bf978f18e8f6fc419e853a6676b4";
|
||||
sha256 = "sha256-lFPGstQd7u5crEJz6bFbbMTmNoZgRFuHb3HVCDnzDYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -125,7 +125,6 @@ let
|
|||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
imadnyc
|
||||
FlameFlag
|
||||
johnrtitor
|
||||
logger
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
libevdev,
|
||||
gtkSupport ? true,
|
||||
gtk3,
|
||||
pcre,
|
||||
glib,
|
||||
wrapGAppsHook3,
|
||||
fltkSupport ? true,
|
||||
|
|
@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
++ lib.optionals gtkSupport [
|
||||
gtk3
|
||||
pcre
|
||||
glib
|
||||
wrapGAppsHook3
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromCodeberg,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
xalanc,
|
||||
xercesc,
|
||||
openssl,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xml-security-c";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.shibboleth.net/git/cpp-xml-security";
|
||||
rev = finalAttrs.version;
|
||||
src = fetchFromCodeberg {
|
||||
owner = "Shibboleth";
|
||||
repo = "cpp-xml-security";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-D60JtD4p9ERh6sowvwBHtE9XWVm3D8saooagDvA6ZtQ=";
|
||||
};
|
||||
|
||||
|
|
@ -36,10 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
openssl
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario";
|
||||
description = "C++ Implementation of W3C security standards for XML";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ drawbu ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromCodeberg,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
boost,
|
||||
|
|
@ -10,14 +10,16 @@
|
|||
log4shib,
|
||||
xercesc,
|
||||
xml-security-c,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xml-tooling-c";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "Shibboleth";
|
||||
repo = "cpp-xmltooling";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw=";
|
||||
};
|
||||
|
|
@ -44,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Low-level library that provides a high level interface to XML processing for OpenSAML 2";
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
rebar3Relx rec {
|
||||
releaseType = "escript";
|
||||
pname = "elvis-erlang";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inaka";
|
||||
repo = "elvis";
|
||||
hash = "sha256-4fr44qTMSc5X12aMSAOUk2gfZcJZsaCCoBMoOg6l7zE=";
|
||||
hash = "sha256-T1LRumm3mP6Vfv3vEiCBm7XnkcY3GvDbe0nYcaxlrGg=";
|
||||
tag = version;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ let
|
|||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "5.0.3";
|
||||
sha256 = "sha256-nGWgQqVCYwB0K4mueG9ynWshjyFFyzYLi7x807Powmw=";
|
||||
version = "5.0.4";
|
||||
sha256 = "sha256-fgzg0yNrG1afDvE5jrJzIf2GNnJy4LFPOJDQQTrMPpo=";
|
||||
};
|
||||
beamDeps = [ katana_code ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
let
|
||||
pname = "ex_doc";
|
||||
version = "0.40.1";
|
||||
version = "0.40.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lang";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZhsN2XI5WVy04ilNR/7NJo+C7F10lijsP+n3BGBNEkQ=";
|
||||
hash = "sha256-xGZCBnjYr+0x6JNcf0XZVdaKaUB8V72GuZI3lEunzic=";
|
||||
};
|
||||
in
|
||||
mixRelease {
|
||||
|
|
@ -37,7 +37,7 @@ mixRelease {
|
|||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version elixir;
|
||||
hash = "sha256-pMIm0lVMqkuiprp0XeVB+x4VTh+hQR3t8dk5OBmnIqA=";
|
||||
hash = "sha256-FSLAQhFk7NCUXRMfNr6E9XvndrviapjcKZDisHbB87Y=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
|||
runHook postPatch
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu89";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bincopy";
|
||||
version = "20.1.0";
|
||||
version = "20.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2KToy4Ltr7vjZ0FTN9GSbH2MRVYX5DvUsUVlN3K5uWU=";
|
||||
hash = "sha256-6UpJi5pKvnZwPDdyqtRm8VY7T8mAnaeWXxG8dwlAk7k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,24 +3,20 @@
|
|||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
pkgs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fusepy";
|
||||
version = "3.0.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-cv94PsL0PeOrOU4/dFdgW/BMjPKIovQGi0zeFB1O5r0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pkgs.fuse ];
|
||||
|
||||
# No tests included
|
||||
doCheck = false;
|
||||
|
||||
# On macOS, users are expected to install macFUSE. This means fusepy should
|
||||
# be able to find libfuse in /usr/local/lib.
|
||||
patchPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
|
|
@ -28,6 +24,15 @@ buildPythonPackage rec {
|
|||
"find_library('fuse')" "'${lib.getLib pkgs.fuse}/lib/libfuse.so'"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ pkgs.fuse3 ];
|
||||
|
||||
# No tests included
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "fuse" ];
|
||||
|
||||
meta = {
|
||||
description = "Simple ctypes bindings for FUSE";
|
||||
longDescription = ''
|
||||
|
|
@ -38,4 +43,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.isc;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "itables";
|
||||
version = "2.7.3";
|
||||
version = "2.8.0";
|
||||
|
||||
# itables has 4 different node packages, each with their own
|
||||
# package-lock.json, and partially depending on each other.
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
# the source tarball from pypi, which includes the javascript bundle already.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-epaA2iCqZJWGgmXTl/GozAPY/bxZJ2DT3bELTWCB/3M=";
|
||||
hash = "sha256-uDJfvb0GEATyHqYkJZROXnGmTCpkhJlk4KSwAM3nA2I=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
keepkey,
|
||||
setuptools,
|
||||
libagent,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "keepkey-agent";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "keepkey_agent";
|
||||
inherit version;
|
||||
sha256 = "03779gvlx70i0nnry98i4pl1d92604ix5x6jgdfkrdgzqbh5vj27";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
keepkey
|
||||
libagent
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "keepkey_agent" ];
|
||||
|
||||
meta = {
|
||||
description = "Using KeepKey as hardware-based SSH/PGP agent";
|
||||
homepage = "https://github.com/romanz/trezor-agent";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
hkjn
|
||||
np
|
||||
mmahut
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
ledgerblue,
|
||||
setuptools,
|
||||
libagent,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledger-agent";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ledger_agent";
|
||||
inherit version;
|
||||
sha256 = "03zj602m2rln9yvr08dswy56vzkbldp8b074ixwzz525dafblr92";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ledgerblue
|
||||
libagent
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Using Ledger as hardware-based SSH/PGP agent";
|
||||
homepage = "https://github.com/romanz/trezor-agent";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
hkjn
|
||||
np
|
||||
mmahut
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,9 +6,10 @@
|
|||
buildPythonPackage,
|
||||
setuptools,
|
||||
cryptography,
|
||||
ed25519,
|
||||
docutils,
|
||||
ecdsa,
|
||||
gnupg,
|
||||
pinentry-curses,
|
||||
semver,
|
||||
mnemonic,
|
||||
unidecode,
|
||||
|
|
@ -18,27 +19,29 @@
|
|||
python-daemon,
|
||||
pymsgbox,
|
||||
pynacl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
# When changing this package, please test packages {keepkey,ledger,onlykey,trezor}-agent
|
||||
# When changing this package, please test packages {onlykey,trezor}-agent
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "libagent";
|
||||
version = "0.15.0";
|
||||
version = "0.16.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = "trezor-agent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NmpFyLjLdR9r1tc06iDNH8Tc7isUelTg13mWPrQvxSc=";
|
||||
tag = "libagent/${finalAttrs.version}";
|
||||
hash = "sha256-JFHBE2o5VSJaz5yeCiXmBchm4/1gA+dZ/PRt3+WENdA=";
|
||||
};
|
||||
|
||||
# hardcode the path to gpgconf in the libagent library
|
||||
# hardcode the path to gpgconf and pinentry in the libagent library
|
||||
postPatch = ''
|
||||
substituteInPlace libagent/gpg/keyring.py \
|
||||
--replace "util.which('gpgconf')" "'${gnupg}/bin/gpgconf'" \
|
||||
--replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'"
|
||||
--replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'" \
|
||||
--replace "get_gnupg_components(sp=sp)['pinentry']" "'${(lib.getExe pinentry-curses)}'"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -53,7 +56,7 @@ buildPythonPackage rec {
|
|||
python-daemon
|
||||
pymsgbox
|
||||
ecdsa
|
||||
ed25519
|
||||
docutils
|
||||
mnemonic
|
||||
semver
|
||||
pynacl
|
||||
|
|
@ -73,10 +76,14 @@ buildPythonPackage rec {
|
|||
"test_get_agent_sock_path"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex=libagent/(.*)" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Using hardware wallets as SSH/GPG agent";
|
||||
homepage = "https://github.com/romanz/trezor-agent";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ np ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,21 +8,20 @@
|
|||
hatchling,
|
||||
|
||||
# dependencies
|
||||
azure-ai-documentintelligence,
|
||||
azure-identity,
|
||||
beautifulsoup4,
|
||||
charset-normalizer,
|
||||
defusedxml,
|
||||
ffmpeg-headless,
|
||||
lxml,
|
||||
magika,
|
||||
mammoth,
|
||||
markdownify,
|
||||
numpy,
|
||||
olefile,
|
||||
openai,
|
||||
openpyxl,
|
||||
pandas,
|
||||
pathvalidate,
|
||||
pdfminer-six,
|
||||
puremagic,
|
||||
pdfplumber,
|
||||
pydub,
|
||||
python-pptx,
|
||||
requests,
|
||||
|
|
@ -42,14 +41,14 @@ let
|
|||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "markitdown";
|
||||
version = "0.1.4";
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "markitdown";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WKA2eY8wY3SM9xZ7Cek5eUcJbO5q6eMDx2aTKfQnFvE=";
|
||||
hash = "sha256-pLL44w2jVj5X5/TmPqSveQe/9WLj0ddDUYPoSQlz+9E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/markitdown";
|
||||
|
|
@ -58,23 +57,24 @@ buildPythonPackage (finalAttrs: {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"magika"
|
||||
"mammoth"
|
||||
"youtube-transcript-api"
|
||||
];
|
||||
dependencies = [
|
||||
azure-ai-documentintelligence
|
||||
azure-identity
|
||||
beautifulsoup4
|
||||
charset-normalizer
|
||||
defusedxml
|
||||
ffmpeg-headless
|
||||
lxml
|
||||
magika
|
||||
mammoth
|
||||
markdownify
|
||||
numpy
|
||||
olefile
|
||||
openai
|
||||
openpyxl
|
||||
pandas
|
||||
pathvalidate
|
||||
pdfminer-six
|
||||
puremagic
|
||||
pdfplumber
|
||||
pydub
|
||||
python-pptx
|
||||
requests
|
||||
|
|
@ -98,9 +98,19 @@ buildPythonPackage (finalAttrs: {
|
|||
"test_module_vectors"
|
||||
"test_cli_vectors"
|
||||
"test_module_misc"
|
||||
|
||||
# Require optional azure-ai-contentunderstanding, unavailable in nixpkgs.
|
||||
# The fallback stubs hit `UserAgentPolicy() takes no arguments`.
|
||||
"test_nonexistent_analyzer_raises_value_error"
|
||||
"test_cu_registered_before_docintel"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater {
|
||||
# Drop the "v" tag prefix before version comparison.
|
||||
rev-prefix = "v";
|
||||
# Skip PEP 440 pre-release tags.
|
||||
ignoredVersions = "(a|b|rc)[0-9]+$";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Python tool for converting files and office documents to Markdown";
|
||||
|
|
|
|||
|
|
@ -3,10 +3,8 @@
|
|||
buildPythonPackage,
|
||||
certifi,
|
||||
cryptography,
|
||||
docker,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
podman,
|
||||
poetry-core,
|
||||
pycryptodome,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
|
|
@ -16,19 +14,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nethsm";
|
||||
version = "2.0.1";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nitrokey";
|
||||
repo = "nethsm-sdk-py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wqnyI6QmsBfQW7NbJrk92Ufw0+IFmc8/0ZsUp5XswYw=";
|
||||
hash = "sha256-1bU3C8dlErDpHQIqsEabi92VPC91/wTNvZnx2dDHcmw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
build-system = [ flit-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
certifi
|
||||
|
|
@ -39,8 +37,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
docker
|
||||
podman
|
||||
pycryptodome
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
let
|
||||
pname = "pynitrokey";
|
||||
version = "0.11.4";
|
||||
version = "0.12.2";
|
||||
mainProgram = "nitropy";
|
||||
in
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MSqWgYuuU7uuYasxTTLRbrrAWQAwE4qQlEZIHiYB/78=";
|
||||
hash = "sha256-fDLkYUVBdMFbHlnFSCUUlyJNP9OzRKOJM3ExFdzDEkU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -4,17 +4,19 @@
|
|||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.6.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "pypresence";
|
||||
version = "4.3.0-unstable-2025-03-27";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qwertyquerty";
|
||||
repo = "pypresence";
|
||||
rev = "4e882c36d0f800c016c15977243ac9a49177095a";
|
||||
hash = "sha256-DjwDmQMbI9tV40TTe1CthhphoysKSFICrRhqijJjIAE=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VvVHJ3S+Yusq4cK4KyDQlnL3VwAyrZqNKYzEgJPU8Vk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.6.4";
|
||||
version = "3.6.6";
|
||||
pyproject = true;
|
||||
pname = "rpy2-rinterface";
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${
|
||||
builtins.replaceStrings [ "-" ] [ "_" ] pname
|
||||
}-${version}.tar.gz";
|
||||
hash = "sha256-4spJyjzqu9zEGtDFk3ZgsiWvbeYfBE6xI3NWlRw3pZA=";
|
||||
hash = "sha256-qcwTQc5ctN8dxnxA3Dss4Mr6znIVvUJi/g7QEZWKM2k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tensordict";
|
||||
version = "0.12.3";
|
||||
version = "0.12.4";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
|
|||
owner = "pytorch";
|
||||
repo = "tensordict";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-umxBWVM9lXIDxNQKsg1kxJKkIHbRTyHXbd0lLs7GycA=";
|
||||
hash = "sha256-P5Mw3Hi+zOQBdE2O2gk7VI0/y58v0ogmL3Fj1996Gdg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1048,7 +1048,8 @@ mapAliases {
|
|||
kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
|
||||
kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
|
||||
kdesvn = throw "'kdesvn' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01
|
||||
keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
|
||||
keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
keepkey_agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08
|
||||
kgraphviewer = throw "'kgraphviewer' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01
|
||||
kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
|
||||
|
|
@ -1095,7 +1096,8 @@ mapAliases {
|
|||
layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
lazarus-qt = throw "'lazarus-qt' has been renamed to/replaced by 'lazarus-qt5'"; # Converted to throw 2025-10-27
|
||||
leaf = throw "'leaf' has been removed as it is unmaintained. Consider using 'fastfetch' instead"; # Added 2026-04-24
|
||||
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
|
||||
ledger-agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
|
||||
lexical = throw "'lexical' has been removed because it was deprecated and archived upstream. Consider using 'beamPackages.expert' instead"; # Added 2026-02-24
|
||||
lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
|
||||
|
|
|
|||
|
|
@ -2556,8 +2556,6 @@ with pkgs;
|
|||
};
|
||||
kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { };
|
||||
|
||||
keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
|
||||
|
||||
keybase = callPackage ../tools/security/keybase { };
|
||||
|
||||
kbfs = callPackage ../tools/security/keybase/kbfs.nix { };
|
||||
|
|
@ -3140,8 +3138,6 @@ with pkgs;
|
|||
lua = lua5_4;
|
||||
};
|
||||
|
||||
rsibreak = kdePackages.callPackage ../applications/misc/rsibreak { };
|
||||
|
||||
rubocop = rubyPackages.rubocop;
|
||||
|
||||
ruby-lsp = rubyPackages.ruby-lsp;
|
||||
|
|
@ -9678,10 +9674,6 @@ with pkgs;
|
|||
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins { });
|
||||
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
|
||||
|
||||
opencpn = callPackage ../applications/misc/opencpn {
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
|
||||
open-music-kontrollers = recurseIntoAttrs {
|
||||
eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };
|
||||
jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { };
|
||||
|
|
@ -10427,8 +10419,6 @@ with pkgs;
|
|||
withGui = false;
|
||||
};
|
||||
|
||||
ledger-agent = with python3Packages; toPythonApplication ledger-agent;
|
||||
|
||||
napari = with python312Packages; toPythonApplication napari;
|
||||
|
||||
pycoin = with python3Packages; toPythonApplication pycoin;
|
||||
|
|
|
|||
|
|
@ -293,7 +293,8 @@ mapAliases {
|
|||
jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
|
||||
kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
|
||||
Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
|
||||
keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-29
|
||||
keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
keepkey_agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
|
||||
Keras = throw "'Keras' has been renamed to/replaced by 'keras'"; # Converted to throw 2025-10-29
|
||||
keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
|
||||
kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
|
||||
|
|
@ -305,7 +306,8 @@ mapAliases {
|
|||
lazy_imports = throw "'lazy_imports' has been renamed to/replaced by 'lazy-imports'"; # Converted to throw 2025-10-29
|
||||
lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
|
||||
ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
|
||||
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
|
||||
ledger-agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
ledger_agent = throw "ledger-agent has been removed because upstream dropped Ledger support"; # Added 2026-03-11
|
||||
libarcus = throw "'libarcus' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
libgpiod = gpiod; # added 2026-03-30
|
||||
libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue