ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

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

107
doc/build-helpers/images/ocitools.section.md
View File

@ -1,37 +1,104 @@
# pkgs.ociTools {#sec-pkgs-ociTools}
`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container.
`pkgs.ociTools` is a set of functions for creating runtime container bundles according to the [OCI runtime specification v1.0.0](https://github.com/opencontainers/runtime-spec/blob/v1.0.0/spec.md).
It makes no assumptions about the container runner you choose to use to run the created container.
The set of functions in `pkgs.ociTools` currently does not handle the [OCI image specification](https://github.com/opencontainers/image-spec).
At a high-level an OCI implementation would download an OCI Image then unpack that image into an OCI Runtime filesystem bundle.
At this point the OCI Runtime Bundle would be run by an OCI Runtime.
`pkgs.ociTools` provides utilities to create OCI Runtime bundles.
## buildContainer {#ssec-pkgs-ociTools-buildContainer}
This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command.
This function creates an OCI runtime container (consisting of a `config.json` and a root filesystem directory) that runs a single command inside of it.
The nix store of the container will contain all referenced dependencies of the given command.
The parameters of `buildContainer` with an example value are described below:
This function has an assumption that the container will run on POSIX platforms, and sets configurations (such as the user running the process or certain mounts) according to this assumption.
Because of this, a container built with `buildContainer` will not work on Windows or other non-POSIX platforms without modifications to the container configuration.
These modifications aren't supported by `buildContainer`.
For `linux` platforms, `buildContainer` also configures the following namespaces (see {manpage}`unshare(1)`) to isolate the OCI container from the global namespace:
PID, network, mount, IPC, and UTS.
Note that no user namespace is created, which means that you won't be able to run the container unless you are the `root` user.
### Inputs {#ssec-pkgs-ociTools-buildContainer-inputs}
`buildContainer` expects an argument with the following attributes:
`args` (List of String)
: Specifies a set of arguments to run inside the container.
Any packages referenced by `args` will be made available inside the container.
`mounts` (Attribute Set; _optional_)
: Would specify additional mounts that the runtime must make available to the container.
:::{.warning}
As explained in [issue #290879](https://github.com/NixOS/nixpkgs/issues/290879), this attribute is currently ignored.
:::
:::{.note}
`buildContainer` includes a minimal set of necessary filesystems to be mounted into the container, and this set can't be changed with the `mounts` attribute.
:::
_Default value:_ `{}`.
`readonly` (Boolean; _optional_)
: If `true`, sets the container's root filesystem as read-only.
_Default value:_ `false`.
`os` **DEPRECATED**
: Specifies the operating system on which the container filesystem is based on.
If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties).
According to the linked specification, all possible values for `$GOOS` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `darwin` or `linux`.
_Default value:_ `"linux"`.
`arch` **DEPRECATED**
: Used to specify the architecture for which the binaries in the container filesystem have been compiled.
If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties).
According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`.
_Default value:_ `x86_64`.
### Examples {#ssec-pkgs-ociTools-buildContainer-examples}
::: {.example #ex-ociTools-buildContainer-bash}
# Creating an OCI runtime container that runs `bash`
This example uses `ociTools.buildContainer` to create a simple container that runs `bash`.
```nix
buildContainer {
{ ociTools, lib, bash }:
ociTools.buildContainer {
args = [
(with pkgs;
writeScript "run.sh" ''
#!${bash}/bin/bash
exec ${bash}/bin/bash
'').outPath
(lib.getExe bash)
];
mounts = {
"/data" = {
type = "none";
source = "/var/lib/mydata";
options = [ "bind" ];
};
};
readonly = false;
}
```
- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container.
As an example of how to run the container generated by this package, we'll use `runc` to start the container.
Any other tool that supports OCI containers could be used instead.
- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs)
```shell
$ nix-build
(some output removed for clarity)
/nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join
- `readonly` makes the container's rootfs read-only if it is set to true. The default value is false `false`.
$ cd /nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join
$ nix-shell -p runc
[nix-shell:/nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join]$ sudo runc run ocitools-example
help
GNU bash, version 5.2.26(1)-release (x86_64-pc-linux-gnu)
(some output removed for clarity)
```
:::

207
doc/build-helpers/images/portableservice.section.md
View File

