Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-10-18 18:01:38 +00:00 committed by GitHub
commit c12ce83e4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 1293 additions and 713 deletions

View file

@ -18,14 +18,34 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Resolving the merge commit
env:
GH_TOKEN: ${{ github.token }}
run: |
if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge 2>&1); then
mergedSha=$(cut -f1 <<< "$result")
echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha"
# This checks for mergeability of a pull request as recommended in
# https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests
while true; do
echo "Checking whether the pull request can be merged"
prInfo=$(gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
/repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }})
mergeable=$(jq -r .mergeable <<< "$prInfo")
mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo")
if [[ "$mergeable" == "null" ]]; then
# null indicates that GitHub is still computing whether it's mergeable
# Wait a couple seconds before trying again
echo "GitHub is still computing whether this PR can be merged, waiting 5 seconds before trying again"
sleep 5
else
break
fi
done
if [[ "$mergeable" == "true" ]]; then
echo "The PR can be merged, checking the merge commit $mergedSha"
else
echo "The PR may have a merge conflict"
echo "'git ls-remote' output was:"
echo "$result"
echo "The PR cannot be merged, it has a merge conflict"
exit 1
fi
echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"

View file

@ -243,3 +243,26 @@ or
***
```
## `fetchFromBittorrent` {#fetchfrombittorrent}
`fetchFromBittorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)
```
{ fetchFromBittorrent }:
fetchFromBittorrent {
config = { peer-limit-global = 100; };
url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c";
sha256 = "";
}
```
### Parameters {#fetchfrombittorrent-parameters}
- `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file.
- `backend`: Which bittorrent program to use. Default: `"transmission"`. Valid values are `"rqbit"` or `"transmission"`. These are the two most suitable torrent clients for fetching in a fixed-output derivation at the time of writing, as they can be easily exited after usage. `rqbit` is written in Rust and has a smaller closure size than `transmission`, and the performance and peer discovery properties differs between these clients, requiring experimentation to decide upon which is the best.
- `config`: When using `transmission` as the `backend`, a json configuration can
be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure.

View file

@ -250,6 +250,8 @@
- The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`.
- Garage has been upgraded to 0.9.x. `services.garage.package` now needs to be explicitly set, so version upgrades can be done in a controlled fashion. For this, we expose `garage_x_y` attributes which can be set here.
- The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations.
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.

View file

@ -36,6 +36,19 @@ in
'';
};
cageArgs = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ "-s" ];
example = lib.literalExpression
''
[ "-s" "-m" "last" ]
'';
description = lib.mdDoc ''
Additional arguments to be passed to
[cage](https://github.com/cage-kiosk/cage).
'';
};
extraCss = lib.mkOption {
type = lib.types.either lib.types.path lib.types.lines;
default = "";
@ -50,7 +63,7 @@ in
config = lib.mkIf cfg.enable {
services.greetd = {
enable = lib.mkDefault true;
settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} -s -- ${lib.getExe cfg.package}";
settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}";
};
environment.etc = {

View file

@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.garage;
toml = pkgs.formats.toml {};
toml = pkgs.formats.toml { };
configFile = toml.generate "garage.toml" cfg.settings;
in
{
@ -19,8 +19,8 @@ in
extraEnvironment = mkOption {
type = types.attrsOf types.str;
description = lib.mdDoc "Extra environment variables to pass to the Garage server.";
default = {};
example = { RUST_BACKTRACE="yes"; };
default = { };
example = { RUST_BACKTRACE = "yes"; };
};
environmentFile = mkOption {
@ -30,7 +30,7 @@ in
};
logLevel = mkOption {
type = types.enum (["info" "debug" "trace"]);
type = types.enum ([ "info" "debug" "trace" ]);
default = "info";
example = "debug";
description = lib.mdDoc "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples.";
@ -65,12 +65,8 @@ in
};
package = mkOption {
# TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check.
default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8
else pkgs.garage_0_7;
defaultText = literalExpression "pkgs.garage_0_7";
type = types.package;
description = lib.mdDoc "Garage package to use, if you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions.";
description = lib.mdDoc "Garage package to use, needs to be set explicitly. If you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions.";
};
};

View file

@ -1,4 +1,4 @@
args@{ mkNode, ... }:
args@{ mkNode, ver, ... }:
(import ../make-test-python.nix ({ pkgs, ...} : {
name = "garage-basic";
meta = {
@ -52,7 +52,7 @@ args@{ mkNode, ... }:
machine.succeed(f"garage layout apply --version {version}")
def create_api_key(machine: Machine, key_name: str) -> S3Key:
output = machine.succeed(f"garage key new --name {key_name}")
output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}")
m = key_creation_regex.match(output)
if not m or not m.group('key_id') or not m.group('secret_key'):
raise ValueError('Cannot parse API key data')
@ -90,7 +90,7 @@ args@{ mkNode, ... }:
single_node.wait_for_open_port(3900)
# Now Garage is initialized.
single_node_id = get_node_id(single_node)
apply_garage_layout(single_node, [f'-z qemutest -c 1 "{single_node_id}"'])
apply_garage_layout(single_node, [f'-z qemutest -c ${if ver == "0_8" then "1" else "1G"} "{single_node_id}"'])
# Now Garage is operational.
test_bucket_writes(single_node)
test_bucket_over_http(single_node)

View file

@ -44,10 +44,11 @@ let
in
foldl
(matrix: ver: matrix // {
"basic${toString ver}" = import ./basic.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; };
"with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; };
"basic${toString ver}" = import ./basic.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; };
"with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; };
})
{}
[
"0_8"
"0_9"
]

View file

@ -1,4 +1,4 @@
args@{ mkNode, ... }:
args@{ mkNode, ver, ... }:
(import ../make-test-python.nix ({ pkgs, ...} :
{
name = "garage-3node-replication";
@ -55,7 +55,7 @@ args@{ mkNode, ... }:
machine.succeed(f"garage layout apply --version {version}")
def create_api_key(machine: Machine, key_name: str) -> S3Key:
output = machine.succeed(f"garage key new --name {key_name}")
output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}")
m = key_creation_regex.match(output)
if not m or not m.group('key_id') or not m.group('secret_key'):
raise ValueError('Cannot parse API key data')
@ -110,7 +110,7 @@ args@{ mkNode, ... }:
zones = ["nixcon", "nixcon", "paris_meetup", "fosdem"]
apply_garage_layout(node1,
[
f'{ndata.node_id} -z {zones[index]} -c 1'
f'{ndata.node_id} -z {zones[index]} -c ${if ver == "0_8" then "1" else "1G"}'
for index, ndata in enumerate(node_ids.values())
])
# Now Garage is operational.

File diff suppressed because it is too large Load diff

View file

@ -1,18 +1,18 @@
diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim
index 9eebb56..3a0b069 100644
index 323b57b..8053ea8 100644
--- a/autoload/health/mkdp.vim
+++ b/autoload/health/mkdp.vim
@@ -9,8 +9,8 @@ function! health#mkdp#check() abort
call health#report_info('Pre build: ' . l:mkdp_server_script)
call health#report_info('Pre build version: ' . mkdp#util#pre_build_version())
call health#report_ok('Using pre build')
@@ -8,8 +8,8 @@ function! health#mkdp#check() abort
lua vim.health.info('Pre build: ' .. vim.api.nvim_eval('l:mkdp_server_script'))
lua vim.health.info('Pre build version: ' .. vim.fn['mkdp#util#pre_build_version']())
lua vim.health.ok('Using pre build')
- elseif executable('node')
- call health#report_info('Node version: ' . system('node --version'))
- lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('node --version'), '^%s*(.-)%s*$', '%1'))
+ else
+ call health#report_info('Node version: ' . system('@node@ --version'))
let l:mkdp_server_script = s:mkdp_root_dir . '/app/server.js'
call health#report_info('Script: ' . l:mkdp_server_script)
call health#report_info('Script exists: ' . filereadable(l:mkdp_server_script))
+ lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('@node@ --version'), '^%s*(.-)%s*$', '%1'))
let l:mkdp_server_script = s:mkdp_root_dir .. '/app/server.js'
lua vim.health.info('Script: ' .. vim.api.nvim_eval('l:mkdp_server_script'))
lua vim.health.info('Script exists: ' .. vim.fn.filereadable(vim.api.nvim_eval('l:mkdp_server_script')))
diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim
index b257571..57f04e7 100644
--- a/autoload/mkdp/rpc.vim

View file

@ -27,12 +27,12 @@
};
apex = buildGrammar {
language = "apex";
version = "0.0.0+rev=e63bcdc";
version = "0.0.0+rev=a768c95";
src = fetchFromGitHub {
owner = "aheber";
repo = "tree-sitter-sfapex";
rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4";
hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE=";
rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd";
hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw=";
};
location = "apex";
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@ -59,25 +59,36 @@
};
meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
};
authzed = buildGrammar {
language = "authzed";
version = "0.0.0+rev=1dec7e1";
src = fetchFromGitHub {
owner = "mleonidas";
repo = "tree-sitter-authzed";
rev = "1dec7e1af96c56924e3322cd85fdce15d0a31d00";
hash = "sha256-qPSQF95DO7WByVy9YXEOus3q3U4QfWuUFbJGVXd4EtQ=";
};
meta.homepage = "https://github.com/mleonidas/tree-sitter-authzed";
};
awk = buildGrammar {
language = "awk";
version = "0.0.0+rev=374da90";
version = "0.0.0+rev=90c8d9b";
src = fetchFromGitHub {
owner = "Beaglefoot";
repo = "tree-sitter-awk";
rev = "374da90decaa60fea7a22490a77440ece6d4161d";
hash = "sha256-gbA6VyhPh2lH9FqYKj9sL8uhuMizCmV0U42s5gvk7AE=";
rev = "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06";
hash = "sha256-XbjZtEkJLaecp+j8xgYOVC3ESC1o/rNAZgePsmDdgps=";
};
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
};
bash = buildGrammar {
language = "bash";
version = "0.0.0+rev=fd4e40d";
version = "0.0.0+rev=7331995";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-bash";
rev = "fd4e40dab883d6456da4d847de8321aee9c80805";
hash = "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=";
rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94";
hash = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
};
@ -94,12 +105,12 @@
};
beancount = buildGrammar {
language = "beancount";
version = "0.0.0+rev=358e5ec";
version = "0.0.0+rev=484f508";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "358e5ecbb87109eef7fd596ea518a4ff74cb9b31";
hash = "sha256-vz8FU+asnMqF6J4UZer4iecw8uFFiYVpz4Fs/ds4Rt0=";
rev = "484f50849bcce887c86451f532bf778689ca8523";
hash = "sha256-5k5sHW9xabbCFJXHJfs8oBlCjIBa6L3OtDdKEVXLgOc=";
};
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
};
@ -149,12 +160,12 @@
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=a2b7bac";
version = "0.0.0+rev=25371f9";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "a2b7bac3b313efbaa683d9a276ff63cdc544d960";
hash = "sha256-39i06oXMQemfq3Y4TTXai6HFXvURVOif1v2i9LP4sAI=";
rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f";
hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
@ -226,12 +237,12 @@
};
comment = buildGrammar {
language = "comment";
version = "0.0.0+rev=c9a7e2d";
version = "0.0.0+rev=aefcc28";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-comment";
rev = "c9a7e2df7cac2dfb730f766a4f343308f84ff346";
hash = "sha256-7k2LkfzlY+UxQvB1dPP6KQM2UTwThaj5NoAIKDVYAhA=";
rev = "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1";
hash = "sha256-ihkBqdYVulTlysb9J8yg4c5XVktJw8jIwzhqybBw8Ug=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
};
@ -315,12 +326,12 @@
};
cuda = buildGrammar {
language = "cuda";
version = "0.0.0+rev=275cfb9";
version = "0.0.0+rev=3161aed";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "275cfb95013b88382e11490aef1e7c9b17a95ef7";
hash = "sha256-3sb9YLPRPjafSLGvyjLSuu+vqvolF63CI0MWZzvEGJw=";
rev = "3161aed045130c900f870ef53fad93a574317769";
hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@ -393,12 +404,12 @@
};
dockerfile = buildGrammar {
language = "dockerfile";
version = "0.0.0+rev=1800d5a";
version = "0.0.0+rev=33e22c3";
src = fetchFromGitHub {
owner = "camdencheek";
repo = "tree-sitter-dockerfile";
rev = "1800d5a06789797065ba5e7d80712b6bbf5483d7";
hash = "sha256-qt626fHCZkHkl8yrEtDbJ+l7wwmU0XMcP0oPwrCYNgI=";
rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392";
hash = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4=";
};
meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile";
};
@ -483,12 +494,12 @@
};
elm = buildGrammar {
language = "elm";
version = "0.0.0+rev=0694058";
version = "0.0.0+rev=debe14f";
src = fetchFromGitHub {
owner = "elm-tooling";
repo = "tree-sitter-elm";
rev = "0694058bf0555adbf5f700ce4868d18e463cb824";
hash = "sha256-xalcXMXRHcpwhKLMF6p9y5lzC0ek/ljRq2Vnb1VwXBo=";
rev = "debe14fad40a8100c679d95c66f599b48111742c";
hash = "sha256-tB03/AqoYIMyWFGv3nKlGY/EjNV1/IQyXQsC+0M51V8=";
};
meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
};
@ -527,12 +538,12 @@
};
erlang = buildGrammar {
language = "erlang";
version = "0.0.0+rev=4a0ec79";
version = "0.0.0+rev=bb06a83";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "4a0ec79b7eb7671efe935cd97967430c34598c7d";
hash = "sha256-q1V5lJsSQyx7ji4T+leIfSH9wAZRHW0XeLnY3Rc9WWI=";
rev = "bb06a83db4f0c176875d9d49756b760d15211134";
hash = "sha256-IAUX5wrVpAj50cG0hrclhCx9x1hjSKdjqvEUYpe5a+g=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@ -714,23 +725,23 @@
};
glimmer = buildGrammar {
language = "glimmer";
version = "0.0.0+rev=d3031a8";
version = "0.0.0+rev=f9746dc";
src = fetchFromGitHub {
owner = "alexlafroscia";
repo = "tree-sitter-glimmer";
rev = "d3031a8294bf331600d5046b1d14e690a0d8ba0c";
hash = "sha256-YvftQHEwYxRyRIYHrnAjIqgx6O0FlFrnF9TwUE+RiqI=";
rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1";
hash = "sha256-57Sp4LrvyNNuOc+8ZiHl6cwvGg1tmXZemRsWeW+Kzys=";
};
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=ec6100d";
version = "0.0.0+rev=952739a";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "ec6100d2bdf22363ca8a711a212f2144ea49233f";
hash = "sha256-QFsOq/1GH40XgnBT9V3Eb7aQabtBGOtxHp65FdugOz8=";
rev = "952739a25a7c014882aa777f1a32da8950f31f58";
hash = "sha256-f68bObZPZuPvzyLYP/PeZKbtG0YqbX8BhsLyviBfRY4=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
@ -813,15 +824,26 @@
};
groovy = buildGrammar {
language = "groovy";
version = "0.0.0+rev=76e02db";
version = "0.0.0+rev=ae8aa51";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-groovy";
rev = "76e02db5866dd2b096512103ed4d8f630cc32980";
hash = "sha256-H6Gp7MqGxU1oONq/w8p8pNR3Vhi68dvO+2aHw8anBTs=";
rev = "ae8aa51ec3275afb567a4a67df1a26d89feb135f";
hash = "sha256-K9XoSVuAWXJCTxclod4pfxnGHhsbtdE7Xi60wfuCE8M=";
};
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy";
};
gstlaunch = buildGrammar {
language = "gstlaunch";
version = "0.0.0+rev=2c0d9c9";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-gstlaunch";
rev = "2c0d9c94d35e37aa63fa5002163c8480985b3e5b";
hash = "sha256-H5H1v4xJSPHW0oaTY/JczhfVmYExbrdfdugYkMJktPY=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch";
};
hack = buildGrammar {
language = "hack";
version = "0.0.0+rev=fca1e29";
@ -901,12 +923,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=d698c21";
version = "0.0.0+rev=f2902bd";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4";
hash = "sha256-oFpoErrhr83yG5c3IksjL/XjmsCrZGTP6+Sfu5fvOZM=";
rev = "f2902bd614e3916bdf65e1bc9ad45ebd08417bba";
hash = "sha256-tuie4Yzauejf+5Par2qnWfaQgOLhROL2le1+UTq5cSY=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -934,12 +956,12 @@
};
html = buildGrammar {
language = "html";
version = "0.0.0+rev=e5d7d7d";
version = "0.0.0+rev=d742025";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7";
hash = "sha256-jNAPumz8JdrGwSMow1xZqz3n2CHj60qUaivhJ8LZDz4=";
rev = "d742025fa2d8e6100f134a6ea990443aa1f074b3";
hash = "sha256-ZpUruxwi9S+gUy/k0DkhDGWLc65XppUhD0NeVVItYg4=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
@ -1011,12 +1033,12 @@
};
java = buildGrammar {
language = "java";
version = "0.0.0+rev=83044af";
version = "0.0.0+rev=2b57cd9";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
rev = "83044af4950e9f1adb46a20f616d10934930ce7e";
hash = "sha256-i3j55vAQV5TaMR7IsUkh0OrLCP95Xos0UCI0SoY5phI=";
rev = "2b57cd9541f9fd3a89207d054ce8fbe72657c444";
hash = "sha256-Zo+KQ6TOjdJODNppTkt8XPE+WroNB5M6+n2XF+OrD8o=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
@ -1055,23 +1077,23 @@
};
json = buildGrammar {
language = "json";
version = "0.0.0+rev=ca3f891";
version = "0.0.0+rev=3fef30d";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-json";
rev = "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f";
hash = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0=";
rev = "3fef30de8aee74600f25ec2e319b62a1a870d51e";
hash = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
};
json5 = buildGrammar {
language = "json5";
version = "0.0.0+rev=5dd5cdc";
version = "0.0.0+rev=c23f7a9";
src = fetchFromGitHub {
owner = "Joakker";
repo = "tree-sitter-json5";
rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2";
hash = "sha256-B3wZS/OtW4hKOHsoYdYK2zsJGID8fuIm8C+IuAteR9E=";
rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d";
hash = "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY=";
};
meta.homepage = "https://github.com/Joakker/tree-sitter-json5";
};
@ -1132,12 +1154,12 @@
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=06a2f6e";
version = "0.0.0+rev=5baa0fe";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7";
hash = "sha256-HF3wp4nNwgP0LhZvxQKMnPqMPhwu8Xc9khgiQoy6DeA=";
rev = "5baa0fe2288830f88bd38e328b08d829f3914164";
hash = "sha256-e2X8Hl8N8iTL0JUJhyyeebNPZ63QAq9C+R5F2lOYZKk=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
@ -1174,6 +1196,17 @@
};
meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
};
liquidsoap = buildGrammar {
language = "liquidsoap";
version = "0.0.0+rev=bbef4df";
src = fetchFromGitHub {
owner = "savonet";
repo = "tree-sitter-liquidsoap";
rev = "bbef4df4dc5b324455ad1ea4770bbed0df5130ea";
hash = "sha256-SGWO/sQ022atbX8qTXWeSnrYlSX13N03LhXJoc9YgPQ=";
};
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
};
llvm = buildGrammar {
language = "llvm";
version = "0.0.0+rev=1b96e58";
@ -1331,6 +1364,17 @@
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
};
nasm = buildGrammar {
language = "nasm";
version = "0.0.0+rev=3bc691d";
src = fetchFromGitHub {
owner = "naclsn";
repo = "tree-sitter-nasm";
rev = "3bc691d2cfba44bea339a775ad496c8bc552c60d";
hash = "sha256-o4aXvPhXSYMc1oaagIbnFhpqcbWdN8dhMa3QRE/iRMM=";
};
meta.homepage = "https://github.com/naclsn/tree-sitter-nasm";
};
nickel = buildGrammar {
language = "nickel";
version = "0.0.0+rev=b759233";
@ -1366,12 +1410,12 @@
};
norg = buildGrammar {
language = "norg";
version = "0.0.0+rev=1a30509";
version = "0.0.0+rev=014073f";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "tree-sitter-norg";
rev = "1a305093569632de50f9a316ff843dcda25b4ef5";
hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI=";
rev = "014073fe8016d1ac440c51d22c77e3765d8f6855";
hash = "sha256-0wL3Pby7e4nbeVHCRfWwxZfEcAF9/s8e6Njva+lj+Rc=";
};
meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
};
@ -1501,12 +1545,12 @@
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=a05c611";
version = "0.0.0+rev=92a98ad";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "a05c6112a1dfdd9e586cb275700931e68d3c7c85";
hash = "sha256-9t+9TnyBVkQVrxHhCzoBkfIjHoKw3HW4gTJjNv+DpPw=";
rev = "92a98adaa534957b9a70b03e9acb9ccf9345033a";
hash = "sha256-/JI1eyf1UZmtQ7bhfBLpA+8mMfIc8jRncri8Mz2mf5M=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
@ -1656,12 +1700,12 @@
};
python = buildGrammar {
language = "python";
version = "0.0.0+rev=a901729";
version = "0.0.0+rev=82f5c99";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
rev = "a901729099257aac932d79c60adb5e8a53fa7e6c";
hash = "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=";
rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c";
hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
};
@ -1821,12 +1865,12 @@
};
rst = buildGrammar {
language = "rst";
version = "0.0.0+rev=2ca8c12";
version = "0.0.0+rev=3c03a4b";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-rst";
rev = "2ca8c123c82ca41f41b66b5d13d403cff0204b78";
hash = "sha256-aCeKxuBRLPYM8CjVLP5cBUhtuAezzZpGfCE2UaJj1E4=";
rev = "3c03a4bb2c27f1fa76f1ca5563c1fc10187e4028";
hash = "sha256-WEerUDni10WpXKXX9r6pMwKn3Z9xqIKnlkQDxJiXxxY=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-rst";
};
@ -1954,24 +1998,24 @@
};
soql = buildGrammar {
language = "soql";
version = "0.0.0+rev=e63bcdc";
version = "0.0.0+rev=a768c95";
src = fetchFromGitHub {
owner = "aheber";
repo = "tree-sitter-sfapex";
rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4";
hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE=";
rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd";
hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw=";
};
location = "soql";
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
};
sosl = buildGrammar {
language = "sosl";
version = "0.0.0+rev=e63bcdc";
version = "0.0.0+rev=a768c95";
src = fetchFromGitHub {
owner = "aheber";
repo = "tree-sitter-sfapex";
rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4";
hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE=";
rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd";
hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw=";
};
location = "sosl";
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@ -1989,12 +2033,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=39750c4";
version = "0.0.0+rev=36c4de3";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "39750c48bf9ad63bcc1399554355b0aa0aaa1c33";
hash = "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y=";
rev = "36c4de35f76dfa732493aae606feb69dce4b1daa";
hash = "sha256-D8gt0shaEU1zPjLHe+h/cCk6Z1xx5Va17A/0XDB1rvo=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@ -2077,12 +2121,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=10eb01d";
version = "0.0.0+rev=7e4ccc9";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "10eb01d29827f24b1271672e89790661d94da9e1";
hash = "sha256-5oHc2mGxOuvFQ1h1FEK0oJ7PYnKayoJSVHeuYleVE8o=";
rev = "7e4ccc97a25315022a70b730085deccd5680a39b";
hash = "sha256-1Uln7GHlgtNd7/3+FSBNDlTCqYodRbUyytPZYf660Nk=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -2111,12 +2155,12 @@
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=c544082";
version = "0.0.0+rev=b075f2f";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "c544082904fd1d27da5493857bd3fc278bae2a1a";
hash = "sha256-0iH5zEe5/BD2Wi4jb67grCXafmHhJkSD/NkjqGZZ3pY=";
rev = "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a";
hash = "sha256-NoJLMzyQmE4XpI1KKyq5GkkotOl8MU/zniTnP2nkjes=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
};
@ -2235,12 +2279,12 @@
};
tsx = buildGrammar {
language = "tsx";
version = "0.0.0+rev=b1bf482";
version = "0.0.0+rev=d847898";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
rev = "d847898fec3fe596798c9fda55cb8c05a799001a";
hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4=";
};
location = "tsx";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -2269,12 +2313,12 @@
};
typescript = buildGrammar {
language = "typescript";
version = "0.0.0+rev=b1bf482";
version = "0.0.0+rev=d847898";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
rev = "d847898fec3fe596798c9fda55cb8c05a799001a";
hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4=";
};
location = "typescript";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@ -2304,12 +2348,12 @@
};
usd = buildGrammar {
language = "usd";
version = "0.0.0+rev=718a6b3";
version = "0.0.0+rev=ab8c30b";
src = fetchFromGitHub {
owner = "ColinKennedy";
repo = "tree-sitter-usd";
rev = "718a6b3e939904e0b4fe7cff6742e96af4781f4b";
hash = "sha256-6U4TreAeAGB7WRUtTXdxQvNa6Sl6E+f329/SZ6DOQ+0=";
rev = "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7";
hash = "sha256-Y7AYRpiblBd8xun73UohIf8FFkbNIqSXv44bM3L5uDc=";
};
meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd";
};
@ -2371,23 +2415,23 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=77e9e96";
version = "0.0.0+rev=32c76f1";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vim";
rev = "77e9e96c2ae5cff7343ce3dced263483acf95793";
hash = "sha256-YGE/up7TE1+a6FrN8iEeHbAJr6kEMcWLMPaeyQRRVLs=";
rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55";
hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vim";
};
vimdoc = buildGrammar {
language = "vimdoc";
version = "0.0.0+rev=c0f8580";
version = "0.0.0+rev=60045f7";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
rev = "c0f85802485afe4d15e65bbf995ae864bb8ed7c4";
hash = "sha256-pBdfFeJbZJy6pjr2a0SgFyjEZKvajKOfrqoRAMB66V8=";
rev = "60045f7d717eba85fa8abd996e0bb50eed5a3d8e";
hash = "sha256-FW+sPrzFQxKkWkyX2q+s+RBIMCOUWOt38vj2DzAaJ4I=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
};
@ -2426,12 +2470,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=fac3f72";
version = "0.0.0+rev=bde9356";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "fac3f72d80d379fea61d1eca782cb99ac6d78b62";
hash = "sha256-/PIqwqG5h2iFVzpTTlXOrAKEDNctcxRHIhGyv5jlkIw=";
rev = "bde93562c6dae6aaffd641cb367356386da412d0";
hash = "sha256-Fv2tc7KmY9Hn5TqO5JKjbj33rYQvLQwpzBYO+W0bySU=";
};
location = "libs/tree-sitter-wing";
generate = true;