@ -1,81 +1,174 @@
# pkgs.portableService {#sec-pkgs-portableService}
`pkgs.portableService` is a function to create _portable service images_,
as read-only, immutable, `squashfs` archives.
systemd supports a concept of [Portable Services](https://systemd.io/PORTABLE_SERVICES/).
Portable Services are a delivery method for system services that uses two specific features of container management:
* Applications are bundled. I.e. multiple services, their binaries and
all their dependencies are packaged in an image, and are run directly from it.
* Stricter default security policies, i.e. sandboxing of applications.
This allows using Nix to build images which can be run on many recent Linux distributions.
The primary tool for interacting with Portable Services is `portablectl`,
and they are managed by the `systemd-portabled` system service.
`pkgs.portableService` is a function to create [Portable Services](https://systemd.io/PORTABLE_SERVICES/) in a read-only, immutable, `squashfs` raw disk image.
This lets you use Nix to build images which can be run on many recent Linux distributions.
::: {.note}
Portable services are supported starting with systemd 239 (released on 2018-06-22).
:::
A very simple example of using `portableService` is described below:
The generated image will contain the file system structure as required by the Portable Services specification, along with the packages given to `portableService` and all of their dependencies.
When generated, the image will exist in the Nix store with the `.raw` file extension, as required by the specification.
See [](#ex-portableService-hello) to understand how to use the output of `portableService`.
## Inputs {#ssec-pkgs-portableService-inputs}
`portableService` expects one argument with the following attributes:
`pname` (String)
: The name of the portable service.
The generated image will be named according to the template `$pname_$version.raw`, which is supported by the Portable Services specification.
`version` (String)
: The version of the portable service.
The generated image will be named according to the template `$pname_$version.raw`, which is supported by the Portable Services specification.
`units` (List of Attribute Set)
: A list of derivations for systemd unit files.
Each derivation must produce a single file, and must have a name that starts with the value of `pname` and ends with the suffix of the unit type (e.g. ".service", ".socket", ".timer", and so on).
See [](#ex-portableService-hello) to better understand this naming constraint.
`description` (String or Null; _optional_)
: If specified, the value is added as `PORTABLE_PRETTY_NAME` to the `/etc/os-release` file in the generated image.
This could be used to provide more information to anyone inspecting the image.
_Default value:_ `null`.
`homepage` (String or Null; _optional_)
: If specified, the value is added as `HOME_URL` to the `/etc/os-release` file in the generated image.
This could be used to provide more information to anyone inspecting the image.
_Default value:_ `null`.
`symlinks` (List of Attribute Set; _optional_)
: A list of attribute sets in the format `{object, symlink}`.
For each item in the list, `portableService` will create a symlink in the path specified by `symlink` (relative to the root of the image) that points to `object`.
All packages that `object` depends on and their dependencies are automatically copied into the image.
This can be used to create symlinks for applications that assume some files to exist globally (`/etc/ssl` or `/bin/bash`, for example).
See [](#ex-portableService-symlinks) to understand how to do that.
_Default value:_ `[]`.
`contents` (List of Attribute Set; _optional_)
: A list of additional derivations to be included as-is in the image.
These derivations will be included directly in a `/nix/store` directory inside the image.
_Default value:_ `[]`.
`squashfsTools` (Attribute Set; _optional_)
: Allows you to override the package that provides {manpage}`mksquashfs(1)`, which is used internally by `portableService`.
_Default value:_ `pkgs.squashfsTools`.
`squash-compression` (String; _optional_)
: Passed as the compression option to {manpage}`mksquashfs(1)`, which is used internally by `portableService`.
_Default value:_ `"xz -Xdict-size 100%"`.
`squash-block-size` (String; _optional_)
: Passed as the block size option to {manpage}`mksquashfs(1)`, which is used internally by `portableService`.
_Default value:_ `"1M"`.
## Examples {#ssec-pkgs-portableService-examples}
[]{#ex-pkgs-portableService}
:::{.example #ex-portableService-hello}
# Building a Portable Service image
The following example builds a Portable Service image with the `hello` package, along with a service unit that runs it.
```nix
pkgs.portableService {
pname = "demo";
version = "1.0";
units = [ demo-service demo-socket ];
{ lib, writeText, portableService, hello }:
let
hello-service = writeText "hello.service" ''
[Unit]
Description=Hello world service
[Service]
Type=oneshot
ExecStart=${lib.getExe hello}
'';
in
portableService {
pname = "hello";
inherit (hello) version;
units = [ hello-service ];
}
```
The above example will build an squashfs archive image in `result/$pname_$version.raw`. The image will contain the
file system structure as required by the portable service specification, and a subset of the Nix store with all the
dependencies of the two derivations in the `units` list.
`units` must be a list of derivations, and their names must be prefixed with the service name (`"demo"` in this case).
Otherwise `systemd-portabled` will ignore them.
After building the package, the generated image can be loaded into a system through {manpage}`portablectl(1)`:
::: {.note}
The `.raw` file extension of the image is required by the portable services specification.
```shell
$ nix-build
(some output removed for clarity)
/nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1
$ portablectl attach /nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1/hello_2.12.1.raw
Created directory /etc/systemd/system.attached.
Created directory /etc/systemd/system.attached/hello.service.d.
Written /etc/systemd/system.attached/hello.service.d/20-portable.conf.
Created symlink /etc/systemd/system.attached/hello.service.d/10-profile.conf → /usr/lib/systemd/portable/profile/default/service.conf.
Copied /etc/systemd/system.attached/hello.service.
Created symlink /etc/portables/hello_2.12.1.raw → /nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1/hello_2.12.1.raw.
$ systemctl start hello
$ journalctl -u hello
Feb 28 22:39:16 hostname systemd[1]: Starting Hello world service...
Feb 28 22:39:16 hostname hello[102887]: Hello, world!
Feb 28 22:39:16 hostname systemd[1]: hello.service: Deactivated successfully.
Feb 28 22:39:16 hostname systemd[1]: Finished Hello world service.
$ portablectl detach hello_2.12.1
Removed /etc/systemd/system.attached/hello.service.
Removed /etc/systemd/system.attached/hello.service.d/10-profile.conf.
Removed /etc/systemd/system.attached/hello.service.d/20-portable.conf.
Removed /etc/systemd/system.attached/hello.service.d.
Removed /etc/portables/hello_2.12.1.raw.
Removed /etc/systemd/system.attached.
```
:::
Some other options available are:
- `description`, `homepage`
:::{.example #ex-portableService-symlinks}
# Specifying symlinks when building a Portable Service image
Are added to the `/etc/os-release` in the image and are shown by the portable services tooling.
Default to empty values, not added to os-release.
- `symlinks`
Some services may expect files or directories to be available globally.
An example is a service which expects all trusted SSL certificates to exist in a specific location by default.
A list of attribute sets {object, symlink}. Symlinks will be created in the root filesystem of the image to
objects in the Nix store. Defaults to an empty list.
- `contents`
To make things available globally, you must specify the `symlinks` attribute when using `portableService`.
The following package builds on the package from [](#ex-portableService-hello) to make `/etc/ssl` available globally (this is only for illustrative purposes, because `hello` doesn't use `/etc/ssl`).
A list of additional derivations to be included in the image Nix store, as-is. Defaults to an empty list.
- `squashfsTools`
Defaults to `pkgs.squashfsTools`, allows you to override the package that provides `mksquashfs`.
- `squash-compression`, `squash-block-size`
Options to `mksquashfs`. Default to `"xz -Xdict-size 100%"` and `"1M"` respectively.
A typical usage of `symlinks` would be:
```nix
symlinks = [
{ object = "${pkgs.cacert}/etc/ssl"; symlink = "/etc/ssl"; }
{ object = "${pkgs.bash}/bin/bash"; symlink = "/bin/sh"; }
{ object = "${pkgs.php}/bin/php"; symlink = "/usr/bin/php"; }
];
```
to create these symlinks for legacy applications that assume them existing globally.
{ lib, writeText, portableService, hello, cacert }:
let
hello-service = writeText "hello.service" ''
[Unit]
Description=Hello world service
Once the image is created, and deployed on a host in `/var/lib/portables/`, you can attach the image and run the service. As root run:
```console
portablectl attach demo_1.0.raw
systemctl enable --now demo.socket
systemctl enable --now demo.service
[Service]
Type=oneshot
ExecStart=${lib.getExe hello}
'';
in
portableService {
pname = "hello";
inherit (hello) version;
units = [ hello-service ];
symlinks = [
{ object = "${cacert}/etc/ssl"; symlink = "/etc/ssl"; }
];
}
```
::: {.note}
See the [man page](https://www.freedesktop.org/software/systemd/man/portablectl.html) of `portablectl` for more info on its usage.
:::

4
doc/manpage-urls.json
View File

@ -318,5 +318,7 @@
"passwd(5)": "https://man.archlinux.org/man/passwd.5",
"group(5)": "https://man.archlinux.org/man/group.5",
"login.defs(5)": "https://man.archlinux.org/man/login.defs.5",
"nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html"
"unshare(1)": "https://man.archlinux.org/man/unshare.1.en",
"nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html",
"mksquashfs(1)": "https://man.archlinux.org/man/extra/squashfs-tools/mksquashfs.1.en"
}

13
lib/fixed-points.nix
View File

@ -145,6 +145,12 @@ rec {
in fix g
```
:::{.note}
The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function.
The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`.
:::
:::{.example}
# Extend a fixed-point function with an overlay
@ -230,13 +236,6 @@ rec {
fix (extends (final: prev: { c = final.a + final.b; }) f)
=> { a = 1; b = 3; c = 4; }
:::{.note}
The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function.
The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`.
The new argument
:::
*/
extends =
# The overlay to apply to the fixed-point function

2
nixos/modules/services/networking/searx.nix
View File

@ -213,7 +213,7 @@ in
serviceConfig = {
User = "searx";
Group = "searx";
ExecStart = "${cfg.package}/bin/searx-run";
ExecStart = lib.getExe cfg.package;
} // optionalAttrs (cfg.environmentFile != null)
{ EnvironmentFile = builtins.toPath cfg.environmentFile; };
environment = {

32
nixos/modules/services/security/kanidm.nix
View File

@ -132,6 +132,28 @@ in
default = "WriteReplica";
type = lib.types.enum [ "WriteReplica" "WriteReplicaNoUI" "ReadOnlyReplica" ];
};
online_backup = {
path = lib.mkOption {
description = lib.mdDoc "Path to the output directory for backups.";
type = lib.types.path;
default = "/var/lib/kanidm/backups";
};
schedule = lib.mkOption {
description = lib.mdDoc "The schedule for backups in cron format.";
type = lib.types.str;
default = "00 22 * * *";
};
versions = lib.mkOption {
description = lib.mdDoc ''
Number of backups to keep.
The default is set to `0`, in order to disable backups by default.
'';
type = lib.types.ints.unsigned;
default = 0;
example = 7;
};
};
};
};
default = { };
@ -233,6 +255,14 @@ in
environment.systemPackages = lib.mkIf cfg.enableClient [ cfg.package ];
systemd.tmpfiles.settings."10-kanidm" = {
${cfg.serverSettings.online_backup.path}.d = {
mode = "0700";
user = "kanidm";
group = "kanidm";
};
};
systemd.services.kanidm = lib.mkIf cfg.enableServer {
description = "kanidm identity management daemon";
wantedBy = [ "multi-user.target" ];
@ -253,6 +283,8 @@ in
BindPaths = [
# To create the socket
"/run/kanidmd:/run/kanidmd"
# To store backups
cfg.serverSettings.online_backup.path
];
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];

6
nixos/tests/searx.nix
View File

@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
};
# fancy setup: run in uWSGI and use nginx as proxy
nodes.fancy = { ... }: {
nodes.fancy = { config, ... }: {
imports = [ ../modules/profiles/minimal.nix ];
services.searx = {
@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
include ${pkgs.nginx}/conf/uwsgi_params;
uwsgi_pass unix:/run/searx/uwsgi.sock;
'';
locations."/searx/static/".alias = "${pkgs.searx}/share/static/";
locations."/searx/static/".alias = "${config.services.searx.package}/share/static/";
};
# allow nginx access to the searx socket
@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
)
fancy.succeed(
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2"
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2"
)
'';
})

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

File diff suppressed because it is too large Load Diff

337
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@ -50,12 +50,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=2372f16";
version = "0.0.0+rev=a282270";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "2372f163b8416eeea674686fe0222e39fa06bad5";
hash = "sha256-nX0JXEP+fAADlKqMA1rrhKlUS4JMrOtFTQ/wxoOxcIY=";
rev = "a282270857b7be447b8be91411468349a31d73b7";
hash = "sha256-NAE/E3glGz509nOKO5xsJIwe1Q2OSh6Aj5krUOVhqvw=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@ -116,14 +116,14 @@
};
bass = buildGrammar {
language = "bass";
version = "0.0.0+rev=27f110d";
version = "0.0.0+rev=c9ba456";
src = fetchFromGitHub {
owner = "amaanq";
owner = "vito";
repo = "tree-sitter-bass";
rev = "27f110dfe79620993f5493ffa0d0f2fe12d250ed";
hash = "sha256-OmYtp2TAsAjw2fgdSezHUrP46b/QXgCbDeJa4ANrtvY=";
rev = "c9ba4568af24cd3403029730687c0a43d1350a43";
hash = "sha256-F131TkIt2mW2n8Da3zI1/B0yoT9Ezo2hWoptpsdMrb4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-bass";
meta.homepage = "https://github.com/vito/tree-sitter-bass";
};
beancount = buildGrammar {
language = "beancount";
@ -182,12 +182,12 @@
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=72a60ea";
version = "0.0.0+rev=652433f";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "72a60ea888fb59a8e143883661f021139c905b74";
hash = "sha256-huEi/PEzjG9mtwL30mJ2oVy+D64d8I9Z/LZc856qlbw=";
rev = "652433fce487d8c3943207da38e3e65e4550e288";
hash = "sha256-Ld8ufwdOVqRYb9YpOa6z6fWoA+gj0w0nlq3dqhFCap8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
@ -226,12 +226,12 @@
};
chatito = buildGrammar {
language = "chatito";
version = "0.0.0+rev=308b591";
version = "0.0.0+rev=7162ec1";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-chatito";
rev = "308b5913fd2ae6b527183ba1b3a490f90da32012";
hash = "sha256-oD49Rc1J/CkIAqEFI87efdzGLYl73se0ekpQll/Mpxs=";
rev = "7162ec1e8e9154fb334e84aa7637a4af051dfe42";
hash = "sha256-phvENW6wEqhKQakeXxsTclhSmFWFgfK9ztCszOGuaYY=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
};
@ -248,12 +248,12 @@
};
cmake = buildGrammar {
language = "cmake";
version = "0.0.0+rev=73ab4b8";
version = "0.0.0+rev=f8de25f";
src = fetchFromGitHub {
owner = "uyha";
repo = "tree-sitter-cmake";
rev = "73ab4b8e9522f014a67f87f585e820d36fa47408";
hash = "sha256-5X4ho6tqPZFQWqoQ6WBsfuA+RbxTX5XzX7xzyFSTifw=";
rev = "f8de25f30757a2def006a7c144354710fe63dcf3";
hash = "sha256-J8Ro3J9kkH7k/v+nwekCotoS/l28yInhk9p/xaSbegc=";
};
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
};
@ -314,12 +314,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=3d98832";
version = "0.0.0+rev=e0c1678";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "3d988327a1cfd724c0d195b37a1056174fae99bc";
hash = "sha256-s7+dRY3OWE7iz9nlqHEOyLlrWaDPF0buDSIjsRYPc7s=";
rev = "e0c1678a78731e78655b7d953efb4daecf58be46";
hash = "sha256-CdNCVDMAmeJrHgPb2JLxFHj/tHnUYC8flmxj+UaVXTo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@ -348,12 +348,12 @@
};
cuda = buildGrammar {
language = "cuda";
version = "0.0.0+rev=2c6e806";
version = "0.0.0+rev=221179d";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "2c6e806949197e7898910c78f514a3b7ff679068";
hash = "sha256-JAShJo+jDv4kzFCPID0C3EokmeiWxMVcJoEsVOzKBEw=";
rev = "221179d4287a2c24c08e4c67ff383ef67dc32156";
hash = "sha256-e01PTB+SduikiiDvOW411v0pBXCqOFBWlu3HgmM6jFg=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@ -370,12 +370,12 @@
};
d = buildGrammar {
language = "d";
version = "0.0.0+rev=d9a1a2e";
version = "0.0.0+rev=a33d400";
src = fetchFromGitHub {
owner = "gdamore";
repo = "tree-sitter-d";
rev = "d9a1a2ed77017c23f715643f4739433a5ea7ab6f";
hash = "sha256-GgecDpsZMBTEqHjSbNyUUA6HzGuYEgtqZ9AB+6+fsDo=";
rev = "a33d400f025d6bbd37b4c681c93054976f579890";
hash = "sha256-LUb+1dTj1IP5ZtWaWBT8UWnGEqb0DJodgbkwnT7xywk=";
};
meta.homepage = "https://github.com/gdamore/tree-sitter-d";
};
@ -469,12 +469,12 @@
};
dtd = buildGrammar {
language = "dtd";
version = "0.0.0+rev=2743ff8";
version = "0.0.0+rev=52b3783";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "2743ff864eac85cec830ff400f2e0024b9ca588b";
hash = "sha256-wuj3Q+LAtAS99pwJUD+3BzndVeNhzvQlaugzTHRvUjI=";
rev = "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a";
hash = "sha256-DVx/JwQXFEgY3XXo2rOVIWBRHdqprNgja9lAashkh5g=";
};
location = "dtd";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@ -526,12 +526,12 @@
};
elm = buildGrammar {
language = "elm";
version = "0.0.0+rev=c26afd7";
version = "0.0.0+rev=09dbf22";
src = fetchFromGitHub {
owner = "elm-tooling";
repo = "tree-sitter-elm";
rev = "c26afd7f2316f689410a1622f1780eff054994b1";
hash = "sha256-vYN1E49IpsvTUmxuzRyydCmhYZYGndcZPMBYgSMudrE=";
rev = "09dbf221d7491dc8d8839616b27c21b9c025c457";
hash = "sha256-Bq2oWtqEAsKyV0iHNKC+hXW4fh4yUwbfUhPtZWg5pug=";
};
meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
};
@ -592,25 +592,36 @@
};
faust = buildGrammar {
language = "faust";
version = "0.0.0+rev=9e514af";
version = "0.0.0+rev=f3b9274";
src = fetchFromGitHub {
owner = "khiner";
repo = "tree-sitter-faust";
rev = "9e514af33bfe061d0ccf1999dbcc93fca91f133c";
hash = "sha256-FZ5wl6Pl2Y86dNpaRMTh8Q7TEx/s0YoV9/H1J+qwlwo=";
rev = "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4";
hash = "sha256-JwR8LCEptgQmEG/ruK5ukIGCNtvKJw5bobZ0WXF1ulY=";
};
meta.homepage = "https://github.com/khiner/tree-sitter-faust";
};
fennel = buildGrammar {
language = "fennel";
version = "0.0.0+rev=15e4f8c";
version = "0.0.0+rev=215e391";
src = fetchFromGitHub {
owner = "travonted";
owner = "alexmozaidze";
repo = "tree-sitter-fennel";
rev = "15e4f8c417281768db17080c4447297f8ff5343a";
hash = "sha256-BdhgDS+yJ/DUYJknVksLSNHvei+MOkqVW7gp6AffKhU=";
rev = "215e3913524abc119daa9db7cf6ad2f2f5620189";
hash = "sha256-myh0+ZNDzdUZFAdsw8uVGyo0VYh0wKNZ11vlJKTSZnA=";
};
meta.homepage = "https://github.com/travonted/tree-sitter-fennel";
meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel";
};
fidl = buildGrammar {
language = "fidl";
version = "0.0.0+rev=bdbb635";
src = fetchFromGitHub {
owner = "google";
repo = "tree-sitter-fidl";
rev = "bdbb635a7f5035e424f6173f2f11b9cd79703f8d";
hash = "sha256-+s9AC7kAfPumREnc7xCSsYiaDwLp3uirLntwd2wK6Wo=";
};
meta.homepage = "https://github.com/google/tree-sitter-fidl";
};
firrtl = buildGrammar {
language = "firrtl";
@ -702,12 +713,12 @@
};
gdscript = buildGrammar {
language = "gdscript";
version = "0.0.0+rev=03f20b9";
version = "0.0.0+rev=b5dea4d";
src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
rev = "03f20b94707a21bed90bb95101684bc4036139ce";
hash = "sha256-im87Rws9PPcBWNN0M8PNqnthJZlWKzn3iPLMGR+jtGo=";
rev = "b5dea4d852db65f0872d849c24533eb121e03c76";
hash = "sha256-/fmg7DfVX62F3sEovFaMs4dTA4rvPexOdQop3257op4=";
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
@ -735,12 +746,12 @@
};
gitattributes = buildGrammar {
language = "gitattributes";
version = "0.0.0+rev=3d03b37";
version = "0.0.0+rev=0750b59";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
rev = "3d03b37395f5707b6a2bfb43f62957fe0e669c0c";
hash = "sha256-+DvxhL+m3Nagv0GXWWWYsIIDuWNzlK1vNVLOO0qBl2E=";
rev = "0750b5904f37d6b2f47f6e4655001c2c35a172ec";
hash = "sha256-BXsF++uut1WWxe67E+CUh3e6VWrezNJaPfYJhXB0VlY=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
};
@ -999,23 +1010,23 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=840fd07";
version = "0.0.0+rev=f820ee8";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "840fd07f09304bca415b93a15483e9ab1e44bc3f";
hash = "sha256-GPY6udz0YZawmQ6WcItXchUeag9EO+eMMGoYSaRsdrY=";
rev = "f820ee8417451f69020791cf691904ec1b63f20d";
hash = "sha256-d80vNrZGaPWlST5tgvf25CliuzS+zSZ60f49cRuucZ4=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
hlsplaylist = buildGrammar {
language = "hlsplaylist";
version = "0.0.0+rev=ff121d3";
version = "0.0.0+rev=5be34b0";
src = fetchFromGitHub {
owner = "Freed-Wu";
repo = "tree-sitter-hlsplaylist";
rev = "ff121d397cf7cc709e3bbc928107fc25529e11e0";
hash = "sha256-FItkJbxWfpRne27OPRq5fCHUCX35fxmiT6k1eX8UkhI=";
rev = "5be34b0f6ea01b24f017c2c715729a3a919f57fd";
hash = "sha256-3ZFaIc4BrfR7dLxftbSLuFdErjYrJgi0Cd8jp9PB19U=";
};
meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist";
};
@ -1043,12 +1054,12 @@
};
html = buildGrammar {
language = "html";
version = "0.0.0+rev=438d694";
version = "0.0.0+rev=b5d9758";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "438d694a1f51e1704cb779ad4fec2517523b1d7f";
hash = "sha256-NL1tOr7V3QVsVu2OfzLzFpe/FpYVD6MCgdSV0I6AkRY=";
rev = "b5d9758e22b4d3d25704b72526670759a9e4d195";
hash = "sha256-v3BD36OKkzJ1xqQV87HAyQpnQzi/4+PuyEAM1HfkW3U=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
@ -1175,12 +1186,12 @@
};
json = buildGrammar {
language = "json";
version = "0.0.0+rev=ac6ddfa";
version = "0.0.0+rev=3b12920";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-json";
rev = "ac6ddfa7775795a3d8f5edab4a71e3a49f932b6a";
hash = "sha256-T/y1xfHv3G3cTD2xw43tMiW8agKwE5CV/uwThSHkd84=";
rev = "3b129203f4b72d532f58e72c5310c0a7db3b8e6d";
hash = "sha256-dVErHgsUDEN42wc/Gd68vQfVc8+/r/8No9KZk2GFzmY=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
};
@ -1351,12 +1362,12 @@
};
lua = buildGrammar {
language = "lua";
version = "0.0.0+rev=9668709";
version = "0.0.0+rev=04c9579";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "tree-sitter-lua";
rev = "9668709211b2e683f27f414454a8b51bf0a6bda1";
hash = "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=";
rev = "04c9579dcb917255b2e5f8199df4ae7f587d472f";
hash = "sha256-kzyn6XF4/PN8civ/0UV+ancCMkh7DF2B7WUYxix6aaM=";
};
meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
};
@ -1417,24 +1428,24 @@
};
markdown = buildGrammar {
language = "markdown";
version = "0.0.0+rev=23d9cb2";
version = "0.0.0+rev=2821521";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f";
hash = "sha256-Z42w7gSUV9/9Q1jtCrd03cjlMUjHC5Vjie1x8m8K5uw=";
rev = "2821521a4e6eab37b63dff6a8e169cd88554047d";
hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "0.0.0+rev=23d9cb2";
version = "0.0.0+rev=2821521";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f";
hash = "sha256-Z42w7gSUV9/9Q1jtCrd03cjlMUjHC5Vjie1x8m8K5uw=";
rev = "2821521a4e6eab37b63dff6a8e169cd88554047d";
hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@ -1474,35 +1485,35 @@
};
meson = buildGrammar {
language = "meson";
version = "0.0.0+rev=3d6dfbd";
version = "0.0.0+rev=d6ec8ce";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-meson";
rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1";
hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y=";
rev = "d6ec8ce0963c3c8180161391f15d8f7d415f650d";
hash = "sha256-SwcBhg6luPAOtaL5dhvLxCpJcwlGhZxhvVmn5pa6ecA=";
};
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=650a8fb";
version = "0.0.0+rev=117cbbc";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "650a8fb72013ba8d169bdb458e480d640fc545c9";
hash = "sha256-Xmn5WaOgvAVyr1Bgzr+QG9G/kymtl4CUvLL5SPZdikU=";
rev = "117cbbc46bbf82ae30b24f8939573655017226da";
hash = "sha256-c0+Pvhe++fHmRL9Ptri+vsdRN3MCb2Z/7EqWmFaK/CE=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
};
muttrc = buildGrammar {
language = "muttrc";
version = "0.0.0+rev=0af0e0d";
version = "0.0.0+rev=67d9e23";
src = fetchFromGitHub {
owner = "neomutt";
repo = "tree-sitter-muttrc";
rev = "0af0e0d8c8cf59dc21cfe565489da0c247374b9f";
hash = "sha256-AB8c2mV2sTNwN8sZkv3RbRKdxZW467P6epX+Z4LWqbU=";
rev = "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a";
hash = "sha256-B3/VoPq8h7TiwOP0nhsuPmFtkLsucpDm9RnUNXkfKpo=";
};
meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc";
};
@ -1519,23 +1530,23 @@
};
nickel = buildGrammar {
language = "nickel";
version = "0.0.0+rev=091b5dc";
version = "0.0.0+rev=19fb551";
src = fetchFromGitHub {
owner = "nickel-lang";
repo = "tree-sitter-nickel";
rev = "091b5dcc7d138901bcc162da9409c0bb626c0d27";
hash = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0=";
rev = "19fb551196d18b75160631f5e3a8a006b3875276";
hash = "sha256-NXyagRPUT3h8G6R+eE4YrTnWtfB3AT/piXeun5ETU6s=";
};
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
};
nim = buildGrammar {
language = "nim";
version = "0.0.0+rev=70ceee8";
version = "0.0.0+rev=c5f0ce3";
src = fetchFromGitHub {
owner = "alaviss";
repo = "tree-sitter-nim";
rev = "70ceee835e033acbc7092cd7f4f6a251789af121";
hash = "sha256-9+ADYNrtdva/DkkjPwavyU0cL6eunqq4TX9IUQi9eKw=";
rev = "c5f0ce3b65222f5dbb1a12f9fe894524881ad590";
hash = "sha256-KzAZf5vgrdp33esrgle71i0m52MvRJ3z/sMwzb+CueU=";
};
meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
};
@ -1698,46 +1709,46 @@
};
pem = buildGrammar {
language = "pem";
version = "0.0.0+rev=7905a16";
version = "0.0.0+rev=db307bb";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-pem";
rev = "7905a168036e23605160a0d32a142f58ab5eaa06";
hash = "sha256-6gEOrpJ/5UDMMVqKh0XQX+K3JOPiOk5H6CWZgB59h00=";
rev = "db307bbb7dc4f721bf2f5ba7fcedaf58feeb59e0";
hash = "sha256-uBZo16QtZtbYc4jHdFt1w/zMx9F+WKBB+ANre8IURHA=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem";
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=a30394f";
version = "0.0.0+rev=fd8b951";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "a30394f61b607f48c841c6e085d5219f23872816";
hash = "sha256-3aWBh5jKXUYXxOv+RKyEpwJVOoP7QuaRQZHw0yOy6tQ=";
rev = "fd8b951cf6f72d48dfd07679de8cf0260836b231";
hash = "sha256-ejbpska3Ar0cjqDGZXXjRkpDLNsnDUJD0TBsb2cZfY4=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=caf4d67";
version = "0.0.0+rev=710754c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "caf4d67d55386d3e4f85d29450b8d9cacbb02d19";
hash = "sha256-L0M9v/T3W3v+pES2AytZ6V4jHfnSklFBRGPW3/oB2Aw=";
rev = "710754c879435178b7643e525c84cd53f32c510c";
hash = "sha256-vOvuctPCcKs5iQ88Tv3Euxk7fDg06o1leRWUic4qzLQ=";
};
location = "php";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
php_only = buildGrammar {
language = "php_only";
version = "0.0.0+rev=caf4d67";
version = "0.0.0+rev=710754c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "caf4d67d55386d3e4f85d29450b8d9cacbb02d19";
hash = "sha256-L0M9v/T3W3v+pES2AytZ6V4jHfnSklFBRGPW3/oB2Aw=";
rev = "710754c879435178b7643e525c84cd53f32c510c";
hash = "sha256-vOvuctPCcKs5iQ88Tv3Euxk7fDg06o1leRWUic4qzLQ=";
};
location = "php_only";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
@ -1788,12 +1799,12 @@
};
poe_filter = buildGrammar {
language = "poe_filter";
version = "0.0.0+rev=99ce487";
version = "0.0.0+rev=bf912df";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-poe-filter";
rev = "99ce487804eab781e1e1cb39de82aea236346c96";
hash = "sha256-kMk0gCb2/FExKyGPeRDCd6rW/R3eH1iuE7udnFoI5UY=";
rev = "bf912df70f60b356c70631d9cbb317b41c1ea319";
hash = "sha256-EHftq35YJzElvYiJxiu7iIcugoXME7CXuQSo1ktG584=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
};
@ -1810,12 +1821,12 @@
};
printf = buildGrammar {
language = "printf";
version = "0.0.0+rev=ddff4ce";
version = "0.0.0+rev=0e0acea";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-printf";
rev = "ddff4ce4d630d1f1a3b591d77b2618a4169b36b9";
hash = "sha256-MIj4tP2+zb43pcnSBSVjPpKxjbxKFJTcz8AJphEvh6k=";
rev = "0e0aceabbf607ea09e03562f5d8a56f048ddea3d";
hash = "sha256-y/7CDnHpT3D6hL0f+52mReCphn+lvElfQQKJwY4fr9c=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf";
};
@ -1843,14 +1854,14 @@
};
properties = buildGrammar {
language = "properties";
version = "0.0.0+rev=74e5d3c";
version = "0.0.0+rev=189b3cc";
src = fetchFromGitHub {
owner = "ObserverOfTime";
owner = "tree-sitter-grammars";
repo = "tree-sitter-properties";
rev = "74e5d3c63d0da17c0800b3cf9090b24637ef6b59";
hash = "sha256-oB5TA8dZtuFop7Urggv2ZWWi8s6wDsIL+ZG5+sCQgq8=";
rev = "189b3cc18d36871c27ebb0adcf0cddd123b0cbba";
hash = "sha256-5cA2DDMiP8axu8Jl1M+CoxHoB+Jc/VMy3vXME+yxH9o=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-properties";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
};
proto = buildGrammar {
language = "proto";
@ -1899,12 +1910,12 @@
};
puppet = buildGrammar {
language = "puppet";
version = "0.0.0+rev=9ce9a5f";
version = "0.0.0+rev=3641b9e";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-puppet";
rev = "9ce9a5f7d64528572aaa8d59459ba869e634086b";
hash = "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw=";
rev = "3641b9e854ac9c84c7576e71c4c9a357bcfd9550";
hash = "sha256-J1DBjQRdV4R85NTyg/qmwbjm1bryKe3UOdp4XyH6BQc=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-puppet";
};
@ -2042,12 +2053,12 @@
};
readline = buildGrammar {
language = "readline";
version = "0.0.0+rev=f2f98d4";
version = "0.0.0+rev=e436eae";
src = fetchFromGitHub {
owner = "ribru17";
repo = "tree-sitter-readline";
rev = "f2f98d4263949d696e69a425f65326c59d1ceedc";
hash = "sha256-+T4HS2QqoXFRgBfY61NHK4EyQ/HF26eeMt9KV2Ud0Ug=";
rev = "e436eaef452266a3d00c195f0eb757d6502c767a";
hash = "sha256-y38TDQ+7wBzEKol/UQ5Xk6f15wUW7hJxByDuhx9d0hQ=";
};
meta.homepage = "https://github.com/ribru17/tree-sitter-readline";
};
@ -2141,12 +2152,12 @@
};
rust = buildGrammar {
language = "rust";
version = "0.0.0+rev=a70daac";
version = "0.0.0+rev=85a21c9";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "a70daac064145c84e9d51767c2575bb68d51df58";
hash = "sha256-2Y7sQ5bhKEpbDAHd5zJMGAlDWH32tJXxAgFOYY8S7o8=";
rev = "85a21c96d31b2a5c4369e5836a7f4ab059268fea";
hash = "sha256-uxOjdB65+HjNuOybbYb2N9R0I+bt909bIBOzmh9vfVc=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
};
@ -2197,23 +2208,23 @@
};
slang = buildGrammar {
language = "slang";
version = "0.0.0+rev=130b2f5";
version = "0.0.0+rev=0cdfb17";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-slang";
rev = "130b2f5c7a1d5c24645c3518db4bc2b22dd90718";
hash = "sha256-gDN8nyQjxE7Hko3MJJj2Le0Ey0pd3GlG5QWkDf8c7Q0=";
rev = "0cdfb1741323f38e9a33798674145c22cfc0092b";
hash = "sha256-1xSnb3n9u45B2gEBApZpZlb1VvbJOrmgQwrPL2OuGro=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-slang";
};
slint = buildGrammar {
language = "slint";
version = "0.0.0+rev=68405a4";
version = "0.0.0+rev=3c82235";
src = fetchFromGitHub {
owner = "slint-ui";
repo = "tree-sitter-slint";
rev = "68405a45f7a5311cd1f77e40ba84199573303f52";
hash = "sha256-zmmxXU7w5N8XjKn2Uu/nAc/FjCAprdKyJ0c75CGUgpk=";
rev = "3c82235f41b63f35a01ae3888206e93585cbb84a";
hash = "sha256-D3X2YwvxvseIGnKzaSocr3Ak7qoASZhxyRS+rtpir0g=";
};
meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
};
@ -2287,12 +2298,12 @@
};
sourcepawn = buildGrammar {
language = "sourcepawn";
version = "0.0.0+rev=846ec64";
version = "0.0.0+rev=39ce73a";
src = fetchFromGitHub {
owner = "nilshelmig";
repo = "tree-sitter-sourcepawn";
rev = "846ec647109a1f3dfab17c025c80ecdf6fd56581";
hash = "sha256-3yRBrzuzjWKKpLO+58P/JdNvjPj2o1HuBZOKkFh2RCs=";
rev = "39ce73ad42b2c4f52848d16093c24feddaa7d226";
hash = "sha256-CyCUGGycWpgQl/BGDjRHwYoa9Mess49jUf9WUkRaliE=";
};
meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn";
};
@ -2397,23 +2408,23 @@
};
svelte = buildGrammar {
language = "svelte";
version = "0.0.0+rev=bd60db7";
version = "0.0.0+rev=04a126d";
src = fetchFromGitHub {
owner = "Himujjal";
owner = "tree-sitter-grammars";
repo = "tree-sitter-svelte";
rev = "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd";
hash = "sha256-FZuzbTOP9LokPb77DSUwIXCFvMmDQPyyLKt7vNtEuAY=";
rev = "04a126d9210def99f06d9ab84a255110b862d47c";
hash = "sha256-F6AC72IHMKs1jTwshwNkAXFfiBGEbBn7m83xedCoDsA=";
};
meta.homepage = "https://github.com/Himujjal/tree-sitter-svelte";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte";
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=dabbcf9";
version = "0.0.0+rev=e1ac0c3";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "dabbcf9a2311e08c1b020e1258849b8359e9de1a";
hash = "sha256-U4r2uEDqBXeDC0NkOvSwkKreJnFSStxJisNPLJ4CTZs=";
rev = "e1ac0c3b48f4c42c40f92f400f14c6561369d4dd";
hash = "sha256-7MXH3ZDMH3Im/t5FPMGw6MGKMS+hKaHKUvTXXCrvgtI=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@ -2552,6 +2563,17 @@
};
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
};
tmux = buildGrammar {
language = "tmux";
version = "0.0.0+rev=10737f5";
src = fetchFromGitHub {
owner = "Freed-Wu";
repo = "tree-sitter-tmux";
rev = "10737f5dc4d8e68c9667f11a6996688a1185755f";
hash = "sha256-7MQYyWu1Rw3Vwmp3nbuorn9rD0xcEU5nRXPuTVpOqkM=";
};
meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux";
};
todotxt = buildGrammar {
language = "todotxt";
version = "0.0.0+rev=3937c5c";
@ -2643,6 +2665,17 @@
};
meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
};
typst = buildGrammar {
language = "typst";
version = "0.0.0+rev=c757be0";
src = fetchFromGitHub {
owner = "uben0";
repo = "tree-sitter-typst";
rev = "c757be0898e2a58f4e9761aa164dc413bf5beaf8";
hash = "sha256-z0x47Qrr8mYroDtXapRmzOMHOxlYmQmonN0P7VSCBu0=";
};
meta.homepage = "https://github.com/uben0/tree-sitter-typst";
};
udev = buildGrammar {
language = "udev";
version = "0.0.0+rev=15d89be";
@ -2746,23 +2779,23 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=32c76f1";
version = "0.0.0+rev=bc1364d";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vim";
rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55";
hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4=";
rev = "bc1364d922952138957a62105171ed68e73fbb6c";
hash = "sha256-5h1GYjyYMJd5GS0zXh0LP1wBs60fYohpFv89gcdZ4vU=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vim";
};
vimdoc = buildGrammar {
language = "vimdoc";
version = "0.0.0+rev=ed8695a";
version = "0.0.0+rev=40fcd50";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
rev = "ed8695ad8de39c3f073da130156f00b1148e2891";
hash = "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg=";
rev = "40fcd50a2c7b5a3ef98294795116773b24fb61ab";
hash = "sha256-i/O8vIjiyOoFECS1nmKfL/8hofzSvwg5cJo7JooJGOY=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
};
@ -2790,23 +2823,23 @@
};
wgsl_bevy = buildGrammar {
language = "wgsl_bevy";
version = "0.0.0+rev=a041228";
version = "0.0.0+rev=cbd58ee";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-wgsl-bevy";
rev = "a041228ae64632f59b9bd37346a0dbcb7817f36b";
hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k=";
rev = "cbd58ee33e24f46d16b9882b001eefb25a958ee2";
hash = "sha256-EPpI4UJ/5GB2iDQGoSziUOcP1TVf7VU4FMTKvrujcAY=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=f7965a9";
version = "0.0.0+rev=52ef462";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "f7965a947d2eaa8b5b9bba1c42a0e1891f1a0b2a";
hash = "sha256-qQ74aj7pccc3gvmeNoa0BBTMdNTmcc0h8aWNcLvpMRY=";
rev = "52ef462f76e199845a5df4834b838339e0a6efdb";
hash = "sha256-eZEyk285EyfduzrVH3Ojbwu8mbRFfZY6lrQQQT1kWM8=";
};
location = "libs/tree-sitter-wing";
generate = true;
@ -2814,23 +2847,23 @@
};
xcompose = buildGrammar {
language = "xcompose";
version = "0.0.0+rev=8898238";
version = "0.0.0+rev=7fd1494";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-xcompose";
rev = "8898238fca7e143760386448093392b87e58002e";
hash = "sha256-1U3FFO6j4jdynDTRQlD8kfTYTiKvC7ZjxSECMW9NYGY=";
rev = "7fd14940e0478fce79ea195067ed14a2c42c654a";
hash = "sha256-elnm1HjE4hLFMR/XhCPhOcGjqS9FbCULPRb/IntpQ3U=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose";
};
xml = buildGrammar {
language = "xml";
version = "0.0.0+rev=2743ff8";
version = "0.0.0+rev=52b3783";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xml";
rev = "2743ff864eac85cec830ff400f2e0024b9ca588b";
hash = "sha256-wuj3Q+LAtAS99pwJUD+3BzndVeNhzvQlaugzTHRvUjI=";
rev = "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a";
hash = "sha256-DVx/JwQXFEgY3XXo2rOVIWBRHdqprNgja9lAashkh5g=";
};
location = "xml";
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@ -2870,12 +2903,12 @@
};
zathurarc = buildGrammar {
language = "zathurarc";
version = "0.0.0+rev=fe37e85";
version = "0.0.0+rev=353bdf2";
src = fetchFromGitHub {
owner = "Freed-Wu";
repo = "tree-sitter-zathurarc";
rev = "fe37e85db355c737573315f278672534c40fe140";
hash = "sha256-lQFCJhyJTCa+zdsobMutgbQqJ9mhehaIbRLbds0riEo=";
rev = "353bdf25e7af9c2830e254977fd3fb57ccaa8203";
hash = "sha256-vFDz4X0ujqM9GbrpGt3dRjvo0SR07E2qXrT/ppTegBQ=";
};
meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc";
};

2
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -998,7 +998,7 @@
inherit (old) version src;
sourceRoot = "source/spectre_oxi";
cargoHash = "sha256-822+3s6FJVqBRYJAL/89bJfGv8fNhSN3nQelB29mXvQ=";
cargoHash = "sha256-gCGuD5kipgfR0Le8npNmyBxNsUq0PavXvKkxkiPx13E=";
preCheck = ''

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

@ -75,6 +75,7 @@ https://github.com/jiangmiao/auto-pairs/,,
https://github.com/pocco81/auto-save.nvim/,HEAD,
https://github.com/rmagatti/auto-session/,,
https://github.com/m4xshen/autoclose.nvim/,HEAD,
https://github.com/gaoDean/autolist.nvim/,,
https://github.com/vim-scripts/autoload_cscope.vim/,,
https://github.com/nullishamy/autosave.nvim/,HEAD,
https://github.com/rafi/awesome-vim-colorschemes/,,

5
pkgs/applications/file-managers/projectable/default.nix
View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_5
, libgit2
, openssl
, zlib
, stdenv
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2_1_5
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec {
];
env = {
LIBGIT2_NO_VENDOR = 1;
OPENSSL_NO_VENDOR = true;
};

4
pkgs/applications/misc/nwg-panel/default.nix
View File

@ -16,13 +16,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.9.24";
version = "0.9.25";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
hash = "sha256-qd2fnGdpHXX35ZtNGe59GnmhYGn6VJibc0KEr60VIJM=";
hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ=";
};
# No tests

5
pkgs/applications/misc/swaynotificationcenter/default.nix
View File

@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: rec {
hash = "sha256-7O+DX4uuncUqx5zEKQprZE6tctteT6NU01V2EBHiFqA=";
};
# build pkg-config is required to locate the native `scdoc` input
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
bash-completion
# cmake # currently conflicts with meson
@ -50,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: rec {
pkg-config
python3
sassc
pantheon.granite
scdoc
vala
wrapGAppsHook
@ -68,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: rec {
libhandy
libpulseaudio
librsvg
pantheon.granite
# systemd # ends with broken permission
];

6
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.5.3206.55";
version = "6.5.3206.63";
suffix = {
aarch64-linux = "arm64";
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-lr+9+w1vRZSG/2dP5K3mcKLCQijckPdkM/I2DgjO4wg=";
x86_64-linux = "sha256-ElkuuaZfK8F6CVA5xbKszkbqdcPACFR+xd0pRxnd6+U=";
aarch64-linux = "sha256-MyKTihImCd1/4UwnC/GqyeQcYnJNvKW5UfIIRN45r8E=";
x86_64-linux = "sha256-RbGoOKQyAaNY+y+jCT+r7GI9vymTT9kPDrwl9/bhaNw=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

4
pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
View File

@ -2,7 +2,7 @@
callPackage ./generic.nix {} rec {
pname = "signal-desktop";
dir = "Signal";
version = "6.48.1";
version = "7.0.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-3FJdgWmpfHAy5Hd97bH1DAbXYLsabom22tUKNK2bF2c=";
hash = "sha256-xwKisiOE2g+pg1P9mX6AlwYU1JWXIWSSygwauoU05E8=";
}

6
pkgs/applications/networking/powerdns-admin/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, mkYarnPackage, nixosTests, writeText, python3 }:
let
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "PowerDNS-Admin";
repo = "PowerDNS-Admin";
rev = "v${version}";
hash = "sha256-AwqEcAPD1SF1Ma3wtH03mXlTywM0Q19hciCmTtlr3gk=";
hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk=";
};
python = python3;
@ -29,7 +29,7 @@ let
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-3ebT19LrbYuypdJaoB3tClVVP0Fi8tHx3Xi6ge/DpA4=";
hash = "sha256-rXIts+dgOuZQGyiSke1NIG7b4lFlR/Gfu3J6T3wP3aY=";
};
# Copied from package.json, see also

10
pkgs/applications/version-management/git-dive/default.nix
View File

@ -2,8 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
# libgit2-sys doesn't support libgit2 1.6 yet
, libgit2_1_5
, libgit2
, oniguruma
, zlib
, stdenv
@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2_1_5
libgit2
oniguruma
zlib
] ++ lib.optionals stdenv.isDarwin [
@ -54,7 +53,10 @@ rustPlatform.buildRustPackage rec {
git config --global user.email nixbld@example.com
'';
RUSTONIG_SYSTEM_LIBONIG = true;
env = {
LIBGIT2_NO_VENDOR = 1;
RUSTONIG_SYSTEM_LIBONIG = true;
};
meta = with lib; {
description = "Dive into a file's history to find root cause";

8
pkgs/applications/version-management/git-mit/default.nix
View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_5
, libgit2
, openssl
, zlib
, stdenv
@ -28,13 +28,17 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libgit2_1_5
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
];
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "Minimalist set of hooks to aid pairing and link commits to issues";
homepage = "https://github.com/PurpleBooth/git-mit";

6
pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
View File

@ -2,13 +2,13 @@
buildLua rec {
pname = "mpv-playlistmanager";
version = "unstable-2023-11-28";
version = "unstable-2024-02-26";
src = fetchFromGitHub {
owner = "jonniek";
repo = "mpv-playlistmanager";
rev = "579490c7ae1becc129736b7632deec4f3fb90b99";
hash = "sha256-swOtoB8UV/HPTpQRGXswAfUYsyC2Nj/QRIkGP8X1jk0=";
rev = "1911dc053951169c98cfcfd9f44ef87d9122ca80";
hash = "sha256-pcdOMhkivLF5B86aNuHrqj77DuYLAFGlwFwY7jxkDkE=";
};
passthru.updateScript = unstableGitUpdater {};

2
pkgs/build-support/docker/default.nix
View File

@ -64,6 +64,8 @@ let
# https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478
export USER=nobody
${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration
# Reset registration times to make the image reproducible
${buildPackages.sqlite}/bin/sqlite3 nix/var/nix/db/db.sqlite "UPDATE ValidPaths SET registrationTime = ''${SOURCE_DATE_EPOCH}"
mkdir -p nix/var/nix/gcroots/docker/
for i in ${lib.concatStringsSep " " contentsList}; do

4
pkgs/by-name/be/bemoji/package.nix
View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bemoji";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "marty-oehme";
repo = "bemoji";
rev = "refs/tags/v${version}";
hash = "sha256-DhsJX5HlyTh0QLlHy1OwyaYg4vxWpBSsF71D9fxqPWE=";
hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww=";
};
strictDeps = true;

8
pkgs/applications/misc/chrysalis/default.nix → pkgs/by-name/ch/chrysalis/package.nix
View File

@ -2,13 +2,13 @@
let
pname = "chrysalis";
version = "0.13.2";
version = "0.13.3";
name = "${pname}-${version}-binary";
src = fetchurl {
url =
"https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage";
hash =
"sha512-WuItdQ/hDxbZZ3zulHI74NUkuYfesV/31rA1gPakCFgX2hpPrmKzwUez2vqt4N5qrGyphrR0bcelUatGZhOn5A==";
"sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw==";
};
appimageContents = appimageTools.extract { inherit name src; };
in appimageTools.wrapType2 rec {
@ -38,11 +38,13 @@ in appimageTools.wrapType2 rec {
install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "A graphical configurator for Kaleidoscope-powered keyboards";
homepage = "https://github.com/keyboardio/Chrysalis";
license = licenses.gpl3Only;
maintainers = with maintainers; [ aw ];
maintainers = with maintainers; [ aw eclairevoyant nshalman ];
platforms = [ "x86_64-linux" ];
mainProgram = "chrysalis";
};

16
pkgs/by-name/ch/chrysalis/update.sh Normal file
View File

@ -0,0 +1,16 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash --pure -p curl cacert jq
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
DRV_DIR="$PWD"
relinfo=$(curl -sL 'https://api.github.com/repos/keyboardio/chrysalis/releases' | jq 'map(select(.prerelease == false)) | max_by(.tag_name)')
newver=$(echo "$relinfo" | jq --raw-output '.tag_name' | sed 's|^v||')
hashurl=$(echo "$relinfo" | jq --raw-output '.assets[] | select(.name == "latest-linux.yml").browser_download_url')
newhash=$(curl -sL "$hashurl" | grep -Po '^sha512: \K.*')
sed -i package.nix \
-e "/^ version =/ s|\".*\"|\"$newver\"|" \
-e "/sha512-/ s|\".*\"|\"sha512-$newhash\"|" \

0
pkgs/applications/editors/edbrowse/0001-small-fixes.patch → pkgs/by-name/ed/edbrowse/0001-small-fixes.patch
View File

68
pkgs/applications/editors/edbrowse/default.nix → pkgs/by-name/ed/edbrowse/package.nix
View File

@ -1,8 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, curl
, duktape
, fetchFromGitHub
, html-tidy
, openssl
, pcre
@ -10,24 +9,45 @@
, pkg-config
, quickjs
, readline
, stdenv
, unixODBC
, which
, withODBC ? true
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "edbrowse";
version = "3.8.0";
src = fetchFromGitHub {
owner = "CMB";
repo = pname;
rev = "v${version}";
repo = "edbrowse";
rev = "v${finalAttrs.version}";
hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU=";
};
sourceRoot = "${finalAttrs.src.name}/src";
patches = [
# Fixes some small annoyances on src/makefile
./0001-small-fixes.patch
];
patchFlags = [
"-p2"
];
postPatch = ''
for file in $(find ./tools/ -type f ! -name '*.c'); do
patchShebangs $file
done
'';
nativeBuildInputs = [
pkg-config
which
];
buildInputs = [
curl
duktape
@ -37,27 +57,23 @@ stdenv.mkDerivation rec {
perl
quickjs
readline
] ++ lib.optionals withODBC [
unixODBC
];
patches = [
# Fixes some small annoyances on src/makefile
./0001-small-fixes.patch
];
postPatch = ''
substituteInPlace src/makefile --replace\
'-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs'
for i in $(find ./tools/ -type f ! -name '*.c'); do
patchShebangs $i
done
'';
makeFlags = [
"-C" "src"
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
preBuild = ''
buildFlagsArray+=(
BUILD_EDBR_ODBC=${if withODBC then "on" else "off"}
EBDEMIN=on
QUICKJS_LDFLAGS="-L${quickjs}/lib/quickjs -lquickjs -ldl -latomic"
)
'';
meta = {
homepage = "https://edbrowse.org/";
description = "Command Line Editor Browser";
longDescription = ''
@ -71,10 +87,14 @@ stdenv.mkDerivation rec {
send email, with no human intervention whatsoever. edbrowse can also tap
into databases through odbc. It was primarily written by Karl Dahlke.
'';
license = licenses.gpl1Plus;
maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
platforms = platforms.linux;
license = with lib.licenses; [ gpl1Plus ];
mainProgram = "edbrowse";
maintainers = with lib.maintainers; [
schmitthenner
equirosa
AndersonTorres
];
platforms = lib.platforms.linux;
};
}
})
# TODO: send the patch to upstream developers

22
pkgs/by-name/ff/ffsubsync/package.nix
View File

@ -1,21 +1,25 @@
{ lib
, python3Packages
, fetchFromGitHub
, python3
}:
python3Packages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "ffsubsync";
version = "0.4.25";
format = "pyproject";
pyproject = true;
src = fetchFromGitHub {
owner = "smacke";
repo = "ffsubsync";
rev = version;
rev = "refs/tags/${version}";
hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc=";
};
propagatedBuildInputs = with python3Packages; [
nativeBuildInputs = with python3.pkgs; [
setuptools
];
propagatedBuildInputs = with python3.pkgs; [
auditok
charset-normalizer
faust-cchardet
@ -32,9 +36,13 @@ python3Packages.buildPythonApplication rec {
webrtcvad
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
];
pythonImportsCheck = [ "ffsubsync" ];
pythonImportsCheck = [
"ffsubsync"
];
meta = with lib; {
homepage = "https://github.com/smacke/ffsubsync";

6
pkgs/by-name/fl/flottbot/package.nix
View File

@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "flottbot";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "target";
repo = "flottbot";
rev = version;
hash = "sha256-ldWE5QcLHyIqap5Qe6OTTIJZ1sshI+CVoJoRUxWHfxM=";
hash = "sha256-Fv4ZBCQA7gwt11ULIiyFwn+QgoMNgu+1TM9yy2Jz7og=";
};
patches = [
@ -24,7 +24,7 @@ buildGoModule rec {
})
];
vendorHash = "sha256-XRcTp3ZnoPupzI1kjoM4oF5+VlNJFV0Bu+WAwfRWl7g=";
vendorHash = "sha256-wOUQKFd2Xm/2rvLw8kw8Ejbcq/JUvup/BzZs0fllBYY=";
subPackages = [ "cmd/flottbot" ];

31
pkgs/by-name/fm/fm-go/package.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
, stdenv
}:
let
finalAttrs = {
pname = "fm";
version = "0.16.0";
src = fetchFromGitHub {
owner = "mistakenelf";
repo = "fm";
rev = "v${finalAttrs.version}";
hash = "sha256-wiACaszbkO9jBYmIfeQpcx984RY41Emyu911nkJxUFY=";
};
vendorHash = "sha256-AfRGoKiVZGVIbsDj5pV1zCkp2FpcfWKS0t+cTU51RRc=";
meta = {
homepage = "https://github.com/mistakenelf/fm";
description = "A terminal based file manager";
changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}";
license = with lib.licenses; [ mit ];
mainProgram = "fm";
maintainers = with lib.maintainers; [ AndersonTorres ];
};
};
in
buildGoModule finalAttrs

29
pkgs/by-name/go/go-errorlint/package.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "go-errorlint";
version = "1.4.5";
src = fetchFromGitHub {
owner = "polyfloyd";
repo = "go-errorlint";
rev = "v${version}";
hash = "sha256-BU+3sLUGBCFA1JYFxTEyIan+iWB7Y7SaMFVomfNObMg=";
};
vendorHash = "sha256-xn7Ou4l8vbPD44rsN0mdFjTzOvkfv6QN6i5XR1XPxTE=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A source code linter that can be used to find code that will cause problems with Go's error wrapping scheme";
homepage = "https://github.com/polyfloyd/go-errorlint";
changelog = "https://github.com/polyfloyd/go-errorlint/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ meain ];
mainProgram = "go-errorlint";
};
}

42
pkgs/tools/package-management/home-manager/default.nix → pkgs/by-name/ho/home-manager/package.nix
View File

@ -1,29 +1,29 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, bash
, coreutils
, fetchFromGitHub
, findutils
, gettext
, gnused
, installShellFiles
, less
, ncurses
, nixos-option
, stdenvNoCC
, unixtools
, installShellFiles
, unstableGitUpdater
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "unstable-2024-02-20";
version = "0-unstable-2024-02-24";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "517601b37c6d495274454f63c5a483c8e3ca6be1";
hash = "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=";
rev = "4ee704cb13a5a7645436f400b9acc89a67b9c08a";
hash = "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=";
};
nativeBuildInputs = [
@ -40,6 +40,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
install -D -m755 home-manager/home-manager $out/bin/home-manager
install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh
installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
installShellCompletion --fish --name home-manager.fish home-manager/completion.fish
installShellCompletion --zsh --name _home-manager home-manager/completion.zsh
for pofile in home-manager/po/*.po; do
lang="''${pofile##*/}"
lang="''${lang%%.*}"
mkdir -p "$out/share/locale/$lang/LC_MESSAGES"
msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile"
done
runHook postInstall
'';
postFixup = ''
substituteInPlace $out/bin/home-manager \
--subst-var-by bash "${bash}" \
--subst-var-by DEP_PATH "${
@ -57,19 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \
--subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \
--subst-var-by OUT '${placeholder "out"}'
installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
installShellCompletion --fish --name home-manager.fish home-manager/completion.fish
installShellCompletion --zsh --name _home-manager home-manager/completion.zsh
for pofile in home-manager/po/*.po; do
lang="''${pofile##*/}"
lang="''${lang%%.*}"
mkdir -p "$out/share/locale/$lang/LC_MESSAGES"
msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile"
done
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater {
@ -86,8 +88,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
(non global) packages and dotfiles.
'';
license = lib.licenses.mit;
mainProgram = "home-manager";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
mainProgram = "home-manager";
};
})

25
pkgs/by-name/no/nosql-workbench/package.nix
View File

@ -4,7 +4,7 @@
fetchurl,
jdk21,
stdenv,
undmg
_7zz
}:
let
pname = "nosql-workbench";
@ -39,30 +39,19 @@ if stdenv.isDarwin then stdenv.mkDerivation {
sourceRoot = ".";
nativeBuildInputs = [ _7zz ];
buildInputs = [ jdk21 ];
# DMG file is using APFS which is unsupported by "undmg".
# Fix found: https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura/25873/8
# Instead, use "7zz" to extract the contents.
# "undmg" issue: https://github.com/matthewbauer/undmg/issues/4
unpackCmd = ''
echo "Creating temp directory"
mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX)
runHook preUnpack
function finish {
echo "Ejecting temp directory"
/usr/bin/hdiutil detach $mnt -force
rm -rf $mnt
}
# Detach volume when receiving SIG "0"
trap finish EXIT
7zz x $curSrc
# Mount DMG file
echo "Mounting DMG file into \"$mnt\""
/usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc
# Copy content to local dir for later use
echo 'Copying extracted content into "sourceRoot"'
cp -a $mnt/NoSQL\ Workbench.app $PWD/
runHook postUnpack
'';
installPhase = ''

6
pkgs/tools/misc/outils/default.nix → pkgs/by-name/ou/outils/package.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "outils";
version = "0.10";
version = "0.13";
src = fetchFromGitHub {
owner = "leahneukirchen";
repo = pname;
repo = "outils";
rev = "v${version}";
sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs=";
hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA=";
};
makeFlags = [ "PREFIX=$(out)" ];

6
pkgs/by-name/sc/scitokens-cpp/package.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "scitokens-cpp";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "scitokens";
repo = "scitokens-cpp";
rev = "v1.1.0";
hash = "sha256-g97Ah5Oob0iOvMQegpG/AACLZCW37kA0RpSIcKOyQnE=";
rev = "v1.1.1";
hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA=";
};
nativeBuildInputs = [ cmake pkg-config ];

1
pkgs/by-name/se/searxng/package.nix
View File

@ -73,6 +73,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/searxng/searxng";
description = "A fork of Searx, a privacy-respecting, hackable metasearch engine";
license = licenses.agpl3Plus;
mainProgram = "searxng-run";
maintainers = with maintainers; [ SuperSandro2000 _999eagle ];
};
})

44
pkgs/by-name/uv/uv/Cargo.lock generated
View File

@ -75,9 +75,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
version = "0.6.11"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
dependencies = [
"anstyle",
"anstyle-parse",
@ -147,9 +147,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "assert_cmd"
version = "2.0.13"
version = "2.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467"
checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
dependencies = [
"anstyle",
"bstr",
@ -1587,25 +1587,21 @@ dependencies = [
"data-encoding",
"distribution-filename",
"fs-err",
"fs2",
"goblin",
"indoc",
"mailparse",
"once_cell",
"pathdiff",
"pep440_rs",
"platform-host",
"platform-info",
"plist",
"pyo3",
"pypi-types",
"rayon",
"reflink-copy",
"regex",
"rustc-hash",
"serde",
"serde_json",
"sha2",
"target-lexicon",
"tempfile",
"thiserror",
"tracing",
@ -2193,6 +2189,12 @@ version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "pathdiff"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
[[package]]
name = "pep440_rs"
version = "0.5.0"
@ -3189,18 +3191,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.196"
version = "1.0.197"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.196"
version = "1.0.197"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
dependencies = [
"proc-macro2",
"quote",
@ -3209,9 +3211,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.113"
version = "1.0.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
dependencies = [
"itoa",
"ryu",
@ -3496,9 +3498,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
version = "0.12.13"
version = "0.12.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
[[package]]
name = "task-local-extensions"
@ -4131,7 +4133,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
[[package]]
name = "uv"
version = "0.1.11"
version = "0.1.12"
dependencies = [
"anstream",
"anyhow",
@ -4151,6 +4153,7 @@ dependencies = [
"fs-err",
"futures",
"gourgeist",
"indexmap 2.2.3",
"indicatif",
"indoc",
"insta",
@ -4493,12 +4496,15 @@ dependencies = [
"pep508_rs",
"platform-tags",
"pypi-types",
"pyproject-toml",
"rayon",
"requirements-txt",
"rustc-hash",
"serde",
"tempfile",
"thiserror",
"tokio",
"toml",
"tracing",
"url",
"uv-cache",
@ -4518,9 +4524,11 @@ version = "0.0.1"
dependencies = [
"anyhow",
"cache-key",
"configparser",
"fs-err",
"indoc",
"insta",
"install-wheel-rs",
"itertools 0.12.1",
"once_cell",
"pep440_rs",

27
pkgs/by-name/uv/uv/package.nix
View File

@ -1,31 +1,25 @@
{ lib
, cargo
, cmake
, darwin
, fetchFromGitHub
, libgit2
, openssl
, pkg-config
, python3
, rustPlatform
, rustc
, stdenv
, zlib
}:
python3.pkgs.buildPythonApplication rec {
rustPlatform.buildRustPackage rec {
pname = "uv";
version = "0.1.11";
pyproject = true;
version = "0.1.12";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = version;
hash = "sha256-0J6m/DgalYA+GGmgjFrNoo9KAv6WgMcx+gasgqG5v1Q=";
hash = "sha256-tM8NX4BPGm8Xxlau+qpKSljTdSJutipsYFsZAdtmZuo=";
};
cargoDeps = rustPlatform.importCargoLock {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0=";
@ -34,25 +28,20 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [
cargo
cmake
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
rustc
];
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
];
dontUseCmakeConfigure = true;
cargoBuildFlags = [ "--package" "uv" ];
pythonImportsCheck = [ "uv" ];
# Tests require network access
doCheck = false;
env = {
OPENSSL_NO_VENDOR = true;
@ -61,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "An extremely fast Python package installer and resolver, written in Rust";
homepage = "https://github.com/astral-sh/uv";
changelog = "https://github.com/astral-sh/uv/releases/tag/${version}";
changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ marsam ];
mainProgram = "uv";

4
pkgs/by-name/zc/zcfan/package.nix
View File

@ -6,13 +6,13 @@
# Testing this requires a Thinkpad or the presence of /proc/acpi/ibm/fan
stdenv.mkDerivation (finalAttrs: {
pname = "zcfan";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "cdown";
repo = "zcfan";
rev = finalAttrs.version;
hash = "sha256-XngchR06HP2iExKJVe+XKBDgsv98AEYWOkl1a/Hktgs=";
hash = "sha256-zpYQEHXt8LBNX+luM4YxP0dKH+hb2c8Z0BEeGP09oZo=";
};
postPatch = ''

4
pkgs/data/fonts/lxgw-neoxihei/default.nix
View File

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.110";
version = "1.120";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-6KeKz8lJBCc/sc5pCkS2mSwMAQ8XpwDIMCjSbVXuyH4=";
hash = "sha256-rQ+gbmUYr+iWm5WCUSqb+8+aMD5JZUsbPXZ0Nio2cl8=";
};
dontUnpack = true;

6
pkgs/data/themes/alacritty-theme/default.nix
View File

@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation (self: {
name = "alacritty-theme";
version = "unstable-2024-02-25";
version = "unstable-2024-02-28";
src = fetchFromGitHub {
owner = "alacritty";
repo = "alacritty-theme";
rev = "07c10441dae4d0490145a0f40178f8846b24e800";
hash = "sha256-aZlsKbFcm1bswx7k0cjwhj1MudR0Q0rD8sdHa7kQ0rY=";
rev = "4aefb7c079721474078b28bbf9f582b592749ca6";
hash = "sha256-+35S6eQkxLBuS/fDKD5bglQDIuz2xeEc5KSaK6k7IjI=";
};
dontConfigure = true;

5
pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
View File

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "suru-icon-theme";
version = "20.05.1";
version = "2024.02.1";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/suru-icon-theme";
rev = finalAttrs.version;
hash = "sha256-jJ6J+SjSABZCgnCF9cIFBpeSXX2LMnV+nPLPpoXQv30=";
hash = "sha256-7T9FILhZrs5bbdBEV/FszCOwUd/C1Rl9tbDt77SIzRk=";
};
strictDeps = true;
@ -50,6 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Suru Icon Theme for Lomiri Operating Environment";
homepage = "https://gitlab.com/ubports/development/core/suru-icon-theme";
changelog = "https://gitlab.com/ubports/development/core/suru-icon-theme/-/blob/${finalAttrs.version}/ChangeLog";
license = licenses.cc-by-sa-30;
maintainers = teams.lomiri.members;
platforms = platforms.all;

62
pkgs/development/compilers/tinycc/default.nix
View File

@ -1,20 +1,16 @@
{ lib
, stdenv
, fetchFromRepoOrCz
, copyPkgconfigItems
, fetchFromRepoOrCz
, makePkgconfigItem
, perl
, stdenv
, texinfo
, which
}:
let
# avoid "malformed 32-bit x.y.z" error on mac when using clang
isCleanVer = version: builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "tcc";
version = "unstable-2022-07-15";
version = "0.9.27-unstable-2022-07-15";
src = fetchFromRepoOrCz {
repo = "tinycc";
@ -22,6 +18,8 @@ stdenv.mkDerivation rec {
hash = "sha256-jY0P2GErmo//YBaz6u4/jj/voOE3C2JaIDRmo0orXN8=";
};
outputs = [ "out" "info" "man" ];
nativeBuildInputs = [
copyPkgconfigItems
perl
@ -29,23 +27,27 @@ stdenv.mkDerivation rec {
which
];
pkgconfigItems = [
(makePkgconfigItem rec {
strictDeps = true;
pkgconfigItems = let
libtcc-pcitem = {
name = "libtcc";
inherit version;
cflags = [ "-I${variables.includedir}" ];
inherit (finalAttrs) version;
cflags = [ "-I${libtcc-pcitem.variables.includedir}" ];
libs = [
"-L${variables.libdir}"
"-Wl,--rpath ${variables.libdir}"
"-L${libtcc-pcitem.variables.libdir}"
"-Wl,--rpath ${libtcc-pcitem.variables.libdir}"
"-ltcc"
];
variables = rec {
variables = {
prefix = "${placeholder "out"}";
includedir = "${prefix}/include";
libdir = "${prefix}/lib";
includedir = "${placeholder "dev"}/include";
libdir = "${placeholder "lib"}/lib";
};
description = "Tiny C compiler backend";
})
};
in [
(makePkgconfigItem libtcc-pcitem)
];
postPatch = ''
@ -64,17 +66,19 @@ stdenv.mkDerivation rec {
"--config-musl"
];
preConfigure = ''
preConfigure = let
# To avoid "malformed 32-bit x.y.z" error on mac when using clang
versionIsClean = version:
builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null;
in ''
${
if stdenv.isDarwin && ! isCleanVer version
if stdenv.isDarwin && ! versionIsClean finalAttrs.version
then "echo 'not overwriting VERSION since it would upset ld'"
else "echo ${version} > VERSION"
else "echo ${finalAttrs.version} > VERSION"
}
configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")
'';
outputs = [ "out" "info" "man" ];
# Test segfault for static build
doCheck = !stdenv.hostPlatform.isStatic;
@ -84,7 +88,7 @@ stdenv.mkDerivation rec {
rm tests/tests2/{108,114}*
'';
meta = with lib; {
meta = {
homepage = "https://repo.or.cz/tinycc.git";
description = "Small, fast, and embeddable C compiler and interpreter";
longDescription = ''
@ -108,13 +112,13 @@ stdenv.mkDerivation rec {
With libtcc, you can use TCC as a backend for dynamic code generation.
'';
license = licenses.lgpl21Only;
maintainers = with maintainers; [ joachifm AndersonTorres ];
platforms = platforms.unix;
license = with lib.licenses; [ lgpl21Only ];
mainProgram = "tcc";
maintainers = with lib.maintainers; [ joachifm AndersonTorres ];
platforms = lib.platforms.unix;
# https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
})
# TODO: more multiple outputs
# TODO: self-compilation
# TODO: provide expression for stable release

4
pkgs/development/libraries/libgbinder/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libgbinder";
version = "1.1.36";
version = "1.1.37";
src = fetchFromGitHub {
owner = "mer-hybris";
repo = pname;
rev = version;
sha256 = "sha256-QTlOiZG6qpNeicMJpOTMSTk2WwKbOzkaLulgmsxYaVI=";
sha256 = "sha256-/XxWOaT2f6+0apv0NzMsPoYBf3GLuaXyPkmTMTDtOes=";
};
outputs = [ "out" "dev" ];

5
pkgs/development/libraries/libshumate/default.nix
View File

@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
sha256 = "+h0dKLECtvfsxwD5aRTIgiNI9jG/tortUJYFiYMe60g=";
};
depsBuildBuild = [
# required to find native gi-docgen when cross compiling
pkg-config
];
nativeBuildInputs = [
gi-docgen
meson

138
pkgs/development/libraries/qt-6/default.nix
View File

@ -42,7 +42,7 @@ let
qtModule = callPackage ./qtModule.nix { };
qtbase = callPackage ./modules/qtbase.nix {
withGtk3 = true;
withGtk3 = !stdenv.hostPlatform.isMinGW;
inherit (srcs.qtbase) src version;
inherit developerBuild;
inherit (darwin.apple_sdk_11_0.frameworks)
@ -69,47 +69,49 @@ let
];
};
env = callPackage ./qt-env.nix { };
full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}"
# `with self` is ok to use here because having these spliced is unnecessary
( with self;[
qt3d
qt5compat
qtcharts
qtconnectivity
qtdatavis3d
qtdeclarative
qtdoc
qtgraphs
qtgrpc
qthttpserver
qtimageformats
qtlanguageserver
qtlocation
qtlottie
qtmultimedia
qtmqtt
qtnetworkauth
qtpositioning
qtsensors
qtserialbus
qtserialport
qtshadertools
qtspeech
qtquick3d
qtquick3dphysics
qtquickeffectmaker
qtquicktimeline
qtremoteobjects
qtsvg
qtscxml
qttools
qttranslations
qtvirtualkeyboard
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwayland libglvnd ])) { };
full = callPackage
({ env, qtbase }: env "qt-full-${qtbase.version}"
# `with self` is ok to use here because having these spliced is unnecessary
(with self;[
qt3d
qt5compat
qtcharts
qtconnectivity
qtdatavis3d
qtdeclarative
qtdoc
qtgraphs
qtgrpc
qthttpserver
qtimageformats
qtlanguageserver
qtlocation
qtlottie
qtmultimedia
qtmqtt
qtnetworkauth
qtpositioning
qtsensors
qtserialbus
qtserialport
qtshadertools
qtspeech
qtquick3d
qtquick3dphysics
qtquickeffectmaker
qtquicktimeline
qtremoteobjects
qtsvg
qtscxml
qttools
qttranslations
qtvirtualkeyboard
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ]))
{ };
qt3d = callPackage ./modules/qt3d.nix { };
qt5compat = callPackage ./modules/qt5compat.nix { };
@ -162,11 +164,14 @@ let
GameController ImageCaptureCore LocalAuthentication
MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz
ReplayKit SecurityInterface Vision;
qtModule = callPackage ({ qtModule }: qtModule.override {
stdenv = if stdenv.hostPlatform.isDarwin
then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; }
else stdenv;
}) { };
qtModule = callPackage
({ qtModule }: qtModule.override {
stdenv =
if stdenv.isDarwin
then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; }
else stdenv;
})
{ };
xcbuild = buildPackages.xcbuild.override {
productBuildVer = "20A2408";
};
@ -176,21 +181,25 @@ let
inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
};
wrapQtAppsHook = callPackage ({ makeBinaryWrapper }: makeSetupHook
{
name = "wrap-qt6-apps-hook";
propagatedBuildInputs = [ makeBinaryWrapper ];
} ./hooks/wrap-qt-apps-hook.sh) { };
wrapQtAppsHook = callPackage
({ makeBinaryWrapper }: makeSetupHook
{
name = "wrap-qt6-apps-hook";
propagatedBuildInputs = [ makeBinaryWrapper ];
} ./hooks/wrap-qt-apps-hook.sh)
{ };
qmake = callPackage ({ qtbase }: makeSetupHook
{
name = "qmake6-hook";
propagatedBuildInputs = [ qtbase.dev ];
substitutions = {
inherit debug;
fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
};
} ./hooks/qmake-hook.sh) { };
qmake = callPackage
({ qtbase }: makeSetupHook
{
name = "qmake6-hook";
propagatedBuildInputs = [ qtbase.dev ];
substitutions = {
inherit debug;
fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh;
};
} ./hooks/qmake-hook.sh)
{ };
} // lib.optionalAttrs config.allowAliases {
# Convert to a throw on 03-01-2023 and backport the change.
# Warnings show up in various cli tool outputs, throws do not.
@ -203,12 +212,13 @@ let
f = addPackages;
};
bootstrapScope = baseScope.overrideScope(final: prev: {
bootstrapScope = baseScope.overrideScope (final: prev: {
qtbase = prev.qtbase.override { qttranslations = null; };
qtdeclarative = null;
});
finalScope = baseScope.overrideScope(final: prev: {
finalScope = baseScope.overrideScope (final: prev: {
qttranslations = bootstrapScope.qttranslations;
});
in finalScope
in
finalScope

40
pkgs/development/libraries/qt-6/modules/qtbase.nix
View File

@ -4,6 +4,7 @@
, patches ? [ ]
, version
, coreutils
, buildPackages
, bison
, flex
, gdb
@ -79,6 +80,8 @@
, EventKit
, GSS
, MetalKit
# mingw
, pkgsBuildBuild
# optional dependencies
, cups
, libmysqlclient
@ -96,6 +99,7 @@
let
debugSymbols = debug || developerBuild;
isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
in
stdenv.mkDerivation rec {
pname = "qtbase";
@ -110,7 +114,6 @@ stdenv.mkDerivation rec {
openssl
sqlite
zlib
unixODBC
# Text rendering
harfbuzz
icu
@ -119,14 +122,16 @@ stdenv.mkDerivation rec {
libpng
pcre2
pcre
libproxy
zstd
double-conversion
libb2
md4c
double-conversion
] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
libproxy
dbus
glib
# unixODBC drivers
unixODBC
unixODBCDrivers.psql
unixODBCDrivers.sqlite
unixODBCDrivers.mariadb
@ -174,11 +179,16 @@ stdenv.mkDerivation rec {
EventKit
GSS
MetalKit
] ++ lib.optional libGLSupported libGL;
] ++ lib.optionals libGLSupported [
libGL
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
vulkan-headers
vulkan-loader
];
buildInputs = [
buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [
at-spi2-core
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [
libinput
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
AppKit
@ -186,9 +196,9 @@ stdenv.mkDerivation rec {
]
++ lib.optional withGtk3 gtk3
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (libmysqlclient != null) libmysqlclient
++ lib.optional (postgresql != null) postgresql;
++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups
++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql;
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
@ -203,7 +213,7 @@ stdenv.mkDerivation rec {
# https://bugreports.qt.io/browse/QTBUG-97568
postPatch = ''
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls"
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls"
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
'';
@ -232,7 +242,11 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
# error: 'path' is unavailable: introduced in macOS 10.15
"-DQT_FEATURE_cxx17_filesystem=OFF"
] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
] ++ lib.optionals isCrossBuild [
"-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
"-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo"
]
++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [
# Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc"
@ -253,6 +267,8 @@ stdenv.mkDerivation rec {
dontStrip = debugSymbols;
dontWrapQtApps = true;
setupHook = ../hooks/qtbase-setup-hook.sh;
meta = with lib; {
@ -260,6 +276,6 @@ stdenv.mkDerivation rec {
description = "A cross-platform application framework for C++";
license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ];
maintainers = with maintainers; [ milahu nickcao LunNova ];
platforms = platforms.unix;
platforms = platforms.unix ++ platforms.windows;
};
}

23
pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch
View File

@ -1,19 +1,19 @@
From f0c4d3860b75cb064d066045907622d536044096 Mon Sep 17 00:00:00 2001
From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Sun, 10 May 2020 12:47:28 +0200
Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH
---
src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index a80efbb5622..8cf9e85da43 100644
index a80efbb5622..0d41dabeed3 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2991,6 +2991,16 @@ QStringList QCoreApplication::libraryPathsLocked()
QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths);
@@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked()
app_libpaths->append(installPathPlugins);
}
+ // Add library paths derived from PATH
+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":"));
@ -24,10 +24,9 @@ index a80efbb5622..8cf9e85da43 100644
+ }
+ }
+
+
auto setPathsFromEnv = [&](QString libPathEnv) {
if (!libPathEnv.isEmpty()) {
QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts);
// If QCoreApplication is not yet instantiated,
// make sure we add the application path when we construct the QCoreApplication
if (self) self->d_func()->appendApplicationPathToLibraryPaths();
--
2.42.0
2.43.1

4
pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "suitesparse-graphblas";
version = "9.0.1";
version = "9.0.2";
outputs = [ "out" "dev" ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis";
repo = "GraphBLAS";
rev = "v${version}";
hash = "sha256-eNd6jlpW3KiRvOCKvNP5ttpgjPPXt2M2vLhk1Zn4gTE=";
hash = "sha256-wPg5A1lwtRPDO5gPbllEFkRJFRIhkqqaVd4CBdPavKE=";
};
nativeBuildInputs = [

4
pkgs/development/misc/brev-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.276";
version = "0.6.277";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IAzsoKPFmhyBgd3jD6qEBav5ynQYrn8/cl6epsjrVKg=";
sha256 = "sha256-s80veDxN0GfHKOwDhxx1ArZXqk8OPSl+d/Ruxj0oLJA=";
};
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";

1
pkgs/development/python-modules/arviz/default.nix
View File

@ -100,6 +100,7 @@ buildPythonPackage rec {
"test_plot_ppc_discrete_save_animation"
# Assertion error
"test_data_zarr"
"test_plot_forest"
];
pythonImportsCheck = [

10
pkgs/development/python-modules/cbor2/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "cbor2";
version = "5.5.1";
version = "5.6.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-+eGS9GGp+PYILfKMA1sAbRU5BCE9yGQL7Ypy1yu8lHU=";
hash = "sha256-t1E8LeqIaJkfrX74iZiQ68+LGZubRGHDwR160670gg0=";
};
postPatch = ''
@ -44,12 +44,6 @@ buildPythonPackage rec {
pytestCheckHook
];
# https://github.com/agronholm/cbor2/issues/99
disabledTests = lib.optionals stdenv.is32bit [
"test_huge_truncated_bytes"
"test_huge_truncated_string"
];
meta = with lib; {
changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
description = "Python CBOR (de)serializer with extensive tag support";

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

@ -23,7 +23,7 @@
}:
buildPythonPackage rec {
pname = "clickhouse-connect";
version = "0.7.0";
version = "0.7.1";
format = "setuptools";
@ -33,7 +33,7 @@ buildPythonPackage rec {
repo = "clickhouse-connect";
owner = "ClickHouse";
rev = "refs/tags/v${version}";
hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY=";
hash = "sha256-Qdv0DcdIjqz8NtyMsVNQxGTxsB3TpXUGDA3oL8QbBDc=";
};
nativeBuildInputs = [ cython_3 ];

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "cloudpathlib";
version = "0.18.0";
version = "0.18.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "drivendataorg";
repo = "cloudpathlib";
rev = "refs/tags/v${version}";
hash = "sha256-4CwwCdGUKUmie9PmAmrVxpAhk3b2WG+Cmx3QAADkyYQ=";
hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0=";
};
nativeBuildInputs = [

28
pkgs/development/python-modules/cssbeautifier/default.nix
View File

@ -1,34 +1,46 @@
{ lib
, buildPythonPackage
, editorconfig
, fetchPypi
, setuptools
, jsbeautifier
, pythonOlder
, setuptools
, six
}:
buildPythonPackage rec {
pname = "cssbeautifier";
version = "1.14.11";
format = "pyproject";
version = "1.15.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-QFRMK2K7y2TKpefzegLflWVOXOG8rK2sTKHz3InDFRM=";
hash = "sha256-n3BkNirt1VnFXu7Pa2vtZeBfM0iNy+OQRPBAPCbhwAY=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ jsbeautifier ];
propagatedBuildInputs = [
editorconfig
jsbeautifier
six
];
# has no tests
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "cssbeautifier" ];
pythonImportsCheck = [
"cssbeautifier"
];
meta = with lib; {
description = "CSS unobfuscator and beautifier";
homepage = "https://pypi.org/project/cssbeautifier/";
homepage = "https://github.com/beautifier/js-beautify";
changelog = "https://github.com/beautifier/js-beautify/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ traxys ];
};

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "dbt-redshift";
version = "1.7.3";
version = "1.7.4";
pyproject = true;
src = fetchFromGitHub {
owner = "dbt-labs";
repo = "dbt-redshift";
rev = "refs/tags/v${version}";
hash = "sha256-3zj3wA1wxUjKSm1n7QE2g/VUuH3UuWlXCC68mOb2eso=";
hash = "sha256-Ny6Nnb5OhtqSQZ0BMOQrb0ic6i29GVywy3hn3UuVtxE=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/django-crispy-bootstrap4/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "django-crispy-bootstrap4";
version = "2023.1";
version = "2024.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "django-crispy-forms";
repo = "crispy-bootstrap4";
rev = "refs/tags/${version}";
hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk=";
hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4=";
};
propagatedBuildInputs = [

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

@ -8,7 +8,7 @@
, pytest-mock
}:
let
version = "2.3.0";
version = "2.3.1";
in
buildPythonPackage {
pname = "docstr-coverage";
@ -17,8 +17,8 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "HunterMcGushion";
repo = "docstr_coverage";
rev = "v${version}";
hash = "sha256-eYHhE5zs3hYzK3aAimF0Gx/Kyk1Ot1F/lKf1poR2er0=";
rev = "refs/tags/v${version}";
hash = "sha256-QmQE6KZ2NdXKQun+uletxYPktWvfkrj6NPAVl/mmpAY=";
};
propagatedBuildInputs = [ click pyyaml tqdm ];

45
pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch
View File

@ -1,17 +1,17 @@
From 001549503eed364d4baaa5804242f67c6236f6c2 Mon Sep 17 00:00:00 2001
From d3aed2c18cc3a1c88a8052af1f34d7f81f1be11a Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sat, 2 Dec 2023 16:55:05 +0100
Date: Wed, 28 Feb 2024 23:24:14 +0100
Subject: [PATCH] Fix with new dependency versions
- cookie_jar is private in werkzeug 2.3, so recreate the client instead
- set_cookie does not take a hostname argument anymore, use domain instead
- Headers need to specify a content type
---
test_seasurf.py | 63 ++++++++++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 32 deletions(-)
test_seasurf.py | 71 ++++++++++++++++++++++++-------------------------
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/test_seasurf.py b/test_seasurf.py
index 517b2d7..501f82d 100644
index 517b2d7..f940b91 100644
--- a/test_seasurf.py
+++ b/test_seasurf.py
@@ -71,18 +71,18 @@ class SeaSurfTestCase(BaseTestCase):
@ -37,6 +37,15 @@ index 517b2d7..501f82d 100644
self.assertIn(b('403 Forbidden'), rv.data)
def test_json_token_validation_bad(self):
@@ -93,7 +93,7 @@ class SeaSurfTestCase(BaseTestCase):
with self.app.test_client() as client:
with client.session_transaction() as sess:
sess[self.csrf._csrf_name] = tokenA
- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenB)
+ client.set_cookie(self.csrf._csrf_name, tokenB, domain='www.example.com')
rv = client.post('/bar', data=data)
self.assertEqual(rv.status_code, 403, rv)
@@ -107,7 +107,7 @@ class SeaSurfTestCase(BaseTestCase):
data = {'_csrf_token': token}
with self.app.test_client() as client:
@ -55,7 +64,7 @@ index 517b2d7..501f82d 100644
sess[self.csrf._csrf_name] = token
# once this is reached the session was stored
@@ -144,7 +144,7 @@ class SeaSurfTestCase(BaseTestCase):
@@ -144,18 +144,18 @@ class SeaSurfTestCase(BaseTestCase):
with client.session_transaction() as sess:
token = self.csrf._generate_token()
@ -64,6 +73,19 @@ index 517b2d7..501f82d 100644
sess[self.csrf._csrf_name] = token
# once this is reached the session was stored
- rv = client.post('/bar',
+ rv = client.post('/bar', content_type='application/json',
data={self.csrf._csrf_name: token},
base_url='https://www.example.com',
headers={'Referer': 'https://www.example.com/foobar'})
self.assertEqual(rv.status_code, 200)
- rv = client.post(u'/bar/\xf8',
+ rv = client.post(u'/bar/\xf8', content_type='application/json',
data={self.csrf._csrf_name: token},
base_url='https://www.example.com',
headers={'Referer': 'https://www.example.com/foobar\xf8'})
@@ -167,7 +167,7 @@ class SeaSurfTestCase(BaseTestCase):
with client.session_transaction() as sess:
token = self.csrf._generate_token()
@ -252,6 +274,15 @@ index 517b2d7..501f82d 100644
self.assertEqual(res2.status_code, 200)
def test_header_set_cookie_samesite(self):
@@ -789,7 +788,7 @@ class SeaSurfTestCaseGenerateNewToken(BaseTestCase):
client.get('/foo')
tokenA = self.csrf._get_token()
- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenA)
+ client.set_cookie(self.csrf._csrf_name, tokenA, domain='www.example.com')
with client.session_transaction() as sess:
sess[self.csrf._csrf_name] = tokenA
--
2.42.0
2.43.0

4
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "ibm-cloud-sdk-core";
version = "3.19.1";
version = "3.19.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-oPDcQSWNWG9wauSVW7srXN85+UeF6Q0CRlaSyqh2W/Q=";
hash = "sha256-qodN9ALyAfzsrCAiPT3t02JJRCBqFCNVWlsQP+4d3do=";
};
nativeBuildInputs = [

46
pkgs/development/python-modules/pydub/default.nix
View File

@ -1,43 +1,59 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
# tests
, fetchpatch
, ffmpeg-full
, python
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "pydub";
version = "0.25.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
# pypi version doesn't include required data files for tests
src = fetchFromGitHub {
owner = "jiaaro";
repo = pname;
rev = "v${version}";
sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m";
repo = "pydub";
rev = "refs/tags/v${version}";
hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c=";
};
patches = [
# Fix test assertions, https://github.com/jiaaro/pydub/pull/769
(fetchpatch {
name = "fix-assertions.patch";
url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch";
hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A=";
})
];
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
ffmpeg-full
pytestCheckHook
];
pythonImportsCheck = [
"pydub"
"pydub.audio_segment"
"pydub.playback"
];
nativeCheckInputs = [
ffmpeg-full
pytestFlagsArray = [
"test/test.py"
];
checkPhase = ''
${python.interpreter} test/test.py
'';
meta = with lib; {
description = "Manipulate audio with a simple and easy high level interface";
homepage = "http://pydub.com";
changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ];
};

12
pkgs/development/python-modules/pymc/default.nix
View File

@ -23,9 +23,14 @@ buildPythonPackage rec {
owner = "pymc-devs";
repo = "pymc";
rev = "refs/tags/v${version}";
hash = "sha256-bOrWgZaSOXXalw251cm5JUDkAARGaxmUk+z3SY6Git8=";
hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail ', "pytest-cov"' ""
'';
propagatedBuildInputs = [
arviz
cachetools
@ -37,11 +42,6 @@ buildPythonPackage rec {
typing-extensions
];
postPatch = ''
substituteInPlace setup.py \
--replace ', "pytest-cov"' ""
'';
# The test suite is computationally intensive and test failures are not
# indicative for package usability hence tests are disabled by default.
doCheck = false;

1
pkgs/development/python-modules/shazamio/default.nix
View File

@ -72,6 +72,7 @@ buildPythonPackage rec {
changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
# https://github.com/shazamio/ShazamIO/issues/80
broken = versionAtLeast pydantic.version "2";
};
}

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.27.0";
version = "3.27.1";
pyproject = true;
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI=";
hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0=";
};
postPatch = ''

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

@ -5,12 +5,13 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "snapcast";
version = "2.3.3";
format = "setuptools";
version = "2.3.4";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,9 +19,13 @@ buildPythonPackage rec {
owner = "happyleavesaoc";
repo = "python-snapcast";
rev = "refs/tags/${version}";
hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8=";
hash = "sha256-qADcLrE5QwoYBDEmh7hrDJZIND2k3F0OTCEHdHDu3Y0=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
construct
packaging

17
pkgs/development/python-modules/tensordict/default.nix
View File

@ -10,11 +10,12 @@
, numpy
, h5py
, pytestCheckHook
, stdenv
}:
buildPythonPackage rec {
pname = "tensordict";
version = "0.3.0";
version = "0.3.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +24,7 @@ buildPythonPackage rec {
owner = "pytorch";
repo = "tensordict";
rev = "refs/tags/v${version}";
hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E=";
hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0=";
};
nativeBuildInputs = [
@ -53,6 +54,18 @@ buildPythonPackage rec {
pytestCheckHook
];
# RuntimeError: internal error
disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
"test_add_scale_sequence"
"test_modules"
"test_setattr"
];
# ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package
disabledTestPaths = lib.optionals stdenv.isDarwin [
"test/test_distributed.py"
];
meta = with lib; {
description = "A pytorch dedicated tensor container";
changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}";

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

@ -364,12 +364,12 @@
buildPythonPackage rec {
pname = "types-aiobotocore";
version = "2.11.2";
version = "2.12.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-bnYg/u2BvG3/iBJ5xKQwiMG/n8vREpnOGHYaSlwlnRs=";
hash = "sha256-ma/pyfhqWpWFZ+V4O+mNr4SfoOC4/vn9+Hy+rYGAaG8=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/universal-silabs-flasher/default.nix
View File

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "universal-silabs-flasher";
version = "0.0.18";
version = "0.0.19";
pyproject = true;
src = fetchFromGitHub {
owner = "NabuCasa";
repo = "universal-silabs-flasher";
rev = "v${version}";
hash = "sha256-XUMpWzDqouhbsP+s0b13f6N0YGdXJK6qhbWQLqMzNHM=";
rev = "refs/tags/v${version}";
hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w=";
};
nativeBuildInputs = [

5
pkgs/development/tools/biome/default.nix
View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_6
, libgit2
, rust-jemalloc-sys
, zlib
, stdenv
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2_1_6
libgit2
rust-jemalloc-sys
zlib
] ++ lib.optionals stdenv.isDarwin [
@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec {
env = {
BIOME_VERSION = version;
LIBGIT2_NO_VENDOR = 1;
};
preCheck = ''

4
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.112.0";
version = "0.112.1";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3ad/2h9rw1BeMcr1lLEZp4fzJHfwl7y3/tTjmKKAvho=";
sha256 = "sha256-v0VYjG1GJwfXXabk9aBs99xGk6F0bFPFBBe//T7P4yQ=";
};
vendorHash = "sha256-tHEbHExdbWeZm3+rwRYpRILyPYEYdeVJ91Qr/yNIKV8=";

7
pkgs/development/tools/language-servers/gopls/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gopls";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "gopls/v${version}";
hash = "sha256-Ii3c7zqMC/CeSv6X7wSgUdCkVbP+bxDuUcqPKIeE3Is=";
hash = "sha256-GJ2zc5OgZXwEq12f0PyvgOOUd7cctUbFvdp095VQb9E=";
};
modRoot = "gopls";
vendorHash = "sha256-i6Pa2cMxf97LKVy6ZVyPvjAVbQHaF84RAO0dM/dgk/Y=";
vendorHash = "sha256-Xxik0t1BHQPqzrE3Oh3VhODn+IqIVa+TCNqQSnmbBM0=";
doCheck = false;
@ -22,6 +22,7 @@ buildGoModule rec {
meta = with lib; {
description = "Official language server for the Go language";
homepage = "https://github.com/golang/tools/tree/master/gopls";
changelog = "https://github.com/golang/tools/releases/tag/${src.rev}";
license = licenses.bsd3;
maintainers = with maintainers; [ mic92 rski SuperSandro2000 zimbatm ];
mainProgram = "gopls";

2
pkgs/development/tools/rust/cargo-audit/default.nix
View File

@ -2,7 +2,6 @@
, rustPlatform
, fetchCrate
, pkg-config
, libgit2
, openssl
, zlib
, stdenv
@ -26,7 +25,6 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [

8
pkgs/development/tools/rust/cargo-codspeed/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, curl
, pkg-config
, libgit2_1_5
, libgit2
, openssl
, zlib
, stdenv
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
curl
libgit2_1_5
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
@ -40,6 +40,10 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p=cargo-codspeed" ];
cargoTestFlags = cargoBuildFlags;
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "Cargo extension to build & run your codspeed benchmarks";
homepage = "https://github.com/CodSpeedHQ/codspeed-rust";

8
pkgs/development/tools/rust/cargo-dephell/default.nix
View File

@ -6,7 +6,7 @@
, curl
, openssl
, darwin
, libgit2_1_3_0
, libgit2
}:
rustPlatform.buildRustPackage rec {
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
] ++ lib.optionals stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
libgit2_1_3_0
libgit2
];
# update Cargo.lock to work with openssl 3
@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec {
ln -sf ${./Cargo.lock} Cargo.lock
'';
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "A tool to analyze the third-party dependencies imported by a rust crate or rust workspace";
homepage = "https://github.com/mimoo/cargo-dephell";

8
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_6
, libgit2
, openssl
, stdenv
, darwin
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2_1_6 openssl ] ++ lib.optionals stdenv.isDarwin [
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec {
"--skip=git::utils::should_canonicalize"
];
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "A tool to generate a new Rust project by leveraging a pre-existing git repository as a template";
homepage = "https://github.com/cargo-generate/cargo-generate";

8
pkgs/development/tools/rust/cargo-ui/default.nix
View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchCrate
, pkg-config
, libgit2_1_5
, libgit2
, openssl
, stdenv
, expat
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2_1_5
libgit2
openssl
] ++ lib.optionals stdenv.isLinux [
expat
@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec {
--add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]}
'';
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "A GUI for Cargo";
homepage = "https://github.com/slint-ui/cargo-ui";

8
pkgs/development/tools/rust/cargo-unused-features/default.nix
View File

@ -3,7 +3,7 @@
, fetchCrate
, curl
, pkg-config
, libgit2_1_5
, libgit2
, openssl
, stdenv
, darwin
@ -27,13 +27,17 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
curl
libgit2_1_5
libgit2
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "A tool to find potential unused enabled feature flags and prune them";
homepage = "https://github.com/timonpost/cargo-unused-features";

8
pkgs/development/tools/rust/cargo-update/default.nix
View File

@ -7,7 +7,7 @@
, ronn
, stdenv
, curl
, libgit2_1_5
, libgit2
, libssh2
, openssl
, zlib
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2_1_5
libgit2
libssh2
openssl
zlib
@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec {
installManPage man/*.1
'';
env = {
LIBGIT2_NO_VENDOR = 1;
};
meta = with lib; {
description = "A cargo subcommand for checking and applying updates to installed executables";
homepage = "https://github.com/nabijaczleweli/cargo-update";

2
pkgs/development/tools/rust/cargo-workspaces/default.nix
View File

@ -2,7 +2,6 @@
, rustPlatform
, fetchCrate
, pkg-config
, libgit2_1_6
, libssh2
, openssl
, zlib
@ -26,7 +25,6 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
libgit2_1_6
libssh2
openssl
zlib

6
pkgs/development/tools/rust/typeshare/default.nix
View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "typeshare";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "1password";
repo = "typeshare";
rev = "v${version}";
hash = "sha256-Ftr0YMrY6tPpfg25swYntBXLWGKT00PEz79aOiSgLsU=";
hash = "sha256-ykrtvXPXxNYrUQNScit+REb7/6mE0FOzBQxPdbWodgk=";
};
cargoHash = "sha256-VIPIFdbyPcflqHHLkzpDugmw9+9CJRIv+Oy7PoaUZ5g=";
cargoHash = "sha256-/oIezLqd3hkWrfO2pml31de+pgpEXhXHxIxt10rPJZo=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/vultr-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vultr-cli";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
hash = "sha256-k8YaoH75U1BvC3I71e1wY2TMaCVyZyBrQxYcEv3+bu8=";
hash = "sha256-9akEDsBj2EpZtUBh0+Dck5otsmFzdvJshXxOtYVdi1o=";
};
vendorHash = "sha256-QbzKXPgUWIMVo29xGRcL+KFva8cs+2goqh9b6h29aeY=";
vendorHash = "sha256-jkl36S7h1l6FeeHEhc+PKOQO9Uq/4L5wTb8+PhG2exY=";
nativeBuildInputs = [ installShellFiles ];

5
pkgs/games/openmw/tes3mp.nix
View File

@ -7,14 +7,13 @@
, luajit
, makeWrapper
, symlinkJoin
, disable-warnings-if-gcc13
}:
# revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy
let
# raknet could also be split into dev and lib outputs
raknet = disable-warnings-if-gcc13 (stdenv.mkDerivation {
raknet = stdenv.mkDerivation {
pname = "raknet";
version = "unstable-2020-01-19";
@ -46,7 +45,7 @@ let
installPhase = ''
install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a
'';
});
};
coreScripts = stdenv.mkDerivation {
pname = "corescripts";

4
pkgs/os-specific/linux/reptyr/default.nix
View File

@ -17,7 +17,9 @@ in stdenv.mkDerivation rec {
nativeCheckInputs = [ python ];
doCheck = true;
# reptyr needs to do ptrace of a non-child process
# It can be neither used nor tested if the kernel is not told to allow this
doCheck = false;
checkFlags = [
"PYTHON_CMD=${python.interpreter}"

4
pkgs/shells/zsh/pure-prompt/default.nix
View File

@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "pure-prompt";
version = "1.22.0";
version = "1.23.0";
src = fetchFromGitHub {
owner = "sindresorhus";
repo = "pure";
rev = "v${version}";
sha256 = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w=";
sha256 = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
};
strictDeps = true;

4
pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "ibus-anthy";
version = "1.5.15";
version = "1.5.16";
src = fetchurl {
url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-WMTm1YNqSsnjOqnoTljE3rZ62pjztUSyRAxXgyN+2Ys=";
sha256 = "sha256-FVIiFLWK2ISsydmx2hPxXbfc12w7GKiFCQRuXsYT0a4=";
};
buildInputs = [

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

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "faketty";
version = "1.0.15";
version = "1.0.16";
src = fetchCrate {
inherit pname version;
hash = "sha256-f32Y9Aj4Z9y6Da9rbRgwi9BGPl4FsI790BH52cIIoPA=";
hash = "sha256-BlQnVjYPFUfEurFUE2MHOL2ad56Nu/atzRuFu4OoCSI=";
};
cargoHash = "sha256-+M1oq2CHUK6CIDFiUNLjO1UmHI19D5zdHVl8dvmQ1G8=";
cargoHash = "sha256-q9jx03XYA977481B9xuUfaaMBDbSVx4xREj4Q1Ti/Yw=";
postPatch = ''
patchShebangs tests/test.sh

5
pkgs/tools/nix/nix-init/default.nix
View File

@ -6,7 +6,7 @@
, installShellFiles
, pkg-config
, bzip2
, libgit2_1_6
, libgit2
, openssl
, zlib
, zstd
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
bzip2
curl
libgit2_1_6
libgit2
openssl
zlib
zstd
@ -80,6 +80,7 @@ rustPlatform.buildRustPackage rec {
env = {
GEN_ARTIFACTS = "artifacts";
LIBGIT2_NO_VENDOR = 1;
NIX = lib.getExe nix;
NURL = lib.getExe nurl;
ZSTD_SYS_USE_PKG_CONFIG = true;

11
pkgs/tools/security/dontgo403/default.nix
View File

@ -5,17 +5,22 @@
buildGoModule rec {
pname = "dontgo403";
version = "0.9.4";
version = "1.0.0";
src = fetchFromGitHub {
owner = "devploit";
repo = pname;
repo = "dontgo403";
rev = "refs/tags/${version}";
hash = "sha256-PKI/DqMihhMaIa9OzDKtLIs34TRUtewAbBkx89IXLU4=";
hash = "sha256-znmPXue+pzv7vAKnIYsjJQQGMeBETH+ekyVKGz9wRik=";
};
vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg=";
ldflags = [
"-w"
"-s"
];
meta = with lib; {
description = "Tool to bypass 40X response codes";
homepage = "https://github.com/devploit/dontgo403";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fulcio";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LT8J9s008XQtDtNdH1ungQREqQUrlTsoxnlRLKimqLY=";
sha256 = "sha256-zL+53GIGDQagWtsSHQT1Gn1hZUCpYF3uYKXmJWFGy7k=";
# 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;
@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-ImZJXdOfMepMFU1z47XyNU39NGGdiCzQji2/tKVfibQ=";
vendorHash = "sha256-B4/SIY9G5uEP+P+oSdhaMM7HRaHm5nq2jqXdIWxdP+8=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/tools/text/goawk/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goawk";
version = "1.25.0";
version = "1.26.0";
src = fetchFromGitHub {
owner = "benhoyt";
repo = "goawk";
rev = "v${version}";
hash = "sha256-vxDBtYrfSmYE2mCqhepeLr4u+zLfHxCrYSXGq05CEYQ=";
hash = "sha256-EJf5Qv5ICJJdGNcRQ7v/ANyxx2j9d9NsZJnzIBrwam4=";
};
vendorHash = null;

4
pkgs/tools/text/zim-tools/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "zim-tools";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "openzim";
repo = "zim-tools";
rev = version;
sha256 = "sha256-kPUw13GVYZ1GLb4b4ch64GkJZtf6PW1gae8F/cgyG90=";
sha256 = "sha256-A1A0Ri2OwPyqpx0f5CPJL3zAwo2I/AiRKpmk3r4DeTc=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

6
pkgs/tools/video/yaydl/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "yaydl";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "dertuxmalwieder";
repo = pname;
rev = "release-${version}";
sha256 = "sha256-JwyWWqbUNZyH6gymeScb9tMZoPvn/Igz9iW2pp0XvEI=";
sha256 = "sha256-r0Z/dihDaiW/lBLMftLtzLELpKT2twqru1xxI9LnjU8=";
};
cargoSha256 = "sha256-jmqO0UvU6s+E5r6VFFjOvSe8oiLiTG5rPNHzoHVftWo=";
cargoHash = "sha256-FkOiMeNwYj++gZ1Kl4RZHmsRDVMZQBEYtRpogK6XSFE=";
nativeBuildInputs = [
pkg-config

58
pkgs/top-level/all-packages.nix
View File

@ -491,8 +491,6 @@ with pkgs;
banana-vera = callPackage ../development/tools/analysis/banana-vera { };
chrysalis = callPackage ../applications/misc/chrysalis { };
ciel = callPackage ../tools/package-management/ciel { };
circt = callPackage ../development/compilers/circt { };
@ -5632,8 +5630,6 @@ with pkgs;
hocr-tools = with python3Packages; toPythonApplication hocr-tools;
home-manager = callPackage ../tools/package-management/home-manager { };
homepage-dashboard = callPackage ../servers/homepage-dashboard {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) IOKit;
@ -12415,8 +12411,6 @@ with pkgs;
ouch = callPackage ../tools/compression/ouch { };
outils = callPackage ../tools/misc/outils { };
mpi = openmpi; # this attribute should used to build MPI applications
mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { };
@ -20123,7 +20117,22 @@ with pkgs;
ttyd = callPackage ../servers/ttyd { };
turbogit = callPackage ../development/tools/turbogit {
libgit2 = libgit2_1_3_0;
libgit2 = libgit2.overrideAttrs rec {
version = "1.3.0";
src = pkgs.fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920=";
};
patches = [];
# tests fail on old version
doCheck = false;
meta = libgit2.meta // {
maintainers = [];
knownVulnerabilities = [ "CVE-2024-24575" "CVE-2024-24577" "CVE-2022-29187" "CVE 2022-24765" ];
};
};
};
tweak = callPackage ../applications/editors/tweak { };
@ -21346,39 +21355,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
libgit2_1_3_0 = libgit2.overrideAttrs rec {
version = "1.3.0";
src = pkgs.fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920=";
};
patches = [];
};
libgit2_1_5 = libgit2.overrideAttrs rec {
version = "1.5.1";
src = pkgs.fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM=";
};
patches = [];
};
libgit2_1_6 = libgit2.overrideAttrs rec {
version = "1.6.5";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
hash = "sha256-2tgXnrB85dEfxu7giETqMuFxfm0RH5MicHZqO3ezGu0=";
};
patches = [ ];
};
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
libhsts = callPackage ../development/libraries/libhsts { };
@ -31007,8 +30983,6 @@ with pkgs;
inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { }))
ed edUnstable;
edbrowse = callPackage ../applications/editors/edbrowse { };
edlin = callPackage ../applications/editors/edlin { };
orbiton = callPackage ../applications/editors/orbiton {