View file

@ -999,14 +999,21 @@ self: super: {
pname = "sg-nvim-rust";
inherit (old) version src;
cargoHash = "sha256-HdewCCraJ2jj2KAVnjzND+4O52jqfABonFU6ybWWAWY=";
cargoHash = "sha256-wJpJELVgzixzu8T9EHACur3LNm/sqfkkbGn+AkApzW4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
prePatch = ''
rm .cargo/config.toml
'';
env.OPENSSL_NO_VENDOR = true;
cargoBuildFlags = [ "--workspace" ];
# tests are broken
@ -1033,23 +1040,27 @@ self: super: {
sniprun =
let
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "v${version}";
hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw=";
hash = "sha256-Lh4S7n+bNbdzjDt4lAL271VeYO3cotMD/kbAbV20C0U=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
inherit version src;
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# Cargo.lock is outdated
preBuild = ''
cargo update --offline
'';
cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks=";
cargoHash = "sha256-N+Okln3irqevUHC+ZUDQgQXhJ767peKMmsnt/sT77o8=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "crow-translate";
version = "2.10.10";
version = "2.11.0";
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
hash = "sha256-PvfruCqmTBFLWLeIL9NV6+H2AifXcY97ImHzD1zEs28=";
hash = "sha256-e0zfbfRNzAiNvlWO84YbMApUXXzMcZG1MckTGMZm2ik=";
};
postPatch = ''

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "pgmodeler";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE=";
sha256 = "sha256-Km4PWvbIzgc1Kxsp26HYLCA4OkCfOsGWsdWYLmWf/NA=";
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];

View file

@ -331,7 +331,7 @@ let
# Link to our own Node.js and Java (required during the build):
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
ln -s "${pkgsBuildHost.jre8_headless}/bin/java" third_party/jdk/current/bin/
ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/
# Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py

View file

@ -1,9 +1,15 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, fetchzip
, installShellFiles
}:
let
version = "2.1.1";
sha256 = "11g7zkzx28xi81qk00frpxn9qsp4m0pr7m1zm61p2in3i9qxrqjn";
manifestsSha256 = "1zpw9yh5j9ymhj771ccr7a3zm37h3igcrl0xnzyzzrkg754wdv9s";
version = "2.1.2";
sha256 = "1k47wjfyhkfn4v5cpfwfgb8ypcsiaml2cxwbwasis926wda37gzk";
manifestsSha256 = "1imwvm85p5m9s05vmjvqql2hbkrj4m5cy87212ghybaricklcx6a";
manifests = fetchzip {
url =
@ -23,7 +29,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorHash = "sha256-CQt8GbUUUOLUExysZK2H6YZzMx+pXEroGj30BXAhPRY=";
vendorHash = "sha256-4srEYBI/Qay9F0JxEIT0HyOtF29V9dzdB1ei4tZYJbs=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
@ -65,6 +71,7 @@ in buildGoModule rec {
updates to configuration when there is new code to deploy.
'';
homepage = "https://fluxcd.io";
downloadPage = "https://github.com/fluxcd/flux2/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ bryanasdev000 jlesquembre ];
mainProgram = "flux";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kn";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "knative-v${version}";
sha256 = "sha256-Aiu8SedWCP2yIw51+aVEFcskJKee8RvUcW6yGtagSnI=";
sha256 = "sha256-tVUe/EHraPVxikzGilmX2fDCX81lPGPy+Sa9OoVmpYM=";
};
vendorHash = null;

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "netmaker";
version = "0.21.0";
version = "0.21.1";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
hash = "sha256-RL0tGhtndahTezQFz/twyLh36h2RXFy7EUnPiLAxP4U=";
hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM=";
};
vendorHash = "sha256-4Wxutkg9OdKs6B8z/P6JMgcE3cGS+6W4V7sKzVBwRJc=";
vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM=";
inherit subPackages;

View file

@ -38,13 +38,13 @@
let
pname = "pcloud";
version = "1.14.0";
code = "XZpL8AVZAqfCXz5TebJ2gcvAiHi15pYFKPey";
version = "1.14.1";
code = "XZ5iuiVZQsuexQaMmmLAS7FGWNh1TkXRWJR7";
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
hash = "sha256-uirj/ASOrJyE728q+SB7zq0O9O58XDNzhokvNyca+2c=";
hash = "sha256-6IHt9qxMuDe9f1T+t8JXfPXLUCVe865Od8/ixPR3gso=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -0,0 +1,60 @@
{ lib, runCommand, transmission_noSystemd, rqbit, writeShellScript, formats, cacert, rsync }:
let
urlRegexp = ''.*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*'';
in
{ url
, name ?
if (builtins.match urlRegexp url) == null then
"bittorrent"
else
"bittorrent-" + builtins.head (builtins.match urlRegexp url)
, config ? if (backend == "transmission") then { } else throw "json config for configuring fetchFromBitorrent only works with the transmission backend"
, hash
, backend ? "transmission"
, recursiveHash ? true
, postFetch ? ""
, postUnpack ? ""
}:
let
afterSuccess = writeShellScript "fetch-bittorrent-done.sh" ''
${postUnpack}
# Flatten the directory, so that only the torrent contents are in $out, not
# the folder name
shopt -s dotglob
mv -v $downloadedDirectory/*/* $out
rm -v -rf $downloadedDirectory
unset downloadedDirectory
${postFetch}
kill $PPID
'';
jsonConfig = (formats.json {}).generate "jsonConfig" config;
in
runCommand name {
nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchbittorrent");
outputHashAlgo = if hash != "" then null else "sha256";
outputHash = hash;
outputHashMode = if recursiveHash then "recursive" else "flat";
# url will be written to the derivation, meaning it can be parsed and utilized
# by external tools, such as tools that may want to seed fetchBittorrent calls
# in nixpkgs
inherit url;
}
(if (backend == "transmission") then ''
export HOME=$TMP
export downloadedDirectory=$out/downloadedDirectory
mkdir -p $downloadedDirectory
mkdir -p $HOME/.config/transmission
cp ${jsonConfig} $HOME/.config/transmission/settings.json
function handleChild {
# This detects failures and logs the contents of the transmission fetch
find $out
exit 0
}
trap handleChild CHLD
transmission-cli --port $(shuf -n 1 -i 49152-65535) --portmap --finish ${afterSuccess} --download-dir $downloadedDirectory --config-dir "$HOME"/.config/transmission "$url"
'' else
''
export HOME=$TMP
rqbit --disable-dht-persistence --http-api-listen-addr "127.0.0.1:$(shuf -n 1 -i 49152-65535)" download -o $out --exit-on-finish "$url"
'')

View file

@ -0,0 +1,25 @@
{ testers, fetchFromBittorrent, ... }:
{
http-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent {
url = "https://webtorrent.io/torrents/wired-cd.torrent";
hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";
backend = "transmission";
};
magnet-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent {
url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent";
hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";
backend = "transmission";
};
http-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent {
url = "https://webtorrent.io/torrents/wired-cd.torrent";
hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";
backend = "rqbit";
};
magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent {
url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent";
hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo=";
backend = "rqbit";
};
}

View file

@ -0,0 +1,52 @@
{ lib, fetchFromGitHub, git, buildGoModule }:
let config-module = "git-get/pkg/cfg";
in
buildGoModule rec {
pname = "git-get";
version = "0.5.0";
src = fetchFromGitHub {
owner = "grdl";
repo = pname;
rev = "v${version}";
hash = "sha256-v98Ff7io7j1LLzciHNWJBU3LcdSr+lhwYrvON7QjyCI=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse HEAD > $out/COMMIT
# in format of 0000-00-00T00:00:00Z
date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-C+XOjMDMFneKJNeBh0KWPx8yM7XiiIpTlc2daSfhZhY=";
doCheck = false;
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X ${config-module}.commit=$(cat COMMIT)"
ldflags+=" -X ${config-module}.date=$(cat SOURCE_DATE_EPOCH)"
'';
ldflags = [
"-s"
"-w"
"-X ${config-module}.version=v${version}"
];
preInstall = ''
mv "$GOPATH/bin/get" "$GOPATH/bin/git-get"
mv "$GOPATH/bin/list" "$GOPATH/bin/git-list"
'';
meta = with lib; {
description = "A better way to clone, organize and manage multiple git repositories";
homepage = "https://github.com/grdl/git-get";
license = licenses.mit;
maintainers = with maintainers; [ sumnerevans ];
};
}

View file

@ -0,0 +1,37 @@
{ lib, buildNpmPackage, fetchFromGitHub, testers, lint-staged }:
buildNpmPackage rec {
pname = "lint-staged";
version = "14.0.1";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-xuHrxi/1zfeY2dd625iLDNJFoNO28JJrPvmECdqeZXk=";
};
npmDepsHash = "sha256-4lyTBmcX5k//kbFHmzbOQJp+Jd9TPY7bzm51QuiXUzE=";
dontNpmBuild = true;
# Fixes `lint-staged --version` output
postPatch = ''
substituteInPlace package.json --replace \
'"version": "0.0.0-development"' \
'"version": "${version}"'
'';
passthru.tests.version = testers.testVersion { package = lint-staged; };
meta = with lib; {
description = "Run linters on git staged files";
longDescription = ''
Run linters against staged git files and don't let 💩 slip into your code base!
'';
homepage = src.meta.homepage;
license = licenses.mit;
maintainers = with maintainers; [ DamienCassou ];
mainProgram = "lint-staged";
};
}

View file

@ -0,0 +1,55 @@
{ stdenv
, lib
, fetchFromGitHub
, autoreconfHook
, pkg-config
, expat
, libproxy
, neon
, zlib
}:
stdenv.mkDerivation rec {
version = "0.14";
pname = "litmus";
src = fetchFromGitHub {
owner = "notroj";
repo = "litmus";
rev = version;
# Required for neon m4 macros, bundled neon not used
fetchSubmodules = true;
hash = "sha256-jWz0cnytgn7px3vvB9/ilWBNALQiW5/QvgguM27I3yQ=";
};
postPatch = ''
# neon version requirements are broken, remove them:
# configure: incompatible neon library version 0.32.5: wanted 0.27 28 29 30 31 32
# configure: using bundled neon (0.32.5)
sed -i /NE_REQUIRE_VERSIONS/d configure.ac
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
expat
libproxy
neon
zlib
];
autoreconfFlags = [ "-I" "neon/macros" ];
meta = with lib; {
description = "WebDAV server protocol compliance test suite";
homepage = "http://www.webdav.org/neon/litmus/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.lorenz ];
mainProgram = "litmus";
};
}

View file

@ -0,0 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "pid1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "fpco";
repo = "pid1-rs";
rev = "v${version}";
hash = "sha256-BljIa+4BKI7WHlOhXfN/3VKMzs5G5E4tNlQ2oPpJV2g=";
};
cargoHash = "sha256-7PANlw/SKxyAqymfXIXFT/v3U0GCiGfgStguSr0lrqQ=";
meta = with lib; {
description = "Signal handling and zombie reaping for PID1 process";
homepage = "https://github.com/fpco/pid1-rs";
license = licenses.mit;
maintainers = with maintainers; [ psibi ];
mainProgram = "pid1";
};
}

View file

@ -0,0 +1,76 @@
{ lib
, fetchurl
, stdenvNoCC
, runtimeShell
, copyDesktopItems
, makeDesktopItem
, wineWowPackages
}:
let
icon = fetchurl {
name = "synthesia.png";
url = "https://cdn.synthesia.app/images/headerIcon.png";
hash = "sha256-M9cQqHwwjko5pchdNtIMjYwd4joIvBphAYnpw73qYzM=";
};
in
stdenvNoCC.mkDerivation rec {
pname = "synthesia";
version = "10.9";
desktopItems = [
(makeDesktopItem {
name = pname;
desktopName = "Synthesia";
comment = meta.description;
exec = pname;
icon = pname;
categories = [ "Game" "Audio" ];
startupWMClass = "synthesia.exe";
})
];
nativeBuildInputs = [
copyDesktopItems
wineWowPackages.stable
];
src = fetchurl {
url = "https://cdn.synthesia.app/files/Synthesia-${version}-installer.exe";
hash = "sha256-BFTsbesfMqxY1731ss6S0w8BcUaoqjVrr62VeU1BfrU=";
};
dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cat <<'EOF' > $out/bin/${pname}
#!${runtimeShell}
export PATH=${wineWowPackages.stable}/bin:$PATH
export WINEARCH=win64
export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/${pname}"}/wine"
export WINEDLLOVERRIDES="mscoree=" # disable mono
if [ ! -d "$WINEPREFIX" ] ; then
mkdir -p "$WINEPREFIX"
wine ${src} /S
fi
wine "$WINEPREFIX/drive_c/Program Files (x86)/Synthesia/Synthesia.exe"
EOF
chmod +x $out/bin/${pname}
install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/${pname}.png
runHook postInstall
'';
meta = with lib; {
description = "A fun way to learn how to play the piano";
homepage = "https://synthesiagame.com/";
downloadPage = "https://synthesiagame.com/download";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ ners ];
platforms = wineWowPackages.stable.meta.platforms;
};
}

View file

@ -3,9 +3,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfconf";
version = "4.18.1";
version = "4.18.2";
sha256 = "sha256-HS+FzzTTAH8lzBBai3ESdnuvvvZW/vAVSmGe57mwcoo=";
sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI=";
nativeBuildInputs = [ gobject-introspection vala ];

View file

@ -31,16 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
hidapi
libftdi1
libusb1
udev
zlib
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform udev) [
udev
];
meta = {
broken = stdenv.isDarwin; # error: Package systemd-253.6 is not available on the requested Darwin platform.
description = "Universal utility for programming FPGAs";
homepage = "https://github.com/trabucayre/openFPGALoader";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ danderson ];
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
})

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "fplll";
version = "5.4.4";
version = "5.4.5";
src = fetchFromGitHub {
owner = "fplll";
repo = "fplll";
rev = version;
sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM=";
sha256 = "sha256-taSS7jpVyjVfNe6kSuUDXMD2PgKmtG64V5MjZyQzorI=";
};
nativeBuildInputs = [

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
version = "1.12.9";
version = "1.12.10";
src = fetchFromGitHub {
sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk=";
sha256 = "sha256-0AHChU96LOVCsd+b77nKV4lOt1FtbVfv+OSNvGjekYo=";
rev = version;
repo = "leatherman";
owner = "puppetlabs";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libLAS";
@ -28,10 +28,9 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
buildInputs = [ boost libgeotiff libtiff LASzip2 ];
cmakeFlags = [
"-DGDAL_CONFIG=${gdal}/bin/gdal-config"
"-DWITH_LASZIP=ON"
# libLAS is currently not compatible with LASzip 3,
# see https://github.com/libLAS/libLAS/issues/144.

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libbytesize";
version = "2.9";
version = "2.10";
src = fetchFromGitHub {
owner = "storaged-project";
repo = "libbytesize";
rev = finalAttrs.version;
hash = "sha256-4jbu8Hmc4I1IYKiWlCQq7ob98HsgDTqJdghj3ZzOuN8=";
hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U=";
};
outputs = [ "out" "dev" "devdoc" "man" ];

View file

@ -121,6 +121,8 @@ stdenv.mkDerivation {
cuda_nvprof.dev # <cuda_profiler_api.h>
] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [
cuda_profiler_api.dev # <cuda_profiler_api.h>
] ++ lists.optionals (strings.versionAtLeast cudaVersion "12.0") [
cuda_cccl.dev # <nv/target>
]) ++ lists.optionals rocmSupport [
rocmPackages.clr
rocmPackages.hipblas

View file

@ -50,7 +50,7 @@ let
in
buildPythonPackage rec {
pname = "mmcv";
version = "2.0.1";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -59,7 +59,7 @@ buildPythonPackage rec {
owner = "open-mmlab";
repo = "mmcv";
rev = "refs/tags/v${version}";
hash = "sha256-w40R8ftLQIu66F2EtXFAqvLGxR/6wvxLhxxIdsQLZhI=";
hash = "sha256-an78tRvx18zQ5Q0ca74r4Oe2gJ9F9OfWXLbuP2+rL68=";
};
preConfigure = ''

View file

@ -1,4 +1,5 @@
{ lib
{ config
, lib
, stdenv
, fetchFromGitHub
, pkg-config
@ -68,7 +69,17 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/llvm";
cmakeFlags = [
"-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU;NVPTX"
"-DLLVM_TARGETS_TO_BUILD=${
let
# Targets can be found in
# https://github.com/llvm/llvm-project/tree/f28c006a5895fc0e329fe15fead81e37457cb1d1/clang/lib/Basic/Targets
# NOTE: Unsure of how "host" would function, especially given that we might be cross-compiling.
llvmTargets = [ "AMDGPU" "NVPTX" ]
++ lib.optionals stdenv.isAarch64 [ "AArch64" ]
++ lib.optionals stdenv.isx86_64 [ "X86" ];
in
lib.concatStringsSep ";" llvmTargets
}"
"-DLLVM_ENABLE_PROJECTS=llvm;mlir"
"-DLLVM_INSTALL_UTILS=ON"
] ++ lib.optionals (buildDocs || buildMan) [
@ -107,6 +118,8 @@ stdenv.mkDerivation (finalAttrs: {
license = with licenses; [ ncsa ];
maintainers = with maintainers; [ SomeoneSerge Madouura ];
platforms = platforms.linux;
broken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344
# Consider the derivation broken if we're not building for CUDA or ROCm, or if we're building for aarch64
# and ROCm is enabled. See https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344.
broken = stdenv.isAarch64 && !config.cudaSupport;
};
})

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "paste";
version = "3.5.3";
version = "3.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cdent";
repo = "paste";
rev = "refs/tags/${version}";
hash = "sha256-W02UY9P3qjIFhR/DCpQZyvjEmJYl0MvMcGt9N4xgbaY=";
hash = "sha256-vVCJn8PhLNw0fj+/tTigTEodn9SEKv0VASJf4LKJy20=";
};
postPatch = ''

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyorthanc";
version = "1.12.2";
version = "1.12.3";
disabled = pythonOlder "3.8";
format = "pyproject";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gacou54";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-kgCHPp0nsbhzNw/bKwDeDc1mMcmdJUBmZExTZ01nlZY=";
hash = "sha256-9+HP95OsJIXsLy+6m6fWECU3jXxY++C3wQJBcqnC+H0=";
};
nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ];

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pytest-md-report";
version = "0.4.1";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to=";
hash = "sha256-8qLcbMhD+mTLH5veweAg56G067H4AnDQIjywINwJaCE=";
};
propagatedBuildInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pytest-testmon";
version = "2.0.12";
version = "2.0.13";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tarpas";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hv5sgWSbMk13h+nFTcy4aEMJvTyaLbXFhg6ZOKYEvVQ=";
hash = "sha256-WJ0Br8O7p5Zru4Fr9+adXp5qjR7sZxBZVtBJghecm9E=";
};
nativeBuildInputs = [

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "python-efl";
version = "1.26.0";
version = "1.26.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h";
hash = "sha256-3Ns5fhIHihnpDYDnxvPP00WIZL/o1UWLzgNott4GKNc=";
};
nativeBuildInputs = [ pkg-config ];
@ -48,8 +48,5 @@ buildPythonPackage rec {
platforms = platforms.linux;
license = with licenses; [ gpl3 lgpl3 ];
maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members;
# The generated files in the tarball aren't compatible with python 3.11
# See https://sourceforge.net/p/enlightenment/mailman/message/37794291/
broken = python.pythonAtLeast "3.11";
};
}

View file

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, sphinx
}:
let
pname = "sphinx-sitemap";
version = "2.5.1";
in
buildPythonPackage {
inherit pname version;
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-mEvvBou9vCbPriCai2E5LpaBq8kZG0d80w2kBuOmDuU=";
};
propagatedBuildInputs = [
sphinx
];
# Latest tests do not pass on Sphinx5, although it is supported
# Ref: https://github.com/jdillard/sphinx-sitemap/blob/ce244e9e1e05f09c566432f6a89bcd6f6ebe83bf/tox.ini#L18C25-L18C25
doCheck = false;
meta = with lib; {
changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}";
description = "Sitemap generator for Sphinx";
homepage = "https://github.com/jdillard/sphinx-sitemap";
maintainers = with maintainers; [ alejandrosame ];
license = licenses.mit;
};
}

View file

@ -111,7 +111,7 @@ let
brokenConditions = attrsets.filterAttrs (_: cond: cond) {
"CUDA and ROCm are not mutually exclusive" = cudaSupport && rocmSupport;
"CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux;
"Unsupported CUDA version" = cudaSupport && (cudaPackages.cudaMajorVersion != "11");
"Unsupported CUDA version" = cudaSupport && !(builtins.elem cudaPackages.cudaMajorVersion [ "11" "12" ]);
"MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit);
"Magma cudaPackages does not match cudaPackages" = cudaSupport && (magma.cudaPackages != cudaPackages);
};

View file

@ -56,7 +56,7 @@
, grpcio
}:
let
version = "0.10.23";
version = "0.10.24";
optional-dependencies = {
huggingflace = [
langdetect
@ -90,7 +90,7 @@ buildPythonPackage {
owner = "Unstructured-IO";
repo = "unstructured";
rev = "refs/tags/${version}";
hash = "sha256-MfnMu7YW8G1G0sKNvum4k6hvNMRmpXp9YwaDHEj/mYE=";
hash = "sha256-C1rjZRNXFr3syPnq7uhKRYz9Xydmunc/0uQcLxfN6tU=";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "whois-api";
version = "1.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "whois-api-llc";
repo = "whois-api-py";
rev = "v${version}";
hash = "sha256-SeBeJ6k2R53LxHov+8t70geqUosk/yBJQCi6GaVteMM=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
requests
];
# all tests touch internet
doCheck = false;
pythonImportsCheck = [ "whoisapi" ];
meta = with lib; {
description = "Whois API client library for Python";
homepage = "https://github.com/whois-api-llc/whois-api-py";
changelog = "https://github.com/whois-api-llc/whois-api-py/blob/${src.rev}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ mbalatsko ];
};
}

View file

@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec {
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
env = {

View file

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.25.0";
version = "0.25.3";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
sha256 = "sha256-Lt8ubK96ntcQJEnQ37nF8N4gJ8nmphwkbM6KJor13lo=";
sha256 = "sha256-tyNbBG2okxoLmu8mwoeR3Ud0nIpqkwVmFHT0Gi1Pibs=";
};
cargoHash = "sha256-cYhzEVHpi7qMCU9fe3wxOQGX6YssJIeo4onLUBtqN6A=";
cargoHash = "sha256-sKQw4Bak3JY07TYKkThKTFhh3H5GB2lDcfcGE4cRHDY=";
preCheck = ''
export HOME=$(mktemp -d)

View file

@ -54,12 +54,12 @@ rec {
});
beta = selectHighestVersion latest (generic {
version = "535.43.02";
sha256_64bit = "sha256-4KTdk4kGDmBGyHntMIzWRivUpEpzmra+p7RBsTL8mYM=";
sha256_aarch64 = "sha256-0blD8R+xpOVlitWefIbtw1d3KAnmWHBy7hkxGZHBrE4=";
openSha256 = "sha256-W1fwbbEEM7Z/S3J0djxGTtVTewbSALqX1G1OSpdajCM=";
settingsSha256 = "sha256-j0sSEbtF2fapv4GSthVTkmJga+ycmrGc1OnGpV6jEkc=";
persistencedSha256 = "sha256-M0ovNaJo8SZwLW4CQz9accNK79Z5JtTJ9kKwOzicRZ4=";
version = "545.23.06";
sha256_64bit = "sha256-QTnTKAGfcvKvKHik0BgAemV3PrRqRlM3B9jjZeupCC8=";
sha256_aarch64 = "sha256-qkVP6AiXNoRTqgqPvs/AfErEq8BTQw25rtJ6GS06JTM=";
openSha256 = "sha256-m7D5LZdhFCZYAIbhrgZ0pN2z19LsU3I3Q7qsKX7Z6mM=";
settingsSha256 = "sha256-+X6gDeU8Qlvprb05aB2quM55y0zEcBXtb65e3Rq9gKg=";
persistencedSha256 = "sha256-RQJAIwPqOUI5FB3uf0/Y4K/iwFfoLpU1/+BOK/KF5VA=";
});
# Vulkan developer beta driver

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "qmk-udev-rules";
version = "0.19.11";
version = "0.22.3";
src = fetchFromGitHub {
owner = "qmk";
repo = "qmk_firmware";
rev = version;
hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI=";
hash = "sha256-HLQxmBlzTdsOAMqfc4taoMM+V2G5novMsbc1drZlNGg=";
};
dontBuild = true;

View file

@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
pname = "bazarr";
version = "1.3.0";
version = "1.3.1";
sourceRoot = ".";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
sha256 = "sha256-f9LKJZX+dZRUGq+g/PHvCzN8UpDiBpEVvqEO6CZPoAE=";
sha256 = "sha256-AhUMrvnZoo0XMfJ6F9Bi4mC0hk5T3EkQPX/s4tHWcic=";
};
nativeBuildInputs = [ unzip makeWrapper ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geoserver";
version = "2.23.2";
version = "2.24.0";
src = fetchurl {
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
sha256 = "sha256-4zOtcUWeb/zubEY3wNCYBeStRSga2bm1BnBa+qcyeCw=";
sha256 = "sha256-xX1rAONMh5XSWGPXkVMemAvG34DDNmu2018HsTvY7G0=";
};
sourceRoot = ".";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.6.3";
version = "1.6.4";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "sha256-XmDM1Q9i+wDEPTNewIqb2vvyvdAlUiVsxACZCLOa2Y8=";
sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg=";
};
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

View file

@ -104,6 +104,7 @@ with pkgs;
cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
fetchurl = callPackages ../build-support/fetchurl/tests.nix { };
fetchFromBittorrent = callPackages ../build-support/fetchbittorrent/tests.nix { };
fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { };
fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; };
fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { };

View file

@ -1,13 +1,25 @@
{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst
, gtk2, libXi, pkg-config, texinfo }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, pkg-config
, gtk2
, libX11
, libXext
, libXi
, libXtst
, texinfo
, xorgproto
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
version = "3.19";
pname = "xnee";
src = fetchurl {
url = "mirror://gnu/xnee/${pname}-${version}.tar.gz";
sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j";
url = "mirror://gnu/xnee/xnee-${finalAttrs.version}.tar.gz";
hash = "sha256-UqQeXPYvgbej5bWBJOs1ZeHhICir2mP1R/u+DZiiwhI=";
};
patches = [
@ -16,57 +28,67 @@ stdenv.mkDerivation rec {
(fetchpatch {
name = "fno-common.patch";
url = "https://savannah.gnu.org/bugs/download.php?file_id=49534";
sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2";
hash = "sha256-Ar5SyVIEp8/knDHm+4f0KWAH+A5gGhXGezEqL7xkQhI=";
})
];
postPatch =
'' for i in `find cnee/test -name \*.sh`
do
sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g'
done
postPatch = ''
for i in `find cnee/test -name \*.sh`; do
sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g'
done
''
# Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added
# if `sem_init` is part of libc which causes errors like
# `gcc: error: CCC: No such file or directory` during the build.
+ ''
substituteInPlace configure* \
--replace 'LIBSEMA="CCC"' 'LIBSEMA=""'
'';
# Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added
# if `sem_init` is part of libc which causes errors like
# `gcc: error: CCC: No such file or directory` during the build.
substituteInPlace configure \
--replace 'LIBSEMA="CCC"' 'LIBSEMA=""'
'';
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ libX11 xorgproto libXext libXtst gtk2
libXi
texinfo
];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
configureFlags =
buildInputs = [
gtk2
libX11
libXext
libXi
libXtst
texinfo
xorgproto
];
configureFlags = [
"--disable-gnome-applet"
# Do a static build because `libxnee' doesn't get installed anyway.
[ "--disable-gnome-applet" "--enable-static" ];
"--enable-static"
];
# `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that
# lacks libXi.
makeFlags = [ "LDFLAGS=-lXi" ];
makeFlags = [
# `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that
# lacks libXi.
"LDFLAGS=-lXi"
];
# XXX: Actually tests require an X server.
doCheck = true;
meta = {
description = "X11 event recording and replay tool";
longDescription =
'' Xnee is a suite of programs that can record, replay and distribute
user actions under the X11 environment. Think of it as a robot that
can imitate the job you just did. Xnee can be used to automate
tests, demonstrate programs, distribute actions, record & replay
"macros", retype a file.
'';
license = lib.licenses.gpl3Plus;
longDescription = ''
Xnee is a suite of programs that can record, replay and distribute
user actions under the X11 environment. Think of it as a robot that
can imitate the job you just did. Xnee can be used to automate
tests, demonstrate programs, distribute actions, record & replay
"macros", retype a file.
'';
homepage = "https://www.gnu.org/software/xnee/";
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ wegank ];
platforms = lib.platforms.unix;
};
}
})

View file

@ -1,12 +1,12 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "3.88.0";
version = "3.89.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-linux-x64.tar.gz";
sha256 = "040rcmrrc8sgxsx1isgbz5pmd67kvks6sqyr7m27f7ccdi0kri8s";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-linux-x64.tar.gz";
sha256 = "1difz8nnfhqmjsmcfdk8d8pdwjflzx339rbn3rhg8rh78hr8nld4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-amd64.tar.gz";
@ -21,20 +21,16 @@
sha256 = "0nbrfqh79hp17mp6f9yb9j6dxfa6n0xf17ks8rkbivzbxq9kqijv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-linux-amd64.tar.gz";
sha256 = "04gmbpq1vjw6jbr0d6032hx923abck9czjkljfj2ksz2bagall7q";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-linux-amd64.tar.gz";
sha256 = "0aacw3c63xnl4hgnrh8z2yvpccpj3qfc9hvirwagsnjwd43lvvld";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-amd64.tar.gz";
sha256 = "0vyhmdyln0cpcf1fgc0v641c78a66dzx97i7xq6isspl6zx9njn5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-linux-amd64.tar.gz";
sha256 = "1b88zmn0qnrjvbvllr8hxs1f8pyvyc79mq0knvvpcb2akl48zm07";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-amd64.tar.gz";
sha256 = "0dm7qid20yq490yfls0qg8c9cwxm30qgvg581lwk312pk5zc7l6b";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-linux-amd64.tar.gz";
sha256 = "177bfrjfs6r42mhvscp0rpb7ypqmyxc5vj4cyggb7wbhhmvlw66q";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-linux-amd64.tar.gz";
@ -44,6 +40,10 @@
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-linux-amd64.tar.gz";
sha256 = "1hz2xavx3h19dgq8j7x9wfa3p93ki60z6vrkgxgj0x2ws606wqb3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-amd64.tar.gz";
sha256 = "0dm7qid20yq490yfls0qg8c9cwxm30qgvg581lwk312pk5zc7l6b";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-linux-amd64.tar.gz";
sha256 = "06k14jcz2z9p28wllq9kaxmqrhx0dxa2pq1zjbgbiym4w2zi4bbi";
@ -77,8 +77,8 @@
sha256 = "148sg0jsm05qqgi10m8y4b7ib1miyvs1346h36mg1pf8hykg3psb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-linux-amd64.tar.gz";
sha256 = "1papw5a9i4s0iw21f52p45gy6s7rlpb53drk5rkaracw8jm5522j";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-linux-amd64.tar.gz";
sha256 = "03qwzqq90l3z7yp7nb0zx34pgrhi2a0aljlxzdfhyaji4h1mkpz6";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-linux-amd64.tar.gz";
@ -93,12 +93,12 @@
sha256 = "00vvb17q05r5yn2i7yv3163gxvnakxkjl6a7n1dyb8yzr39ic7ff";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-linux-amd64.tar.gz";
sha256 = "1vp9p59qwlpr79bkr4zqhysg6rpiydl029r47fkn53wr43w3x0ga";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-linux-amd64.tar.gz";
sha256 = "0h3529s7szbhn309h1xksjprwv2pf512kqwzslfdmlvnmvidivsm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-linux-amd64.tar.gz";
sha256 = "04a29q7irg0rvlbgin1q0s84db86sn5d0hfi1cdlh388jq3fri7c";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-linux-amd64.tar.gz";
sha256 = "15y992kidym9ca4w4bl36riq462cb78n36s4giwfnm4h2cmv1mrp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz";
@ -125,13 +125,10 @@
sha256 = "0sf2bxlqv98xyhq213gfkh3cd59mbgc21b07kii1j0465xl78jmp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-linux-amd64.tar.gz";
sha256 = "156h4b0a6af02z2xad9kv3zipvnh4l98lmb38a5mp65f4pm5yzd3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-amd64.tar.gz";
sha256 = "1knsb0ha7xbgvlna67nhxmmrr6rw3h52va3dh4ra47b7r8ii7dca";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-linux-amd64.tar.gz";
sha256 = "0bsjlv07lzkx53wi34wc2xz2qlz8yilack3qd3zys8d53qz5yv55";
}
# pulumi-resource-sumologic skipped (does not exist on remote)
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-amd64.tar.gz";
sha256 = "06gvx51nl93rj244yximp6059yiyxh4jcdqqcrjic8r7wabzsiiw";
@ -141,20 +138,20 @@
sha256 = "1mjnfpkk8w13m5p2rkymmyd1nw0sdvg5izjfxpfs71nvy1xp9yxf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-linux-amd64.tar.gz";
sha256 = "1kffzf37gprgh82iyvir2ls5s11bgj5mhl8jww8symlr15pxlhnm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-amd64.tar.gz";
sha256 = "1jwiidxbfg6r0nm4l6p09n5yqaybxdl300s88jxppjn7dwn9dgwq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-linux-amd64.tar.gz";
sha256 = "0rakxw8h2121p1sdvqvp3y4bzzjs8ppsx58iqp0qv57k3ihdww85";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-linux-amd64.tar.gz";
sha256 = "12d8zs3j1ilbs840hwlmnch1jqahr44w668f012mypdl5cgm6mai";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-linux-amd64.tar.gz";
sha256 = "0qggmhvy0ghgynvaaj6yi7gg3k3gry60japmr987iwhm1knvgndq";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-linux-amd64.tar.gz";
sha256 = "0av9vs3l5jpmwxcgjaxp5jlnz4v0kdc4fr0fxqz0rdxsakd51lrs";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-linux-amd64.tar.gz";
sha256 = "1b1lx6c4lyphb8qlhk03gw81di11c77l5c4kj6a0jpac5zwksynr";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-linux-amd64.tar.gz";
sha256 = "1fgchr4psb42abfg5xbwqbs8y73s59q5z1l7p5zlrsfqsbmxa3wi";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz";
@ -163,8 +160,8 @@
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-darwin-x64.tar.gz";
sha256 = "0rfknh9v5r8y3zgh4m035qn0ixycv933qjzdbkkfa8fp1zq9wn3q";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-darwin-x64.tar.gz";
sha256 = "0w8lmglfi9200lkqi4gjw18qrnqalpkq23ysvjhzrywr52pkcscd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-amd64.tar.gz";
@ -179,20 +176,16 @@
sha256 = "1mb8xr16h156yj10mzfsprflbv72ldk9ap9w2cw40l8fvbq33lm4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-darwin-amd64.tar.gz";
sha256 = "1pqn2ymbf0i20micxdk3bh436231b58m0l2iabkjsashhf37qlwk";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-darwin-amd64.tar.gz";
sha256 = "0bl50wavpimlf16z6k5mxzq9m2cbvhiypznklgs0avkidyjiiix9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-amd64.tar.gz";
sha256 = "04imkdrj388nk88r734f0p0a6z1hffzmplwgmx55kfwqz3zpz4y5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-darwin-amd64.tar.gz";
sha256 = "0qa5ynrsbw1fca9nlf403r2h4k683w3d3yp902wz2bjlsx6m4i0f";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-amd64.tar.gz";
sha256 = "0x4zcfbp7vy349q1cj5phlikfx95n9fcmq74h9ihdgr0xbavbbn2";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-darwin-amd64.tar.gz";
sha256 = "0fyi3im07a1fxziip6g73z7aqv8hjsqk5g67l3b2mcnz0myzmqwn";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-darwin-amd64.tar.gz";
@ -202,6 +195,10 @@
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-darwin-amd64.tar.gz";
sha256 = "0rzwkwrjm5p59maz371ndf9mcsdlz98n756k125wylxbp5xygcyv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-amd64.tar.gz";
sha256 = "0x4zcfbp7vy349q1cj5phlikfx95n9fcmq74h9ihdgr0xbavbbn2";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-darwin-amd64.tar.gz";
sha256 = "014hi8zxrnf30q4nfxxpc19wf8ip8487h2wspl1rwa6mpwfn34ss";
@ -235,8 +232,8 @@
sha256 = "0p30xhj6k46cdy84c7zr4hgdpi3rqvdjqjx8kr8a1ky29569ji4j";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-darwin-amd64.tar.gz";
sha256 = "0kxfv7hf1nric2z6cv3c2b36anifbc8xz4z0mg4phx3jhy7xm545";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-darwin-amd64.tar.gz";
sha256 = "0q5bzk5z3qd1mifv1m44cfbcv8bvipd4sxrgqpk71gsanslz72jk";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-darwin-amd64.tar.gz";
@ -251,12 +248,12 @@
sha256 = "1mpx6355bvp3dp8w6x9hrrswfid592jzp1srsv0acd4ypzskm8zv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-darwin-amd64.tar.gz";
sha256 = "07zmhqd2zc2394c3ag5f868as7miv6f1q1l6s7p717gz54d6y6wz";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-darwin-amd64.tar.gz";
sha256 = "1xp48f3h8zkbvi5jasw9ax0pcz1z0awz5ssm1sms2s6wglmklrja";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-darwin-amd64.tar.gz";
sha256 = "04l1yifmbc59ivglnphwhcx5b889v2jd9bgk10ykmcl7v50gwlqm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-darwin-amd64.tar.gz";
sha256 = "1s5zphspan0wyz74hqv4156msx60mjkrbpvgy7f4mkhwl9wygjk1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz";
@ -283,13 +280,10 @@
sha256 = "1h96dih1pi95066kmk4whbds0w0lzal5pyxwwl1prxpr4w8yb6sd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-darwin-amd64.tar.gz";
sha256 = "1hyggh10w8zxb6dkva36dl7z1bdb3j9pnrdlapy591c0gbhan0rc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-amd64.tar.gz";
sha256 = "0xgihb099s99qb5bk6wavwm9227z73jgqrysmvjrqkn83kh7942v";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-darwin-amd64.tar.gz";
sha256 = "0m8hb602zgkvqis2sl033ajz85sk3yjbksbb5r6vqd6y7w9xi7k1";
}
# pulumi-resource-sumologic skipped (does not exist on remote)
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-amd64.tar.gz";
sha256 = "1pm5j9q4kvv70c6paficcfb664df6666mq559zvdklf5ndjpw5z9";
@ -299,20 +293,20 @@
sha256 = "0122mpbgc2d4yhdvm1j45niz07d68drj80hxa3d1sa9pqzyllbky";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-darwin-amd64.tar.gz";
sha256 = "0ipfx8x0zq5qxmbivjndqb1ijc2130gnv7ygs7ln5qcnzrhbjx2a";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-amd64.tar.gz";
sha256 = "0wph3f11dkvn956nmx9r57ynjaal6kj7qb08rwfiv792dlk5d5bc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-darwin-amd64.tar.gz";
sha256 = "0803vk8iy0xf7rbpgq1a0jjcjbn3jwia8hqf2mj696i9iiij2r3x";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-darwin-amd64.tar.gz";
sha256 = "1ghzm11lvbvglfbxdc4bkhp390cs3pd2jgj9k8xka1gffy8cm1m7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-darwin-amd64.tar.gz";
sha256 = "0f21v5claqq3cbrh809fy8ffv4v4whdjpqb0d6zgrxif2vczm86p";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-darwin-amd64.tar.gz";
sha256 = "1i6igx9yz0pa5brb056w0vzdp945xs723qmmmm84px06qd3przf2";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-darwin-amd64.tar.gz";
sha256 = "01fv7brag4c573408655kq8xcq5r0wgcjrfwn5z9wfpbcqg0blhb";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-darwin-amd64.tar.gz";
sha256 = "1bawapsj1xngiigbwwwin7xmz138s6fd71qdcrcax0pnfw1dycix";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
@ -321,8 +315,8 @@
];
aarch64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-linux-arm64.tar.gz";
sha256 = "1ifmqnai52pyn11w38f8lfk7v8bv0919vpg8c9y8fn7ag5qb9vn4";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-linux-arm64.tar.gz";
sha256 = "0bdlppjxy92ffl5rgka8pqx07xh4m0x1cnqi2hnkpizmrfzxlfkl";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-arm64.tar.gz";
@ -337,20 +331,16 @@
sha256 = "1g2bnrmzs9lyzrz7jn7hn6c1chzvg4bdxvza8kzafqrrynsqpisl";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-linux-arm64.tar.gz";
sha256 = "18s2bh3gwg4jby9frdx8z0cldyz1g1sspgdba4mawb6m7p5f6290";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-linux-arm64.tar.gz";
sha256 = "03f32qvwlvblg5qb1fpy0cy0aifk0n2w0vqra3fqw1v3pmk5d7ar";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-arm64.tar.gz";
sha256 = "11ph5yjy754sb55sncdlgibrmijg2jsylrjfpvy4mclrwg64cari";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-linux-arm64.tar.gz";
sha256 = "1cgl36srg5idd2cfr2v7h9ymnmfjqrhj81zh1f6qxfhjdj9gyzci";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-arm64.tar.gz";
sha256 = "18d3xgjha67i3qln1n6wg5fzhr8jwc1x2fh3zg630y4wdw3jsqix";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-linux-arm64.tar.gz";
sha256 = "1a22i6b3xcps8wj4hjg5sfcmglkl40njx5d25874yrzqvlarvlpq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-linux-arm64.tar.gz";
@ -360,6 +350,10 @@
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-linux-arm64.tar.gz";
sha256 = "0c4m9y4hh6k4f9v4xidijpwyc2650v4180zkdy5cpl7shfdk3n75";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-arm64.tar.gz";
sha256 = "18d3xgjha67i3qln1n6wg5fzhr8jwc1x2fh3zg630y4wdw3jsqix";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-linux-arm64.tar.gz";
sha256 = "1j8ab4m9jr7q0k89pinr93izdyvq0jk0nm2gr5rjrq5wrwirly9i";
@ -393,8 +387,8 @@
sha256 = "14xpg193qf332sa9x4iw39i71k158f5393bqcqrjfccpkk1adwli";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-linux-arm64.tar.gz";
sha256 = "13jq9vrv1pkg6g2711v53fgy14yb8zw1q1jrr1ndmlyxgk84qy98";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-linux-arm64.tar.gz";
sha256 = "0fxvivpscjlmcp4jdzvg4zhiah8g4zs5sa0ra0yxc9shs0v669p6";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-linux-arm64.tar.gz";
@ -409,12 +403,12 @@
sha256 = "17zpwizdsavsnhq179hw67wppdm61hzl6qrycl4anf074h5fy9rw";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-linux-arm64.tar.gz";
sha256 = "1xdr0yhck5ji40rf40pdax9qihnvyd39d6rjiyl8ydlpw9w9ma5i";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-linux-arm64.tar.gz";
sha256 = "190mi8sbwn6g4ggx3j3mbpwpp61kazpcj9qwmbb35x14miqppc2a";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-linux-arm64.tar.gz";
sha256 = "0mqakfimh58vvmcsf0m0knazxymgg1zi87h3scj6lgj11m3lqrdv";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-linux-arm64.tar.gz";
sha256 = "07h3a5h86vcxv5qwgfc34knh640s8ynws0pc39sps5rhd90rdsyj";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz";
@ -441,13 +435,10 @@
sha256 = "09j6cw9m1aa60n0gq68dmpk70gyh69qqkm98djrcn6134j2xf555";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-linux-arm64.tar.gz";
sha256 = "07qh2d542rshixmdyk0rl7381gq81spc0fhn2cwcw0j7cvq01z6q";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-arm64.tar.gz";
sha256 = "1kqv70w3d84a9a0kj0w2hmd88h50zlfc35xkf57kgd43l948wcin";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-linux-arm64.tar.gz";
sha256 = "0kfavb72qw4bdnj7q6n248vzpkgghi07dsjq6k0p51zs0spsm5mx";
}
# pulumi-resource-sumologic skipped (does not exist on remote)
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-arm64.tar.gz";
sha256 = "1rlf5gl7a7ym8zl4h0v7i42a9830zi401axw032h0v4q6w4zki3n";
@ -457,20 +448,20 @@
sha256 = "104lp8pxm3z6dshz3jvn6bsniskw665jmnmfnr410kgx60hk4wip";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-linux-arm64.tar.gz";
sha256 = "1pbb47vh7lwh729y1c9aky3nhyd6ijyknpb3w4grxfkdhiyyid9y";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-arm64.tar.gz";
sha256 = "0cq2mmzsjk4il1brqp1i8jjl9771krjiir5fk0bhhrzj08jvi0l3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-linux-arm64.tar.gz";
sha256 = "1qp184fqwlm3r1lvk9qjhddfj9hmzsv4hjgc0jp1bylnmycqc81c";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-linux-arm64.tar.gz";
sha256 = "15y18s4p9py16gzcb6l69g3qj857kr3jafjdhhafxjfzfi2rlvd7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-linux-arm64.tar.gz";
sha256 = "1q492lykggvnxnzlnw95iysnjw3zs6j6rj24yqr9kxqbsavlcld6";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-linux-arm64.tar.gz";
sha256 = "0ifzw0az0xglk599f5kzyrss1lkk622lclpzqcvm89rl5ad6hglr";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-linux-arm64.tar.gz";
sha256 = "00ggsw1czdmr742jp18snnfdbm7682srf62nz9rvsb1w7lnjs4yq";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-linux-arm64.tar.gz";
sha256 = "0cykvh8zzsdzlp4nqsphhn4is8nm1sqcmc0hhgi4lq7wppgf1w9h";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz";
@ -479,8 +470,8 @@
];
aarch64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-darwin-arm64.tar.gz";
sha256 = "0z0gpxrihxwx1a3njvhr9rc3p4pv6yqw6a6xnf2ssn4pqck6rl5q";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-darwin-arm64.tar.gz";
sha256 = "02phzva1f0y8zhdaghb80q1axb1drlkyrbw1ndi5cq6fvdr4pd3b";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-arm64.tar.gz";
@ -495,20 +486,16 @@
sha256 = "0ma5n4mcilnqmhxyr2pn1j6xxm25hd52f7sxs7y8h38a87a54xfq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-darwin-arm64.tar.gz";
sha256 = "1gzy86d860nv4amg2wvpk7qj94x2v929bflh6vszyfi29r68k2z0";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-darwin-arm64.tar.gz";
sha256 = "1n67diprsfwwas5qlb7krlbf22x5kg2cmrjhf7x39my5ysak6l9f";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-arm64.tar.gz";
sha256 = "07f30h74hyg3j9dj78a0al5v9i5n105y52yn362mlyvfh807blml";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-darwin-arm64.tar.gz";
sha256 = "0x4ri61ppj9shhx17rxlavs347fsy4bqpq489y0g13dy51xzsgh7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-arm64.tar.gz";
sha256 = "03x2h0nivi5ygn8lk57g4xky29256hczgmf0qwfrb9lb49qnvrss";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-darwin-arm64.tar.gz";
sha256 = "1qinp5qqb2ab9d8nwwllrsz1q007hhnjc6m5x4b1m7ffvhjbxmyy";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-darwin-arm64.tar.gz";
@ -518,6 +505,10 @@
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-darwin-arm64.tar.gz";
sha256 = "18gzy9kpz74ycdl988r3mxzxakbd74vn2rl5y3hzlhgyd03vqmfm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-arm64.tar.gz";
sha256 = "03x2h0nivi5ygn8lk57g4xky29256hczgmf0qwfrb9lb49qnvrss";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-darwin-arm64.tar.gz";
sha256 = "1kmy7krwbgyxlk4f83nw6npll3svymbigzdr9kaj3ab8bcbj0wpn";
@ -551,8 +542,8 @@
sha256 = "0x6ispcwkx15x753zy6awwlykh66qfk5phwdzsy8gw3j1g033a85";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-darwin-arm64.tar.gz";
sha256 = "0lhc76q4x126dcjbnsz5a4r414y94sp70dhr702fh24zn9v4f9gd";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-darwin-arm64.tar.gz";
sha256 = "0sg0wmfmn2ldcfmlwbwlpdqrp5ngzfyj5liz30n6xqhsm7jfifvp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-darwin-arm64.tar.gz";
@ -567,12 +558,12 @@
sha256 = "1f4xnjwbp1qbx0hcym4gxynb4j1vxlj7iqh1naays3ypc4mgnms1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-darwin-arm64.tar.gz";
sha256 = "0vjl1yd3wgpn99qphkamd6mfwqg671zrdd2121ydprk9v60jq8c5";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-darwin-arm64.tar.gz";
sha256 = "1ngrba277225i8c7vyx90w71p8w6lh0y8d108sba738b2kjxrr9h";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-darwin-arm64.tar.gz";
sha256 = "1x0rpyy3hg3wna6w273zy9dhd0mvgqvqd8lj406nwwir9pbq2xw1";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-darwin-arm64.tar.gz";
sha256 = "0hkyf0m1s63l0c5f84a6jafcxdyqvxi92597m01bd3zp3938qv1b";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz";
@ -599,13 +590,10 @@
sha256 = "1v0k309w96f9s9nvslh7dx6mhk5prxcbd83fgrcfhsk784hrrzqi";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-darwin-arm64.tar.gz";
sha256 = "1598kg5w639fdp8cdsaxm0jcn1p3q1mmfyfci3gn8s0ck2xfnbnm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-arm64.tar.gz";
sha256 = "17ngmwyh6z1g6x3lrd77pxa9wwwarh4mqdcq7aiwf57plx4a4l6j";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-darwin-arm64.tar.gz";
sha256 = "0d6xhmdisafpspycqfh6p4d42d6331lkspwmizzdvqwq96awd6pn";
}
# pulumi-resource-sumologic skipped (does not exist on remote)
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-arm64.tar.gz";
sha256 = "09agrp3sb7mzhwaja4rvz0p25rpsb2n4v3s2kyzcx3pyfyhigvfn";
@ -615,20 +603,20 @@
sha256 = "00svwn4p6gmmk9y53w9k4zl425lv13wmm7v86y627fq7nv8pwkd0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-darwin-arm64.tar.gz";
sha256 = "065imbfc3h96dhrjfs6qqcr5ha3hyy5q2gh0904ghda9dk8v1xhn";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-arm64.tar.gz";
sha256 = "1mk1034lp6x9gnal12gbmkfpvjv67a7lqfm38nd4slcnvc5p9x8w";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-darwin-arm64.tar.gz";
sha256 = "0wm3ldvhg6xhnblfwxccjqqw0q0mpl7s92cckzrzhdr5rwddcgbf";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-darwin-arm64.tar.gz";
sha256 = "05z2z3kp68qv513rvva0zifkwx0440dbdsp87ip84gx7qc5ibs1h";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-darwin-arm64.tar.gz";
sha256 = "08qgbqxdc8z1mbhnl6jh6jsb79dlb9jf43inyrlr6mxcf2gnv7kx";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-darwin-arm64.tar.gz";
sha256 = "1fvdbw76ax20z9dx3amlmr5b0r28i9d09khbpgdhl83d1j54z15s";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-darwin-arm64.tar.gz";
sha256 = "01s1lr79qcwz28xl5ckp81jg1hgypagcxxjv2c9mcvljxana291v";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-darwin-arm64.tar.gz";
sha256 = "1wq7b4r7abjzxcawybwi7v2pdc6sm429mvs6hm0mixxbbqynn07c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz";

View file

@ -1,5 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
, cacert, Security, garage, nixosTests }:
{ lib
, stdenv
, rustPlatform
, fetchFromGitea
, fetchpatch
, openssl
, pkg-config
, protobuf
, cacert
, Security
, garage
, nixosTests
}:
let
generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
pname = "garage";
@ -31,8 +42,6 @@ let
# on version changes for checking if changes are required here
buildFeatures = [
"kubernetes-discovery"
] ++
(lib.optionals (lib.versionAtLeast version "0.8") [
"bundled-libs"
"sled"
"metrics"
@ -41,7 +50,7 @@ let
"lmdb"
"sqlite"
"consul-discovery"
]);
];
# To make integration tests pass, we include the optional k2v feature here,
# but in buildFeatures only for version 0.8+, where it's enabled by default.
@ -49,13 +58,11 @@ let
checkFeatures = [
"k2v"
"kubernetes-discovery"
] ++
(lib.optionals (lib.versionAtLeast version "0.8") [
"bundled-libs"
"sled"
"lmdb"
"sqlite"
]);
];
passthru.tests = nixosTests.garage;
@ -69,27 +76,33 @@ let
};
};
in
rec {
# Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore
# we have to keep all the numbers in the version to handle major/minor/patch level.
# for <1.0.
rec {
# Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore
# we have to keep all the numbers in the version to handle major/minor/patch level.
# for <1.0.
garage_0_7_3 = generic {
version = "0.7.3";
sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg=";
cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI=";
eol = true; # Confirmed with upstream maintainers over Matrix.
};
garage_0_8_4 = generic {
version = "0.8.4";
sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs=";
cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8=";
};
garage_0_7 = garage_0_7_3;
garage_0_8 = garage_0_8_4;
garage_0_8_4 = generic {
version = "0.8.4";
sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs=";
cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8=";
};
garage_0_9_0 = (generic {
version = "0.9.0";
sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8=";
cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o=";
}).overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [
(fetchpatch {
url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4.patch";
sha256 = "sha256-q7E6gtPjnj5O/K837LMP6LPEFcgdkifxRFrYzBuqkk0=";
})
];
});
garage_0_8 = garage_0_8_4;
garage_0_9 = garage_0_9_0;
garage = garage_0_8;
}
garage = garage_0_9;
}

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "enumer";
version = "1.5.8";
version = "1.5.9";
src = fetchFromGitHub {
owner = "dmarkham";
repo = "enumer";
rev = "refs/tags/v${version}";
hash = "sha256-+YTsXYWVmJ32V/Eptip3WAiqIYv+6nqbdph0K2XzLdc=";
hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks=";
};
vendorHash = "sha256-+dCitvPz2JUbybXVJxUOo1N6+SUPCSjlacL8bTSlb7w=";
vendorHash = "sha256-CJCay24FlzDmLjfZ1VBxih0f+bgBNu+Xn57QgWT13TA=";
meta = with lib; {
description = "Go tool to auto generate methods for enums";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "moar";
version = "1.18.1";
version = "1.18.2";
src = fetchFromGitHub {
owner = "walles";
repo = pname;
rev = "v${version}";
hash = "sha256-E0wJ0P4ofkfKU6HKEZ+D6fT7EMKlHrGioEMJPi9T+9E=";
hash = "sha256-bYrn1Ok1yyhiKPUBdvUvTKVeAwsWAwbNoK3IburOAuU=";
};
vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo=";
vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -0,0 +1,11 @@
--- a/utils.h
+++ b/utils.h
@@ -15,7 +15,7 @@
#endif
/* Portability macros */
-#ifdef __GNUC__
+#if defined __GNUC__ && ! defined __clang__
# define NORETURN __attribute__((noreturn))
# define MALLOC_FREE __attribute__((malloc(free)))
# define NONNULL __attribute__((returns_nonnull))

View file

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0=";
};
patches = [
./clang.patch
];
nativeBuildInputs = [ perl gettext pkg-config ];
buildInputs = [ libidn2 libiconv ];

View file

@ -187,8 +187,8 @@ in lib.makeExtensible (self: ({
};
nix_2_17 = common {
version = "2.17.0";
hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8=";
version = "2.17.1";
hash = "sha256-Q5L+rHzjp0bYuR2ogg+YPCn6isjmlQ4CJVT0zpn/hFc=";
};
nix_2_18 = common {

View file

@ -263,6 +263,8 @@ mapAliases ({
### G ###
g4py = python3Packages.geant4; # Added 2020-06-06
garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10
garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10
garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17
geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10
geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10

View file

@ -1116,6 +1116,8 @@ with pkgs;
fetchs3 = callPackage ../build-support/fetchs3 { };
fetchFromBittorrent = callPackage ../build-support/fetchbittorrent { };
fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform
# hack around splicing being crummy with things that (correctly) don't eval.
then buildPackages.fetchsvn
@ -8454,8 +8456,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
})
garage
garage_0_7 garage_0_8
garage_0_7_3 garage_0_8_4;
garage_0_8 garage_0_9
garage_0_8_4 garage_0_9_0;
garmin-plugin = callPackage ../applications/misc/garmin-plugin { };
@ -35956,6 +35958,7 @@ with pkgs;
};
transmission-gtk = transmission.override { enableGTK3 = true; };
transmission-qt = transmission.override { enableQt = true; };
transmission_noSystemd = transmission.override { enableSystemd = false; };
# Needs macOS >= 10.14.6
transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix {

View file

@ -13130,6 +13130,8 @@ self: super: with self; {
sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { };
sphinx-sitemap = callPackage ../development/python-modules/sphinx-sitemap { };
sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { };
sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { };
@ -15543,6 +15545,8 @@ self: super: with self; {
whois = callPackage ../development/python-modules/whois { };
whois-api = callPackage ../development/python-modules/whois-api { };
whoosh = callPackage ../development/python-modules/whoosh { };
widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };