Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-02-01 18:01:21 +00:00 committed by GitHub
commit 381e01e471
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
93 changed files with 745 additions and 406 deletions

View File

@ -880,25 +880,211 @@ $ nix run nixpkgs#nix-prefetch-docker -- --help
## exportImage {#ssec-pkgs-dockerTools-exportImage} ## exportImage {#ssec-pkgs-dockerTools-exportImage}
This function is analogous to the `docker export` command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with `docker import`. This function is similar to the `docker container export` command, which means it can be used to export an image's filesystem as an uncompressed tarball archive.
The difference is that `docker container export` is applied to containers, but `dockerTools.exportImage` applies to Docker images.
The resulting archive will not contain any image metadata (such as command to run with `docker container run`), only the filesystem contents.
> **_NOTE:_** Using this function requires the `kvm` device to be available. You can use this function to import an archive in Docker with `docker image import`.
See [](#ex-dockerTools-exportImage-importingDocker) to understand how to do that.
The parameters of `exportImage` are the following: :::{.caution}
`exportImage` works by unpacking the given image inside a VM.
Because of this, using this function requires the `kvm` device to be available, see [`system-features`](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-system-features).
:::
### Inputs {#ssec-pkgs-dockerTools-exportImage-inputs}
`exportImage` expects an argument with the following attributes:
`fromImage` (Attribute Set or String)
: The repository tarball of the image whose filesystem will be exported.
It must be a valid Docker image, such as one exported by `docker image save`, or another image built with the `dockerTools` utility functions.
If `name` is not specified, `fromImage` must be an Attribute Set corresponding to a derivation, i.e. it can't be a path to a tarball.
If `name` is specified, `fromImage` can be either an Attribute Set corresponding to a derivation or simply a path to a tarball.
See [](#ex-dockerTools-exportImage-naming) and [](#ex-dockerTools-exportImage-fromImagePath) to understand the connection between `fromImage`, `name`, and the name used for the output of `exportImage`.
`fromImageName` (String or Null; _optional_)
: Used to specify the image within the repository tarball in case it contains multiple images.
A value of `null` means that `exportImage` will use the first image available in the repository.
:::{.note}
This must be used with `fromImageTag`. Using only `fromImageName` without `fromImageTag` will make `exportImage` use the first image available in the repository.
:::
_Default value:_ `null`.
`fromImageTag` (String or Null; _optional_)
: Used to specify the image within the repository tarball in case it contains multiple images.
A value of `null` means that `exportImage` will use the first image available in the repository.
:::{.note}
This must be used with `fromImageName`. Using only `fromImageTag` without `fromImageName` will make `exportImage` use the first image available in the repository
:::
_Default value:_ `null`.
`diskSize` (Number; _optional_)
: Controls the disk size (in megabytes) of the VM used to unpack the image.
_Default value:_ 1024.
`name` (String; _optional_)
: The name used for the output in the Nix store path.
_Default value:_ the value of `fromImage.name`.
### Examples {#ssec-pkgs-dockerTools-exportImage-examples}
:::{.example #ex-dockerTools-exportImage-hello}
# Exporting a Docker image with `dockerTools.exportImage`
This example first builds a layered image with [`dockerTools.buildLayeredImage`](#ssec-pkgs-dockerTools-buildLayeredImage), and then exports its filesystem with `dockerTools.exportImage`.
```nix ```nix
exportImage { { dockerTools, hello }:
fromImage = someLayeredImage; dockerTools.exportImage {
fromImageName = null; name = "hello";
fromImageTag = null; fromImage = dockerTools.buildLayeredImage {
name = "hello";
name = someLayeredImage.name; contents = [ hello ];
};
} }
``` ```
The parameters relative to the base image have the same synopsis as described in [buildImage](#ssec-pkgs-dockerTools-buildImage), except that `fromImage` is the only required argument in this case. When building the package above, we can see the layers of the Docker image being unpacked to produce the final output:
The `name` argument is the name of the derivation output, which defaults to `fromImage.name`. ```shell
$ nix-build
(some output removed for clarity)
Unpacking base image...
From-image name or tag wasn't set. Reading the first ID.
Unpacking layer 5731199219418f175d1580dbca05677e69144425b2d9ecb60f416cd57ca3ca42/layer.tar
tar: Removing leading `/' from member names
Unpacking layer e2897bf34bb78c4a65736510204282d9f7ca258ba048c183d665bd0f3d24c5ec/layer.tar
tar: Removing leading `/' from member names
Unpacking layer 420aa5876dca4128cd5256da7dea0948e30ef5971712f82601718cdb0a6b4cda/layer.tar
tar: Removing leading `/' from member names
Unpacking layer ea5f4e620e7906c8ecbc506b5e6f46420e68d4b842c3303260d5eb621b5942e5/layer.tar
tar: Removing leading `/' from member names
Unpacking layer 65807b9abe8ab753fa97da8fb74a21fcd4725cc51e1b679c7973c97acd47ebcf/layer.tar
tar: Removing leading `/' from member names
Unpacking layer b7da2076b60ebc0ea6824ef641978332b8ac908d47b2d07ff31b9cc362245605/layer.tar
Executing post-mount steps...
Packing raw image...
[ 1.660036] reboot: Power down
/nix/store/x6a5m7c6zdpqz1d8j7cnzpx9glzzvd2h-hello
```
The following command lists some of the contents of the output to verify that the structure of the archive is as expected:
```shell
$ tar --exclude '*/share/*' --exclude 'nix/store/*/*' -tvf /nix/store/x6a5m7c6zdpqz1d8j7cnzpx9glzzvd2h-hello
drwxr-xr-x root/0 0 1979-12-31 16:00 ./
drwxr-xr-x root/0 0 1979-12-31 16:00 ./bin/
lrwxrwxrwx root/0 0 1979-12-31 16:00 ./bin/hello -> /nix/store/h92a9jd0lhhniv2q417hpwszd4jhys7q-hello-2.12.1/bin/hello
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/store/
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/store/05zbwhz8a7i2v79r9j21pl6m6cj0xi8k-libunistring-1.1/
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/store/ayg5rhjhi9ic73hqw33mjqjxwv59ndym-xgcc-13.2.0-libgcc/
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/store/h92a9jd0lhhniv2q417hpwszd4jhys7q-hello-2.12.1/
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/store/m59xdgkgnjbk8kk6k6vbxmqnf82mk9s0-libidn2-2.3.4/
dr-xr-xr-x root/0 0 1979-12-31 16:00 ./nix/store/p3jshbwxiwifm1py0yq544fmdyy98j8a-glibc-2.38-27/
drwxr-xr-x root/0 0 1979-12-31 16:00 ./share/
```
:::
:::{.example #ex-dockerTools-exportImage-importingDocker}
# Importing an archive built with `dockerTools.exportImage` in Docker
We will use the same package from [](#ex-dockerTools-exportImage-hello) and import it into Docker.
```nix
{ dockerTools, hello }:
dockerTools.exportImage {
name = "hello";
fromImage = dockerTools.buildLayeredImage {
name = "hello";
contents = [ hello ];
};
}
```
Building and importing it into Docker:
```shell
$ nix-build
(output removed for clarity)
/nix/store/x6a5m7c6zdpqz1d8j7cnzpx9glzzvd2h-hello
$ docker image import /nix/store/x6a5m7c6zdpqz1d8j7cnzpx9glzzvd2h-hello
sha256:1d42dba415e9b298ea0decf6497fbce954de9b4fcb2984f91e307c8fedc1f52f
$ docker image ls
REPOSITORY TAG IMAGE ID CREATED SIZE
<none> <none> 1d42dba415e9 4 seconds ago 32.6MB
```
:::
:::{.example #ex-dockerTools-exportImage-naming}
# Exploring output naming with `dockerTools.exportImage`
`exportImage` does not require a `name` attribute if `fromImage` is a derivation, which means that the following works:
```nix
{ dockerTools, hello }:
dockerTools.exportImage {
fromImage = dockerTools.buildLayeredImage {
name = "hello";
contents = [ hello ];
};
}
```
However, since [`dockerTools.buildLayeredImage`](#ssec-pkgs-dockerTools-buildLayeredImage)'s output ends with `.tar.gz`, the output of `exportImage` will also end with `.tar.gz`, even though the archive created with `exportImage` is uncompressed:
```shell
$ nix-build
(output removed for clarity)
/nix/store/by3f40xvc4l6bkis74l0fj4zsy0djgkn-hello.tar.gz
$ file /nix/store/by3f40xvc4l6bkis74l0fj4zsy0djgkn-hello.tar.gz
/nix/store/by3f40xvc4l6bkis74l0fj4zsy0djgkn-hello.tar.gz: POSIX tar archive (GNU)
```
If the archive was actually compressed, the output of file would've mentioned that fact.
Because of this, it may be important to set a proper `name` attribute when using `exportImage` with other functions from `dockerTools`.
:::
:::{.example #ex-dockerTools-exportImage-fromImagePath}
# Using `dockerTools.exportImage` with a path as `fromImage`
It is possible to use a path as the value of the `fromImage` attribute when calling `dockerTools.exportImage`.
However, when doing so, a `name` attribute **MUST** be specified, or you'll encounter an error when evaluating the Nix code.
For this example, we'll assume a Docker tarball image named `image.tar.gz` exists in the same directory where our package is defined:
```nix
{ dockerTools }:
dockerTools.exportImage {
name = "filesystem.tar";
fromImage = ./image.tar.gz;
}
```
Building this will give us the expected output:
```shell
$ nix-build
(output removed for clarity)
/nix/store/w13l8h3nlkg0zv56k7rj0ai0l2zlf7ss-filesystem.tar
```
If you don't specify a `name` attribute, you'll encounter an evaluation error and the package won't build.
:::
## Environment Helpers {#ssec-pkgs-dockerTools-helpers} ## Environment Helpers {#ssec-pkgs-dockerTools-helpers}

View File

@ -27,18 +27,18 @@ With these expressions the Nix package manager can build binary packages.
Packages, including the Nix packages collection, are distributed through Packages, including the Nix packages collection, are distributed through
[channels](https://nixos.org/nix/manual/#sec-channels). The collection is [channels](https://nixos.org/nix/manual/#sec-channels). The collection is
distributed for users of Nix on non-NixOS distributions through the channel distributed for users of Nix on non-NixOS distributions through the channel
`nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g. `nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels,
`nixos-22.11`, which includes all packages and modules for the stable NixOS e.g. `nixos-22.11`, which includes all packages and modules for the stable NixOS
22.11. Stable NixOS releases are generally only given 22.11. Stable NixOS releases are generally only given
security updates. More up to date packages and modules are available via the security updates. More up to date packages and modules are available via the
`nixos-unstable` channel. `nixos-unstable` channel.
Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the
repository, although both do lag the `master` branch by generally nixpkgs repository, although both do lag the `master` branch by generally
[a couple of days](https://status.nixos.org/). Updates to a channel are [a couple of days](https://status.nixos.org/). Updates to a channel are
distributed as soon as all tests for that channel pass, e.g. distributed as soon as all tests for that channel pass, e.g.
[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
shows the status of tests for the `nixpkgs` channel. shows the status of tests for the `nixpkgs-unstable` channel.
The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/),
which also builds binary packages from the Nix expressions in Nixpkgs for which also builds binary packages from the Nix expressions in Nixpkgs for
@ -46,5 +46,5 @@ which also builds binary packages from the Nix expressions in Nixpkgs for
The binaries are made available via a [binary cache](https://cache.nixos.org). The binaries are made available via a [binary cache](https://cache.nixos.org).
The current Nix expressions of the channels are available in the The current Nix expressions of the channels are available in the
[`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches [nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
that correspond to the channel names (e.g. `nixos-22.11-small`). that correspond to the channel names (e.g. `nixos-22.11-small`).

View File

@ -310,6 +310,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*` - Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*`
- New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command. - New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command.
- The `services.paperless` module no longer uses the previously downloaded NLTK data stored in `/var/cache/paperless/nltk`. This directory can be removed.
- The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399). - The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
- The `btrbk` module now automatically selects and provides required compression - The `btrbk` module now automatically selects and provides required compression
@ -319,5 +321,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- The `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`. - The `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`.
- YouTrack is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details.
- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS). - QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS).
The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform. The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform.

View File

@ -6,7 +6,6 @@ let
pkg = cfg.package; pkg = cfg.package;
defaultUser = "paperless"; defaultUser = "paperless";
nltkDir = "/var/cache/paperless/nltk";
defaultFont = "${pkgs.liberation_ttf}/share/fonts/truetype/LiberationSerif-Regular.ttf"; defaultFont = "${pkgs.liberation_ttf}/share/fonts/truetype/LiberationSerif-Regular.ttf";
# Don't start a redis instance if the user sets a custom redis connection # Don't start a redis instance if the user sets a custom redis connection
@ -17,13 +16,17 @@ let
PAPERLESS_DATA_DIR = cfg.dataDir; PAPERLESS_DATA_DIR = cfg.dataDir;
PAPERLESS_MEDIA_ROOT = cfg.mediaDir; PAPERLESS_MEDIA_ROOT = cfg.mediaDir;
PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;
PAPERLESS_NLTK_DIR = nltkDir;
PAPERLESS_THUMBNAIL_FONT_NAME = defaultFont; PAPERLESS_THUMBNAIL_FONT_NAME = defaultFont;
GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
} // optionalAttrs (config.time.timeZone != null) { } // optionalAttrs (config.time.timeZone != null) {
PAPERLESS_TIME_ZONE = config.time.timeZone; PAPERLESS_TIME_ZONE = config.time.timeZone;
} // optionalAttrs enableRedis { } // optionalAttrs enableRedis {
PAPERLESS_REDIS = "unix://${redisServer.unixSocket}"; PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
} // optionalAttrs (cfg.settings.PAPERLESS_ENABLE_NLTK or true) {
PAPERLESS_NLTK_DIR = pkgs.symlinkJoin {
name = "paperless_ngx_nltk_data";
paths = pkg.nltkData;
};
} // (lib.mapAttrs (_: s: } // (lib.mapAttrs (_: s:
if (lib.isAttrs s || lib.isList s) then builtins.toJSON s if (lib.isAttrs s || lib.isList s) then builtins.toJSON s
else if lib.isBool s then lib.boolToString s else if lib.isBool s then lib.boolToString s
@ -292,23 +295,6 @@ in
}; };
}; };
# Download NLTK corpus data
systemd.services.paperless-download-nltk-data = {
wantedBy = [ "paperless-scheduler.service" ];
before = [ "paperless-scheduler.service" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = defaultServiceConfig // {
User = cfg.user;
Type = "oneshot";
# Enable internet access
PrivateNetwork = false;
ExecStart = let pythonWithNltk = pkg.python.withPackages (ps: [ ps.nltk ]); in ''
${pythonWithNltk}/bin/python -m nltk.downloader -d '${nltkDir}' punkt snowball_data stopwords
'';
};
};
systemd.services.paperless-consumer = { systemd.services.paperless-consumer = {
description = "Paperless document consumer"; description = "Paperless document consumer";
# Bind to `paperless-scheduler` so that the consumer never runs # Bind to `paperless-scheduler` so that the consumer never runs

View File

@ -0,0 +1,30 @@
# YouTrack {#module-services-youtrack}
YouTrack is a browser-based bug tracker, issue tracking system and project management software.
## Installation {#module-services-youtrack-installation}
YouTrack exposes a web GUI installer on first login.
You need a token to access it.
You can find this token in the log of the `youtrack` service. The log line looks like
```
* JetBrains YouTrack 2023.3 Configuration Wizard will be available on [http://127.0.0.1:8090/?wizard_token=somelongtoken] after start
```
## Upgrade from 2022.3 to 2023.x {#module-services-youtrack-upgrade-2022_3-2023_1}
Starting with YouTrack 2023.1, JetBrains no longer distributes it as as JAR.
The new distribution with the JetBrains Launcher as a ZIP changed the basic data structure and also some configuration parameters.
Check out https://www.jetbrains.com/help/youtrack/server/YouTrack-Java-Start-Parameters.html for more information on the new configuration options.
When upgrading to YouTrack 2023.1 or higher, a migration script will move the old state directory to `/var/lib/youtrack/2022_3` as a backup.
A one-time manual update is required:
1. Before you update take a backup of your YouTrack instance!
2. Migrate the options you set in `services.youtrack.extraParams` and `services.youtrack.jvmOpts` to `services.youtrack.generalParameters` and `services.youtrack.environmentalParameters` (see the examples and [the YouTrack docs](https://www.jetbrains.com/help/youtrack/server/2023.3/YouTrack-Java-Start-Parameters.html))
2. To start the upgrade set `services.youtrack.package = pkgs.youtrack`
3. YouTrack then starts in upgrade mode, meaning you need to obtain the wizard token as above
4. Select you want to **Upgrade** YouTrack
5. As source you select `/var/lib/youtrack/2022_3/teamsysdata/` (adopt if you have a different state path)
6. Change the data directory location to `/var/lib/youtrack/data/`. The other paths should already be right.
If you migrate a larger YouTrack instance, it might be useful to set `-Dexodus.entityStore.refactoring.forceAll=true` in `services.youtrack.generalParameters` for the first startup of YouTrack 2023.x.

View File

@ -1,130 +1,224 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
let let
cfg = config.services.youtrack; cfg = config.services.youtrack;
extraAttr = concatStringsSep " " (mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams));
mergeAttrList = lib.foldl' lib.mergeAttrs {};
stdParams = mergeAttrList [
(optionalAttrs (cfg.baseUrl != null) {
"jetbrains.youtrack.baseUrl" = cfg.baseUrl;
})
{
"java.aws.headless" = "true";
"jetbrains.youtrack.disableBrowser" = "true";
}
];
in in
{ {
imports = [
(lib.mkRenamedOptionModule [ "services" "youtrack" "baseUrl" ] [ "services" "youtrack" "environmentalParameters" "base-url" ])
(lib.mkRenamedOptionModule [ "services" "youtrack" "port" ] [ "services" "youtrack" "environmentalParameters" "listen-port" ])
(lib.mkRemovedOptionModule [ "services" "youtrack" "maxMemory" ] "Please instead use `services.youtrack.generalParameters`.")
(lib.mkRemovedOptionModule [ "services" "youtrack" "maxMetaspaceSize" ] "Please instead use `services.youtrack.generalParameters`.")
];
options.services.youtrack = { options.services.youtrack = {
enable = lib.mkEnableOption (lib.mdDoc "YouTrack service");
enable = mkEnableOption (lib.mdDoc "YouTrack service"); address = lib.mkOption {
address = mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
The interface youtrack will listen on. The interface youtrack will listen on.
''; '';
default = "127.0.0.1"; default = "127.0.0.1";
type = types.str; type = lib.types.str;
}; };
baseUrl = mkOption { extraParams = lib.mkOption {
description = lib.mdDoc ''
Base URL for youtrack. Will be auto-detected and stored in database.
'';
type = types.nullOr types.str;
default = null;
};
extraParams = mkOption {
default = {}; default = {};
description = lib.mdDoc '' description = lib.mdDoc ''
Extra parameters to pass to youtrack. See Extra parameters to pass to youtrack.
Use to configure YouTrack 2022.x, deprecated with YouTrack 2023.x. Use `services.youtrack.generalParameters`.
https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html
for more information. for more information.
''; '';
example = literalExpression '' example = lib.literalExpression ''
{ {
"jetbrains.youtrack.overrideRootPassword" = "tortuga"; "jetbrains.youtrack.overrideRootPassword" = "tortuga";
} }
''; '';
type = types.attrsOf types.str; type = lib.types.attrsOf lib.types.str;
visible = false;
}; };
package = mkPackageOption pkgs "youtrack" { }; package = lib.mkOption {
port = mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
The port youtrack will listen on. Package to use.
''; '';
default = 8080; type = lib.types.package;
type = types.port; default = null;
relatedPackages = [ "youtrack_2022_3" "youtrack" ];
}; };
statePath = mkOption {
statePath = lib.mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
Where to keep the youtrack database. Path were the YouTrack state is stored.
To this path the base version (e.g. 2023_1) of the used package will be appended.
''; '';
type = types.path; type = lib.types.path;
default = "/var/lib/youtrack"; default = "/var/lib/youtrack";
}; };
virtualHost = mkOption { virtualHost = lib.mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
Name of the nginx virtual host to use and setup. Name of the nginx virtual host to use and setup.
If null, do not setup anything. If null, do not setup anything.
''; '';
default = null; default = null;
type = types.nullOr types.str; type = lib.types.nullOr lib.types.str;
}; };
jvmOpts = mkOption { jvmOpts = lib.mkOption {
description = lib.mdDoc '' description = lib.mdDoc ''
Extra options to pass to the JVM. Extra options to pass to the JVM.
Only has a use with YouTrack 2022.x, deprecated with YouTrack 2023.x. Use `serivces.youtrack.generalParameters`.
See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html
for more information. for more information.
''; '';
type = types.separatedString " "; type = lib.types.separatedString " ";
example = "-XX:MetaspaceSize=250m"; example = "--J-XX:MetaspaceSize=250m";
default = ""; default = "";
visible = false;
}; };
maxMemory = mkOption { autoUpgrade = lib.mkOption {
description = lib.mdDoc '' type = lib.types.bool;
Maximum Java heap size default = true;
''; description = lib.mdDoc "Whether YouTrack should auto upgrade it without showing the upgrade dialog.";
type = types.str;
default = "1g";
}; };
maxMetaspaceSize = mkOption { generalParameters = lib.mkOption {
type = with lib.types; listOf str;
description = lib.mdDoc '' description = lib.mdDoc ''
Maximum java Metaspace memory. General configuration parameters and other JVM options.
Only has an effect for YouTrack 2023.x.
See https://www.jetbrains.com/help/youtrack/server/2023.3/youtrack-java-start-parameters.html#general-parameters
for more information.
''; '';
type = types.str; example = lib.literalExpression ''
default = "350m"; [
"-Djetbrains.youtrack.admin.restore=true"
"-Xmx1024m"
];
'';
default = [];
};
environmentalParameters = lib.mkOption {
type = lib.types.submodule {
freeformType = with lib.types; attrsOf (oneOf [ int str port ]);
options = {
listen-address = lib.mkOption {
type = lib.types.str;
default = "0.0.0.0";
description = lib.mdDoc "The interface YouTrack will listen on.";
};
listen-port = lib.mkOption {
type = lib.types.port;
default = 8080;
description = lib.mdDoc "The port YouTrack will listen on.";
};
};
};
description = lib.mdDoc ''
Environmental configuration parameters, set imperatively. The values doesn't get removed, when removed in Nix.
Only has an effect for YouTrack 2023.x.
See https://www.jetbrains.com/help/youtrack/server/2023.3/youtrack-java-start-parameters.html#environmental-parameters
for more information.
'';
example = lib.literalExpression ''
{
secure-mode = "tls";
}
'';
default = {};
}; };
}; };
config = mkIf cfg.enable { config = lib.mkIf cfg.enable {
warnings = lib.optional (lib.versions.major cfg.package.version <= "2022")
"YouTrack 2022.x is deprecated. See https://nixos.org/manual/nixos/unstable/index.html#module-services-youtrack for details on how to upgrade."
++ lib.optional (cfg.extraParams != "" && (lib.versions.major cfg.package.version >= "2023"))
"'services.youtrack.extraParams' is deprecated and has no effect on YouTrack 2023.x and newer. Please migrate to 'services.youtrack.generalParameters'"
++ lib.optional (cfg.jvmOpts != "" && (lib.versions.major cfg.package.version >= "2023"))
"'services.youtrack.jvmOpts' is deprecated and has no effect on YouTrack 2023.x and newer. Please migrate to 'services.youtrack.generalParameters'";
systemd.services.youtrack = { # XXX: Drop all version feature switches at the point when we consider YT 2022.3 as outdated.
environment.HOME = cfg.statePath; services.youtrack.package = lib.mkDefault (
environment.YOUTRACK_JVM_OPTS = "${extraAttr}"; if lib.versionAtLeast config.system.stateVersion "24.11" then pkgs.youtrack
after = [ "network.target" ]; else pkgs.youtrack_2022_3
wantedBy = [ "multi-user.target" ]; );
path = with pkgs; [ unixtools.hostname ];
serviceConfig = { services.youtrack.generalParameters = lib.optional (lib.versions.major cfg.package.version >= "2023")
Type = "simple"; "-Ddisable.configuration.wizard.on.upgrade=${lib.boolToString cfg.autoUpgrade}"
User = "youtrack"; ++ (lib.mapAttrsToList (k: v: "-D${k}=${v}") cfg.extraParams);
Group = "youtrack";
Restart = "on-failure"; systemd.services.youtrack = let
ExecStart = ''${cfg.package}/bin/youtrack --J-Xmx${cfg.maxMemory} --J-XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${cfg.address}:${toString cfg.port}''; service_jar = let
mergeAttrList = lib.foldl' lib.mergeAttrs {};
stdParams = mergeAttrList [
(lib.optionalAttrs (cfg.environmentalParameters ? base-url && cfg.environmentalParameters.base-url != null) {
"jetbrains.youtrack.baseUrl" = cfg.environmentalParameters.base-url;
})
{
"java.aws.headless" = "true";
"jetbrains.youtrack.disableBrowser" = "true";
}
];
extraAttr = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams));
in {
environment.HOME = cfg.statePath;
environment.YOUTRACK_JVM_OPTS = "${extraAttr}";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ unixtools.hostname ];
serviceConfig = {
Type = "simple";
User = "youtrack";
Group = "youtrack";
Restart = "on-failure";
ExecStart = ''${cfg.package}/bin/youtrack ${cfg.jvmOpts} ${cfg.environmentalParameters.listen-address}:${toString cfg.environmentalParameters.listen-port}'';
};
}; };
}; service_zip = let
jvmoptions = pkgs.writeTextFile {
name = "youtrack.jvmoptions";
text = (lib.concatStringsSep "\n" cfg.generalParameters);
};
package = cfg.package.override {
statePath = cfg.statePath;
};
in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ unixtools.hostname ];
preStart = ''
# This detects old (i.e. <= 2022.3) installations that were not migrated yet
# and migrates them to the new state directory style
if [[ -d ${cfg.statePath}/teamsysdata ]] && [[ ! -d ${cfg.statePath}/2022_3 ]]
then
mkdir -p ${cfg.statePath}/2022_3
mv ${cfg.statePath}/teamsysdata ${cfg.statePath}/2022_3
mv ${cfg.statePath}/.youtrack ${cfg.statePath}/2022_3
fi
mkdir -p ${cfg.statePath}/{backups,conf,data,logs,temp}
${pkgs.coreutils}/bin/ln -fs ${jvmoptions} ${cfg.statePath}/conf/youtrack.jvmoptions
${package}/bin/youtrack configure ${lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "--${name}=${toString value}") cfg.environmentalParameters )}
'';
serviceConfig = lib.mkMerge [
{
Type = "simple";
User = "youtrack";
Group = "youtrack";
Restart = "on-failure";
ExecStart = "${package}/bin/youtrack run";
}
(lib.mkIf (cfg.statePath == "/var/lib/youtrack") {
StateDirectory = "youtrack";
})
];
};
in if (lib.versions.major cfg.package.version >= "2023") then service_zip else service_jar;
users.users.youtrack = { users.users.youtrack = {
description = "Youtrack service user"; description = "Youtrack service user";
@ -136,7 +230,7 @@ in
users.groups.youtrack = {}; users.groups.youtrack = {};
services.nginx = mkIf (cfg.virtualHost != null) { services.nginx = lib.mkIf (cfg.virtualHost != null) {
upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {}; upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {};
virtualHosts.${cfg.virtualHost}.locations = { virtualHosts.${cfg.virtualHost}.locations = {
"/" = { "/" = {
@ -166,9 +260,10 @@ in
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
''; '';
}; };
}; };
}; };
}; };
meta.doc = ./youtrack.md;
meta.maintainers = [ lib.maintainers.leona ];
} }

View File

@ -6,13 +6,13 @@
mkDerivation rec { mkDerivation rec {
pname = "pure-maps"; pname = "pure-maps";
version = "3.2.0"; version = "3.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rinigus"; owner = "rinigus";
repo = "pure-maps"; repo = "pure-maps";
rev = version; rev = version;
hash = "sha256-07Jk5ufYbBAa/UY1B0IoyuOAVt15rGCxCRXu3OeYyWU="; hash = "sha256-AZt0JcNegHkUkWy+NW5CNLZfxjjFyKWBrhLJgSTv3to=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe"; pname = "tippecanoe";
version = "2.41.2"; version = "2.41.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "felt"; owner = "felt";
repo = "tippecanoe"; repo = "tippecanoe";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-d5+0/+4NaW7BBYsRZ3WK8BJYVpUZUmwtvzjfBhS9lcc="; hash = "sha256-yHX0hQbuPFaosBR/N7TmQKOHnd2LG6kkfGUBlaSkA8E=";
}; };
buildInputs = [ sqlite zlib ]; buildInputs = [ sqlite zlib ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: { lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext, copyDesktopItems, makeDesktopItem }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xcruiser"; pname = "xcruiser";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
}; };
nativeBuildInputs = [ gccmakedep imake ]; nativeBuildInputs = [ gccmakedep imake copyDesktopItems ];
buildInputs = [ libXt libXaw libXpm libXext ]; buildInputs = [ libXt libXaw libXpm libXext ];
makeFlags = [ makeFlags = [
@ -19,6 +19,16 @@ stdenv.mkDerivation rec {
"XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults"
]; ];
desktopItems = [
(makeDesktopItem {
name = "XCruiser";
exec = "xcruiser";
desktopName = "XCruiser";
comment = "filesystem visualization utility";
categories = [ "Utility" ];
})
];
meta = with lib; { meta = with lib; {
description = "Filesystem visualization utility"; description = "Filesystem visualization utility";
longDescription = '' longDescription = ''

View File

@ -92,11 +92,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.62.153"; version = "1.62.156";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-7ifBFWKsegXe0zBdVQO2BiKoBd2zhYX8RYiYcs8v0bg="; hash = "sha256-U+MjXuF3rv5N4juKeIzUfnSNVLx1LGn+Ws+b5p252Qk=";
}; };
dontConfigure = true; dontConfigure = true;

View File

@ -4,7 +4,7 @@ let
if stdenv.isLinux then { if stdenv.isLinux then {
stable = "0.0.42"; stable = "0.0.42";
ptb = "0.0.66"; ptb = "0.0.66";
canary = "0.0.257"; canary = "0.0.265";
development = "0.0.11"; development = "0.0.11";
} else { } else {
stable = "0.0.292"; stable = "0.0.292";
@ -25,7 +25,7 @@ let
}; };
canary = fetchurl { canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-2AUCTWKEB4cy2tFfnJMn8Ywz1B8a3H6yhkVIcB0fLME="; hash = "sha256-uIo12mTFyvCyxazquLu2YlAbCqzQSBIY6O5AmC9hMpE=";
}; };
development = fetchurl { development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

View File

@ -1,9 +1,9 @@
{ {
"version" = "1.11.55"; "version" = "1.11.57";
"hashes" = { "hashes" = {
"desktopSrcHash" = "sha256-Gk6RjhU0vJymz2KmaNJgnuGcSVyJo53iWR3naOx49X4="; "desktopSrcHash" = "sha256-U1Koq+YrTQnbJAQmMuBioU6lxtw3oH9U3W3iMIDbibY=";
"desktopYarnHash" = "0v3j54a2ixik424za0iwj4sf60g934480jyp5lblhg7z8y5xqks8"; "desktopYarnHash" = "03kx7g1fhm4qn6iq450156fgw1x6bf0sngmqhd2hrhp699mjxs5s";
"webSrcHash" = "sha256-dAfPYw3qqj+xY3ZaACsT/Vtp57mag6PJtquxqXZ6F1Q="; "webSrcHash" = "sha256-ZoB6ALNUDYh8nYUYsPNeiCaXn3qvg3NRJzDRJaHT4oU=";
"webYarnHash" = "1aqhdk9mgz5hq7iawjclzfd78wi64kygkklwg6sp6qfv1ayi6b51"; "webYarnHash" = "0vznx306p3racnq5xv27ywvlrdxql9x8i3fl77i5vlc8g7crpc3m";
}; };
} }

View File

@ -18,6 +18,7 @@
, xcbuild , xcbuild
, pango , pango
, pkg-config , pkg-config
, nltk-data
}: }:
let let
@ -293,6 +294,7 @@ python.pkgs.buildPythonApplication rec {
passthru = { passthru = {
inherit python path frontend; inherit python path frontend;
nltkData = with nltk-data; [ punkt snowball_data stopwords ];
tests = { inherit (nixosTests) paperless; }; tests = { inherit (nixosTests) paperless; };
}; };

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "treesheets"; pname = "treesheets";
version = "unstable-2024-01-26"; version = "unstable-2024-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "treesheets"; repo = "treesheets";
rev = "a1705796a8e1eddd63cc847f4c4c71634c5c7eb8"; rev = "f11a3418cb6e403898be215f3efcc2fcb7bc0f19";
sha256 = "bF24E+30u/8//vAwjXrnUqybieIUlEDYyvI5sHnLkco="; sha256 = "FOeRfNPX1ER1ZMUWy+4b67XfrATPPZntfhywjaGgDpo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, jdk11, wrapGAppsHook }: { lib, stdenv, fetchzip, jdk17, testers, wrapGAppsHook, igv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igv"; pname = "igv";
@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
cp -Rv * $out/share/ cp -Rv * $out/share/
sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh
sed -i 's#java#${jdk11}/bin/java#g' $out/share/igv.sh sed -i 's#java#${jdk17}/bin/java#g' $out/share/igv.sh
sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools
sed -i 's#java#${jdk11}/bin/java#g' $out/share/igvtools sed -i 's#java#${jdk17}/bin/java#g' $out/share/igvtools
ln -s $out/share/igv.sh $out/bin/igv ln -s $out/share/igv.sh $out/bin/igv
ln -s $out/share/igvtools $out/bin/igvtools ln -s $out/share/igvtools $out/bin/igvtools
@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
passthru.tests.version = testers.testVersion {
package = igv;
};
meta = with lib; { meta = with lib; {
homepage = "https://www.broadinstitute.org/igv/"; homepage = "https://www.broadinstitute.org/igv/";
description = "A visualization tool for interactive exploration of genomic datasets"; description = "A visualization tool for interactive exploration of genomic datasets";

View File

@ -40,8 +40,8 @@ let
} }
else else
{ {
version = "2023.3"; version = "2024";
hash = "sha256-Tsj40MevdrE/j9FtuOLBIOdJ3kOa6VVNn2U/gS140cs="; hash = "sha256-BNIm1SBmqLw6QuANYhPec3tOwpLiZwMGWST/AZVoAeI=";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

View File

@ -20,12 +20,12 @@
buildGoModule rec { buildGoModule rec {
pname = "gitea"; pname = "gitea";
version = "1.21.4"; version = "1.21.5";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI # not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl { src = fetchurl {
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
hash = "sha256-bkRI2m7aHrQH5wQbm4MoygrF5da7j4i8Qd/aoMJbhS0="; hash = "sha256-VnJF6CSssQYs8yIKmXvxYHh2CfLiJhuKtjRdqKIQGxw=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "containerd"; pname = "containerd";
version = "1.7.12"; version = "1.7.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
repo = "containerd"; repo = "containerd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-o3ZqSE7ahUAihY/tqXdNgKzs64h0DBxrZaxjSF9smcs="; hash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "docker-compose"; pname = "docker-compose";
version = "2.24.3"; version = "2.24.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "compose"; repo = "compose";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-B6hJXm4SABYTIFPd9unTNkDtQxeMPBk98/2Q1TQedEA="; hash = "sha256-mn6HkGLQM5kx6yzV4IK+GTV6pCoIm1CNjQ8AZLv3sMw=";
}; };
postPatch = '' postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/ rm -rf e2e/
''; '';
vendorHash = "sha256-ymNd8DMkttSiF167RSIWQbL8RHPYXp4D8ctFoSPC0io="; vendorHash = "sha256-KR+4OZKabshnGpkPq8vtEutvQUE+3jVwAlfAwFVlscU=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (final: { stdenv.mkDerivation (final: {
pname = "boxed-cpp"; pname = "boxed-cpp";
version = "1.2.0"; version = "1.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "contour-terminal"; owner = "contour-terminal";
repo = "boxed-cpp"; repo = "boxed-cpp";
rev = "v${final.version}"; rev = "v${final.version}";
hash = "sha256-Su0FdDi1JVoXd7rJ1SG4cQg2G/+mW5iU1892ee6mRl8="; hash = "sha256-/zC9DV2nFY1ipqsM1p/WMdSf/nZkhlqJ2Ce/FzGWGGI=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "eza"; pname = "eza";
version = "0.17.3"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eza-community"; owner = "eza-community";
repo = "eza"; repo = "eza";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-kjECdZ97v8QOzz+hG0H3q21PWbIWxx2JeIhhLQDZXAY="; hash = "sha256-LUCsn4yCzqb6ASNMzWTxgZVDeoL3wYjjVbTRaI+Uh40=";
}; };
cargoHash = "sha256-KAjLnhEWD2c0A/+5w3eQrCMUfbo/C5KoceV9IbNLMCc="; cargoHash = "sha256-BUVtINvHqjeWM5dmLQpdEiTb4SMVJGtJ61bEaV0N8sg=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ] buildInputs = [ zlib ]

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fortune-kind"; pname = "fortune-kind";
version = "0.1.12"; version = "0.1.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cafkafk"; owner = "cafkafk";
repo = "fortune-kind"; repo = "fortune-kind";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-1abke8wPvIFTmvEJ83TdfONFPBuJHbgmVHAoKddoTRw="; hash = "sha256-Tpg0Jq2EhkwQuz5ZOtv6Rb5YESSlmzLoJPTxYJNNgac=";
}; };
cargoHash = "sha256-SRPhALRGkFZDl23Om/obg1Crd9yNXroN7F/7agobuqw="; cargoHash = "sha256-hxbvsAQsZWUAgj8QAlcxqBA5YagLO3/vz9lQGJMHUjw=";
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];

View File

@ -1,7 +1,6 @@
{ lib { lib
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, acl , acl
, cowsql , cowsql
, hwdata , hwdata
@ -17,24 +16,16 @@
buildGoModule rec { buildGoModule rec {
pname = "incus-unwrapped"; pname = "incus-unwrapped";
version = "0.4.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";
repo = "incus"; repo = "incus";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw="; hash = "sha256-3eWkQT2P69ZfN62H9B4WLnmlUOGkpzRR0rctgchP+6A=";
}; };
vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc="; vendorHash = "sha256-2ZJU7WshN4UIbJv55bFeo9qiAQ/wxu182mnz7pE60xA=";
patches = [
# remove with > 0.4.0
(fetchpatch {
url = "https://github.com/lxc/incus/commit/c0200b455a1468685d762649120ce7e2bb25adc9.patch";
hash = "sha256-4fiSv6GcsKpdLh3iNbw3AGuDzcw1EadUvxtSjxRjtTA=";
})
];
postPatch = '' postPatch = ''
substituteInPlace internal/usbid/load.go \ substituteInPlace internal/usbid/load.go \
@ -108,7 +99,7 @@ buildGoModule rec {
meta = { meta = {
description = "Powerful system container and virtual machine manager"; description = "Powerful system container and virtual machine manager";
homepage = "https://linuxcontainers.org/incus"; homepage = "https://linuxcontainers.org/incus";
changelog = "https://github.com/lxc/incus/releases/tag/incus-${version}"; changelog = "https://github.com/lxc/incus/releases/tag/v${version}";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = lib.teams.lxc.members; maintainers = lib.teams.lxc.members;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "nomnatong"; pname = "nomnatong";
version = "5.08"; version = "5.09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nomfoundation"; owner = "nomfoundation";
repo = "font"; repo = "font";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-WtAxnTFrgXdG2T1vqfRc31tNKbZagDSO9lycKxn8dKg="; hash = "sha256-WkDvneCWuAS0/D+WUhd1F6dqpIuSAMK598mSRbNf6/8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -14,13 +14,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tigerbeetle"; pname = "tigerbeetle";
version = "0.14.176"; version = "0.14.177";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tigerbeetle"; owner = "tigerbeetle";
repo = "tigerbeetle"; repo = "tigerbeetle";
rev = "refs/tags/${finalAttrs.version}"; rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-prvTE6fingEIzXk++FYP0J9dA9xeophU0LLcknmS2ZI="; hash = "sha256-oMsDHz/yOWtS1XhJcXR74pA3YvPzANUdRAy7tjNO5lc=";
}; };
nativeBuildInputs = [ custom_zig_hook ]; nativeBuildInputs = [ custom_zig_hook ];

View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "uiua"; pname = "uiua";
version = "0.7.1"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "uiua-lang"; owner = "uiua-lang";
repo = "uiua"; repo = "uiua";
rev = version; rev = version;
hash = "sha256-cBwQdArVRiXH8TmgBSPpcB5oNu3Q/+Us9Azzw0lV5Vs="; hash = "sha256-JilYPIeJbVf9wgGpLTy8pbMwFRrW7Od+8y0tWwAXU84=";
}; };
cargoHash = "sha256-7cgKiEqklvUw64a6+lbHA9t6QWiTquYVi0evXkONEag="; cargoHash = "sha256-oXO2TBdKmVIpZD0jLI1CK9b48r3SwdeygcJoUG6HGXo=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
rustPlatform.bindgenHook rustPlatform.bindgenHook
@ -42,9 +42,9 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional audioSupport "audio"; buildFeatures = lib.optional audioSupport "audio";
passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } ''
uiua init; uiua init
diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"') diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"')
touch $out; touch $out
''; '';
meta = { meta = {

View File

@ -0,0 +1,43 @@
{ lib, stdenvNoCC, fetchzip, makeBinaryWrapper, jdk17_headless, gawk, statePath ? "/var/lib/youtrack" }:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "youtrack";
version = "2023.3.23390";
src = fetchzip {
url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";
hash = "sha256-p3ZjClVku7EjQSd9wwx0iJ+5DqooaKragdNzj0f8OO8=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r * $out
makeWrapper $out/bin/youtrack.sh $out/bin/youtrack \
--prefix PATH : "${lib.makeBinPath [ gawk ]}" \
--set JRE_HOME ${jdk17_headless}
rm -rf $out/internal/java
mv $out/conf $out/conf.orig
ln -s ${statePath}/backups $out/backups
ln -s ${statePath}/conf $out/conf
ln -s ${statePath}/data $out/data
ln -s ${statePath}/logs $out/logs
ln -s ${statePath}/temp $out/temp
runHook postInstall
'';
passthru.updateScript = ./update.sh;
meta = {
description = "Issue tracking and project management tool for developers";
maintainers = lib.teams.serokell.members ++ [ lib.maintainers.leona ];
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
# https://www.jetbrains.com/youtrack/buy/license.html
license = lib.licenses.unfree;
};
})

View File

@ -0,0 +1,9 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl xq-xml common-updater-scripts
set -eu -o pipefail
version="$(curl https://www.jetbrains.com/youtrack/update.xml | \
xq -x "/products/product[@name='YouTrack']/channel/build/@version")"
update-source-version youtrack "$version"

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, makeWrapper, jdk17, gawk }: { lib, stdenv, fetchurl, makeWrapper, jdk17, gawk }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "youtrack"; pname = "youtrack";
version = "2022.3.65371"; version = "2022.3.65371";
jar = fetchurl { jar = fetchurl {
url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.jar";
sha256 = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs="; sha256 = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs=";
}; };
@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = {
description = "Issue tracking and project management tool for developers"; description = "Issue tracking and project management tool for developers";
maintainers = teams.serokell.members; maintainers = lib.teams.serokell.members ++ [ lib.maintainers.leona ];
sourceProvenance = with sourceTypes; [ binaryBytecode ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
# https://www.jetbrains.com/youtrack/buy/license.html # https://www.jetbrains.com/youtrack/buy/license.html
license = licenses.unfree; license = lib.licenses.unfree;
}; };
} })

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kode-mono"; pname = "kode-mono";
version = "1.204"; version = "1.205";
src = fetchzip { src = fetchzip {
url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip"; url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip";
hash = "sha256-0mAE06963HaBKBKBvTnt8q7QAY1FakEGUx1wAqOZVH4="; hash = "sha256-DRe2Qi+Unhr5ebQdTG6QgvQEUTNOdnosFbQC8kpHNYU=";
stripRoot = false; stripRoot = false;
}; };

View File

@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: rec {
"--disable-jemalloc" "--disable-jemalloc"
"--disable-strip" "--disable-strip"
"--disable-tests" "--disable-tests"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# Spidermonkey seems to use different host/build terminology for cross # Spidermonkey seems to use different host/build terminology for cross
# compilation here. # compilation here.
"--host=${stdenv.buildPlatform.config}" "--host=${stdenv.buildPlatform.config}"

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcint"; pname = "libcint";
version = "6.1.1"; version = "6.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sunqm"; owner = "sunqm";
repo = "libcint"; repo = "libcint";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-wV3y+NobV6J+J6I2z3dJdCvTwvfgMspMtAGNpbwfsYk="; hash = "sha256-URJcC0ib87ejrTCglCjhC2tQHNc5TRvo4CQ52N58n+4=";
}; };
postPatch = '' postPatch = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmilter"; pname = "libmilter";
version = "8.17.2"; version = "8.18.1";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz";
sha256 = "sha256-kPWudMNahICIYZM7oJQgG5AbcMaykDaE3POb2uiloaI="; sha256 = "sha256-y/HzCcOOSAb3zz6tJCYPF9H+j7YyVtE+2zzdGgmPB3A=";
}; };
buildPhase = '' buildPhase = ''

View File

@ -1,31 +0,0 @@
diff --git a/cmake/developer_package/linux_name.cmake b/cmake/developer_package/linux_name.cmake
index 3e8c775770..2d5e00fb8b 100644
--- a/cmake/developer_package/linux_name.cmake
+++ b/cmake/developer_package/linux_name.cmake
@@ -6,25 +6,7 @@ include(target_flags)
if(LINUX)
function(get_linux_name res_var)
- if(EXISTS "/etc/lsb-release")
- # linux version detection using cat /etc/lsb-release
- file(READ "/etc/lsb-release" release_data)
- set(name_regex "DISTRIB_ID=([^ \n]*)\n")
- set(version_regex "DISTRIB_RELEASE=([0-9]+(\\.[0-9]+)?)")
- else()
- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \;
- OUTPUT_VARIABLE release_data
- RESULT_VARIABLE result)
- string(REPLACE "Red Hat" "CentOS" release_data "${release_data}")
- set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
- set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
- endif()
-
- string(REGEX MATCH ${name_regex} name ${release_data})
- set(os_name ${CMAKE_MATCH_1})
-
- string(REGEX MATCH ${version_regex} version ${release_data})
- set(os_name "${os_name} ${CMAKE_MATCH_1}")
+ set(os_name "NixOS @version@")
if(os_name)
set(${res_var} ${os_name} PARENT_SCOPE)

View File

@ -1,8 +1,8 @@
{ lib { lib
, stdenv , gcc12Stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch2
, fetchurl , fetchurl
, substituteAll
, cudaSupport ? opencv.cudaSupport or false , cudaSupport ? opencv.cudaSupport or false
# build # build
@ -14,45 +14,62 @@
, pkg-config , pkg-config
, python , python
, shellcheck , shellcheck
, sphinx
# runtime # runtime
, flatbuffers
, libusb1 , libusb1
, libxml2 , libxml2
, ocl-icd , ocl-icd
, opencv , opencv
, protobuf , protobuf
, pugixml , pugixml
, snappy
, tbb , tbb
, cudaPackages , cudaPackages
}: }:
let let
inherit (lib)
cmakeBool
;
stdenv = gcc12Stdenv;
# See GNA_VERSION in cmake/dependencies.cmake # See GNA_VERSION in cmake/dependencies.cmake
gna_version = "03.05.00.1906"; gna_version = "03.05.00.2116";
gna = fetchurl { gna = fetchurl {
url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip";
hash = "sha256-SlvobZwCaw4Qr6wqV/x8mddisw49UGq7OjOA+8/icm4="; hash = "sha256-lgNQVncCvaFydqxMBg11JPt8587XhQBL2GHIH/K/4sU=";
}; };
tbbbind_version = "2_5"; tbbbind_version = "2_5";
tbbbind = fetchurl { tbbbind = fetchurl {
url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v3.tgz"; url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz";
hash = "sha256-053rJiwGmBteLS48WT6fyb5izk/rkd1OZI6SdTZZprM="; hash = "sha256-Tr8wJGUweV8Gb7lhbmcHxrF756ZdKdNRi1eKdp3VTuo=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openvino"; pname = "openvino";
version = "2023.0.0"; version = "2023.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openvinotoolkit"; owner = "openvinotoolkit";
repo = "openvino"; repo = "openvino";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-z88SgAZ0UX9X7BhBA7/NU/UhVLltb6ANKolruU8YiZQ="; hash = "sha256-dXlQhar5gz+1iLmDYXUY0jZKh4rJ+khRpoZQphJXfcU=";
}; };
patches = [
(fetchpatch2 {
name = "enable-js-toggle.patch";
url = "https://github.com/openvinotoolkit/openvino/commit/0a8f1383826d949c497fe3d05fef9ad2b662fa7e.patch";
hash = "sha256-mQYunouPo3tRlD5Yp4EUth324ccNnVX8zmjPHvJBYKw=";
})
];
outputs = [ outputs = [
"out" "out"
"python" "python"
@ -71,17 +88,11 @@ stdenv.mkDerivation rec {
setuptools setuptools
])) ]))
shellcheck shellcheck
sphinx
] ++ lib.optionals cudaSupport [ ] ++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc cudaPackages.cuda_nvcc
]; ];
patches = [
(substituteAll {
src = ./cmake.patch;
inherit (lib) version;
})
];
postPatch = '' postPatch = ''
mkdir -p temp/gna_${gna_version} mkdir -p temp/gna_${gna_version}
pushd temp/ pushd temp/
@ -100,30 +111,35 @@ stdenv.mkDerivation rec {
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" "-Wno-dev"
"-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake"
"-DENABLE_LTO:BOOL=ON" "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}"
# protobuf
"-DENABLE_SYSTEM_PROTOBUF:BOOL=OFF"
"-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"
# tbb
"-DENABLE_SYSTEM_TBB:BOOL=ON"
# opencv
"-DENABLE_OPENCV:BOOL=ON"
"-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/" "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/"
# pugixml "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DENABLE_SYSTEM_PUGIXML:BOOL=ON"
# onednn (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
"-DENABLE_ONEDNN_FOR_GPU:BOOL=OFF" (cmakeBool "NCC_SYLE" false)
# intel gna (cmakeBool "BUILD_TESTING" false)
"-DENABLE_INTEL_GNA:BOOL=ON" (cmakeBool "ENABLE_CPPLINT" false)
# python (cmakeBool "ENABLE_TESTING" false)
"-DENABLE_PYTHON:BOOL=ON" (cmakeBool "ENABLE_SAMPLES" false)
# tests
"-DENABLE_CPPLINT:BOOL=OFF" # features
"-DBUILD_TESTING:BOOL=OFF" (cmakeBool "ENABLE_INTEL_CPU" true)
"-DENABLE_SAMPLES:BOOL=OFF" (cmakeBool "ENABLE_INTEL_GNA" true)
(lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) (cmakeBool "ENABLE_JS" false)
(cmakeBool "ENABLE_LTO" true)
(cmakeBool "ENABLE_ONEDNN_FOR_GPU" false)
(cmakeBool "ENABLE_OPENCV" true)
(cmakeBool "ENABLE_PYTHON" true)
# system libs
(cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true)
(cmakeBool "ENABLE_SYSTEM_OPENCL" true)
(cmakeBool "ENABLE_SYSTEM_PROTOBUF" false)
(cmakeBool "ENABLE_SYSTEM_PUGIXML" true)
(cmakeBool "ENABLE_SYSTEM_SNAPPY" true)
(cmakeBool "ENABLE_SYSTEM_TBB" true)
]; ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing";
@ -133,12 +149,13 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
flatbuffers
libusb1 libusb1
libxml2 libxml2
ocl-icd ocl-icd
opencv.cxxdev opencv.cxxdev
protobuf
pugixml pugixml
snappy
tbb tbb
] ++ lib.optionals cudaSupport [ ] ++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart cudaPackages.cuda_cudart
@ -147,11 +164,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = '' postInstall = ''
pushd $out/python/python${lib.versions.majorMinor python.version}
mkdir -p $python mkdir -p $python
mv ./* $python/ mv $out/python/* $python/
popd rmdir $out/python
rm -r $out/python
''; '';
postFixup = '' postFixup = ''

View File

@ -45,8 +45,12 @@
poor-mans-t-sql-formatter-cli = "sqlformat"; poor-mans-t-sql-formatter-cli = "sqlformat";
postcss-cli = "postcss"; postcss-cli = "postcss";
prettier = "prettier"; prettier = "prettier";
pulp = "pulp";
purescript-language-server = "purescript-language-server";
purescript-psa = "psa"; purescript-psa = "psa";
purs-tidy = "purs-tidy"; purs-tidy = "purs-tidy";
purty = "purty";
pscid = "pscid";
remod-cli = "remod"; remod-cli = "remod";
svelte-language-server = "svelteserver"; svelte-language-server = "svelteserver";
teck-programmer = "teck-firmware-upgrade"; teck-programmer = "teck-firmware-upgrade";

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiortm"; pname = "aiortm";
version = "0.8.9"; version = "0.8.10";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare"; owner = "MartinHjelmare";
repo = "aiortm"; repo = "aiortm";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-bHFQd/jD5S+2YHr+f8W9WxDw69i59gzzptwDUS0UWAY="; hash = "sha256-WkVuuvWWdj2McdXl+XwYukUcloehelFIi6QL5LSkfLk=";
}; };
postPatch = '' postPatch = ''

View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "appthreat-vulnerability-db"; pname = "appthreat-vulnerability-db";
version = "5.6.0"; version = "5.6.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "AppThreat"; owner = "AppThreat";
repo = "vulnerability-db"; repo = "vulnerability-db";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-tRC+w9HyXuN6eWbNaccK0xtcOnJpuErcHaB7+lvTiQI="; hash = "sha256-BkJ1hA4SXuXYkJnSNaZ/JeX+PHdJylfwKkRzQsBxc24=";
}; };
postPatch = '' postPatch = ''

View File

@ -365,14 +365,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3-stubs"; pname = "boto3-stubs";
version = "1.34.30"; version = "1.34.32";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-M45Yil5lhIS4ewhKNwPLW1s16xCJLma+HhXp5zDahQ0="; hash = "sha256-B38TsIVoYr7a+5K4SZuWBiTQb2hFlb5wH63lGo6WFe0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore-stubs"; pname = "botocore-stubs";
version = "1.34.30"; version = "1.34.32";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "botocore_stubs"; pname = "botocore_stubs";
inherit version; inherit version;
hash = "sha256-RroNjY+0CSfro3a1xjvJXoLkddwTYMR6SalPIxJCOOk="; hash = "sha256-l4yXuMArX/o3JqUFLlcVrsxSxkCnWoCIs6WEU8KwVLI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clarifai-grpc"; pname = "clarifai-grpc";
version = "10.0.9"; version = "10.0.10";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Clarifai"; owner = "Clarifai";
repo = "clarifai-python-grpc"; repo = "clarifai-python-grpc";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-SDGkAlIUCfz4G1TyGjSd4M5Syl8sw/aeUHT6J5V7RKg="; hash = "sha256-IcMnzfkq4eSXh2KsxSog64RQbJhXkEWjma6LNkzDX0Y=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-reversion"; pname = "django-reversion";
version = "5.0.10"; version = "5.0.12";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-wYdJpnwdtBZ8yszDY5XF/mB48xKGloPC89IUBR5aayk="; hash = "sha256-wEfMmanxukqubbicOsJDR41t6Y7Ipgxwc/zIddicXNs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "publicsuffixlist"; pname = "publicsuffixlist";
version = "0.10.0.20240127"; version = "0.10.0.20240201";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-6IpNJsLj4IlMXoEneM9FeYcW6K0Vq5/97fPK5jZMFYQ="; hash = "sha256-8IAfr55UWsstyyoFr5KJWAtU1LnAguEAwUSWts/iK1o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylgnetcast"; pname = "pylgnetcast";
version = "0.3.8"; version = "0.3.9";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Drafteed"; owner = "Drafteed";
repo = "python-lgnetcast"; repo = "python-lgnetcast";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-UxZ4XM7n0Ryd4D967fXPTA4sqTrZwS8Tj/Q8kNGdk8Q="; hash = "sha256-5lzLknuGLQryLCc4YQJn8AGuWTiSM90+8UTQ/WYfASM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylutron"; pname = "pylutron";
version = "0.2.10"; version = "0.2.11";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-DKwjBQXC7O/8bFxq5shJJxRV3HYgBeS7tJXg4m3vQMY="; hash = "sha256-9M7bCZD3zGZM62ID0yB/neKkF+6UW8x5m2y5vj/mYes=";
}; };
# Project has no tests # Project has no tests

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytedee-async"; pname = "pytedee-async";
version = "0.2.12"; version = "0.2.13";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "zweckj"; owner = "zweckj";
repo = "pytedee_async"; repo = "pytedee_async";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-eepN5Urr9fp1780iy3Z4sot+hXvMCxMGodYBdRdDj9Y="; hash = "sha256-3W+eqkniDMoDKeute5w1QyklOc/aren/Q8txBEI/4ys=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "reconplogger"; pname = "reconplogger";
version = "4.14.0"; version = "4.15.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "omni-us"; owner = "omni-us";
repo = "reconplogger"; repo = "reconplogger";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-VQX0Hdw4aXszkWicpCQ9/X7edHyOTqN7OtzPZROS9Z0="; hash = "sha256-0+YOrMqyDK6uAni2h5b6P850veIkUiifX6aHzCnRHD0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -26,7 +26,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sagemaker"; pname = "sagemaker";
version = "2.205.0"; version = "2.206.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "aws"; owner = "aws";
repo = "sagemaker-python-sdk"; repo = "sagemaker-python-sdk";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-TqPTzmJZa6ntxEIv/M9m6pvk9g0CcJW0PPyUJtwHNpk="; hash = "sha256-aKLv8bXH1lq6yBeFsR2odtTo4sbaHlSyeSUnKdIzW9Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tensordict"; pname = "tensordict";
version = "0.2.1"; version = "0.3.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "pytorch"; owner = "pytorch";
repo = "tensordict"; repo = "tensordict";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-+Osoz1632F/dEkG/o8RUqCIDok2Qc9Qdak+CCr9m26g="; hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, ninja , ninja
, setuptools , setuptools
, wheel , wheel
@ -32,7 +31,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "torchrl"; pname = "torchrl";
version = "0.2.1"; version = "0.3.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -41,17 +40,9 @@ buildPythonPackage rec {
owner = "pytorch"; owner = "pytorch";
repo = "rl"; repo = "rl";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Y3WbSMGXS6fb4RyXk2SAKHT6RencGTZXM3tc65AQx74="; hash = "sha256-ngl/gbNm+62W6UFNo8GOhSaIuK9FERDxGBCr++7B4gw=";
}; };
patches = [
(fetchpatch { # https://github.com/pytorch/rl/pull/1828
name = "pyproject.toml-remove-unknown-properties";
url = "https://github.com/pytorch/rl/commit/c390cf602fc79cb37d5f7bda6e44b5e9546ecda0.patch";
hash = "sha256-cUBBvKJ8vIHprcGzMojkUxcOrrmNPIoIBfLwHXWkjOc=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
ninja ninja
setuptools setuptools
@ -103,11 +94,6 @@ buildPythonPackage rec {
rm -rf torchrl rm -rf torchrl
export XDG_RUNTIME_DIR=$(mktemp -d) export XDG_RUNTIME_DIR=$(mktemp -d)
''
# Otherwise, tochrl will try to use unpackaged torchsnapshot.
# TODO: This should be the default from next release so remove when updating from 0.2.1
+ ''
export CKPT_BACKEND="torch"
''; '';
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-docutils"; pname = "types-docutils";
version = "0.20.0.20240126"; version = "0.20.0.20240201";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-zFp+7UY6CZH44K/7/een2JoxopbmhzLLOzHPLLRO6o0="; hash = "sha256-ukv9T/bdGWQLp6tdk5ADk6ZYl4gPNlCZeWSpQ/Tnmms=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-setuptools"; pname = "types-setuptools";
version = "68.2.0.2"; version = "69.0.0.20240115";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Ce/DgK1cf3jjC8oVRvcGRpVozyYITPq3Ps+D3qHShEY="; hash = "sha256-GpyGOJn0DL4gU9DNHQDd7wMwtJIzVGfQGPc8H+yUYqM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,6 +8,7 @@
, pytest-mock , pytest-mock
, pytest-rerunfailures , pytest-rerunfailures
, pytest-timeout , pytest-timeout
, pytest-xdist
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools , setuptools
@ -53,6 +54,7 @@ buildPythonPackage rec {
pytest-mock pytest-mock
pytest-rerunfailures pytest-rerunfailures
pytest-timeout pytest-timeout
pytest-xdist
pytestCheckHook pytestCheckHook
]; ];

View File

@ -4,7 +4,7 @@ with python3.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "check-jsonschema"; pname = "check-jsonschema";
version = "0.27.3"; version = "0.27.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -12,8 +12,8 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "python-jsonschema"; owner = "python-jsonschema";
repo = "check-jsonschema"; repo = "check-jsonschema";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-WXvhlkU1dRNKhW3sMakd644W56xv8keMjSZL4MrQEc8="; hash = "sha256-xOLS2AQlVrL9b7VVCbnDyjHhQYmcD2DvPmEs+nn7Gm4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cirrus-cli"; pname = "cirrus-cli";
version = "0.109.0"; version = "0.110.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cirruslabs"; owner = "cirruslabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yXgBQMpBPAaLnAnirkLJzotW14wRnL9Pn3MM6Tsiny8="; sha256 = "sha256-5BMaOuiXz8SMfaB7qFvCyboGFKxzenkEVwj25Qh4MKw=";
}; };
vendorHash = "sha256-xJnBMSfYwx6uHuMjyR9IWGHwt3fNajDr6DW8o+J+lj8="; vendorHash = "sha256-xJnBMSfYwx6uHuMjyR9IWGHwt3fNajDr6DW8o+J+lj8=";

View File

@ -1,13 +1,13 @@
{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "detekt"; pname = "detekt";
version = "1.23.4"; version = "1.23.5";
jarfilename = "${pname}-${version}-executable.jar"; jarfilename = "${pname}-${version}-executable.jar";
src = fetchurl { src = fetchurl {
url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar";
sha256 = "sha256-Kx6I0pe7Qz4JMZeBRVdka6wfoL9uQgZjCUGInZJeAOA="; sha256 = "sha256-Pz+MaZimJMCjtGPy7coi6SSE7IdAQhtp2u8YV4s7KLY=";
}; };
dontUnpack = true; dontUnpack = true;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gqlgenc"; pname = "gqlgenc";
version = "0.16.2"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamashou"; owner = "yamashou";
repo = "gqlgenc"; repo = "gqlgenc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-XNmCSkgJJ2notrv0Din4jlU9EoHJcznjEUiXQgQ5a7I="; sha256 = "sha256-CkVPbMepkBpCeyRv30S6RTvBSe6BsJuit87x1S9GPMU=";
}; };
excludedPackages = [ "example" ]; excludedPackages = [ "example" ];

View File

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kdash"; pname = "kdash";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kdash-rs"; owner = "kdash-rs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Vk0Pf5uF9AANv/vf32ZrICJJTp6QRsR/nFW40xnkImo="; sha256 = "sha256-XY6aBqLHbif3RsytNm7JnDXspICJuhS7SJ+ApwTeqX4=";
}; };
nativeBuildInputs = [ perl python3 pkg-config ]; nativeBuildInputs = [ perl python3 pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl xorg.xcbutil ] buildInputs = [ openssl xorg.xcbutil ]
++ lib.optional stdenv.isDarwin AppKit; ++ lib.optional stdenv.isDarwin AppKit;
cargoHash = "sha256-gY4ywjTokEc5Uv4InARH2s3WYiPGYSDDWk2kltyQa+0="; cargoHash = "sha256-ODQf+Fvil+oBJcM38h1HdrcgtJw0b65f5auLuZtUgik=";
meta = with lib; { meta = with lib; {
description = "A simple and fast dashboard for Kubernetes"; description = "A simple and fast dashboard for Kubernetes";

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kube-linter"; pname = "kube-linter";
version = "0.6.5"; version = "0.6.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stackrox"; owner = "stackrox";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gygzibpTpdVg1ZenAXIDHXYwAemlr6qkioE+GV52NkE="; sha256 = "sha256-D9QJsYaYvGjDucr0Xedg2LEqfwTxzIQBBNNFZ1m5D/U=";
}; };
vendorHash = "sha256-ZeAAvL5pOvHMAsDBe/0CBeayTsUrPDK5a5rAxHAu64o="; vendorHash = "sha256-ARrMHjR/fOGS8EDMCKiEr3ubWjqDySb/AdX9jNYWOVA=";
ldflags = [ ldflags = [
"-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"

View File

@ -25,14 +25,14 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "slint-lsp"; pname = "slint-lsp";
version = "1.3.2"; version = "1.4.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-zNTel91c1ECg4z7xIu37GcSWHTxTKtxpGjH3TpiFQ1k="; sha256 = "sha256-ZX8ylDDyOWwEcupNg7u0RvmsKMC4RZNaKPg04PaCo3w=";
}; };
cargoHash = "sha256-pT3z6t1W/DitH/GJJIJhQawslodKzIkCyO0yd9OlvAg="; cargoHash = "sha256-BxiN2/PItU29H8btX5bjwfd9C6p8AEvxJunM8lMu3SI=";
nativeBuildInputs = [ cmake pkg-config fontconfig ]; nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]

View File

@ -55,4 +55,7 @@ spago.overrideAttrs (oldAttrs: {
touch $out touch $out
''; '';
}; };
meta = (oldAttrs.meta or {}) // {
mainProgram = "spago";
};
}) })

View File

@ -10,14 +10,14 @@
buildGoModule rec { buildGoModule rec {
pname = "symfony-cli"; pname = "symfony-cli";
version = "5.8.4"; version = "5.8.6";
vendorHash = "sha256-ACK0JCaS1MOCgUi2DMEjIcKf/nMCcrdDyIdioBZv7qw="; vendorHash = "sha256-ACK0JCaS1MOCgUi2DMEjIcKf/nMCcrdDyIdioBZv7qw=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "symfony-cli"; owner = "symfony-cli";
repo = "symfony-cli"; repo = "symfony-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-b6vjJaRSi5qNl4qpOEndqdZkaWxeI/6GnBiBIM2Vwr8="; hash = "sha256-lZ4jPmqPGyWp8xS156XXl6s4ZfNbU4M5xJy25nRL1Bs=";
}; };
ldflags = [ ldflags = [

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "the-way"; pname = "the-way";
version = "0.20.2"; version = "0.20.3";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-jUo46NHjgSFOV7fsqh9Ki0QtTGfoaPjQ87/a66zBz1Q="; sha256 = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o=";
}; };
cargoHash = "sha256-nmVsg8LX3di7ZAvvDuPQ3PXlLjs+L6YFTzwXRAkcxig="; cargoHash = "sha256-iZxV099582LuZ8A3uOsKPyekAQG2cQusLZhW+W1wW/8=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "function-runner"; pname = "function-runner";
version = "4.1.0"; version = "4.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shopify"; owner = "Shopify";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-o+fsIBH/vONlb57m3+upKG2Gss6s7yBNATkbKtSHf/0="; sha256 = "sha256-33UVo7mPD/o3Z/R5PFhosiSLFLLpJ0pHqUbKtX6THJE=";
}; };
cargoHash = "sha256-7ACi4orqpmWiaMYmOjICR6/d1kVySzaaCWIoUxqnhpI="; cargoHash = "sha256-TNbGmqITCk1VKVuO46LxO+zjAG7Laguq7EAruuhJIxk=";
meta = with lib; { meta = with lib; {
description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

View File

@ -7,22 +7,22 @@
let let
pname = "osu-lazer-bin"; pname = "osu-lazer-bin";
version = "2024.130.2"; version = "2024.131.0";
src = { src = {
aarch64-darwin = fetchzip { aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-XBwnMxBoOYqv9cyiM3OKscQBJmOmfYAOvOpnplaB+Ks="; hash = "sha256-R25TAXU3gUcVKQMo8P+0/vTRzSoFrUdFz11inpch+7A=";
stripRoot = false; stripRoot = false;
}; };
x86_64-darwin = fetchzip { x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-JeV5PYcLGjRYnX51p5pODVDASX7A6Iit8SpvXeuBVao="; hash = "sha256-w7BK3pm0XrlzOv0oz+ZUfVRufzUCCfevlRL+RDLtoLU=";
stripRoot = false; stripRoot = false;
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-4NG/3lHqQVfNa6zME/HD9m/bEkV79Vu64+aMDgCKqw0="; hash = "sha256-aNG6s942iTKyvM1XolMqmMs8XxoRYC/ZddCCJl0OtTE=";
}; };
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

View File

@ -16,13 +16,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "osu-lazer"; pname = "osu-lazer";
version = "2024.130.2"; version = "2024.131.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ppy"; owner = "ppy";
repo = "osu"; repo = "osu";
rev = version; rev = version;
hash = "sha256-9KSeCEhjqiB33suQs1jmATsOnBz6NzjSq3/6A8F78VU="; hash = "sha256-fsXs/AzvEQ141y/DPRvg7a7b0K30IfjigbRj0qh88rs=";
}; };
projectFile = "osu.Desktop/osu.Desktop.csproj"; projectFile = "osu.Desktop/osu.Desktop.csproj";

View File

@ -137,7 +137,7 @@
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; })
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; })
(fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.130.0"; sha256 = "1a2nzkbyllmyvivb1n5sig36ygg19qnc5wi0n4d9kjq113qbcm67"; }) (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.131.0"; sha256 = "0pa80w67nnfp3y25l5a6f6p9x48lj8bw3b24vzi3l8ndgcmnpyxz"; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; })
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.129.0"; sha256 = "032jpqv86z4sc835063gzbshkdzx3qhnzxlyaggidmbwn6i9fja6"; }) (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.129.0"; sha256 = "032jpqv86z4sc835063gzbshkdzx3qhnzxlyaggidmbwn6i9fja6"; })

View File

@ -8,8 +8,8 @@
"hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq"
}, },
"6.1": { "6.1": {
"version": "6.1.75", "version": "6.1.76",
"hash": "sha256:0mis14ll6xmhw71vfpw1aahi5z207qysha7x316fq4qc6c899lbc" "hash": "sha256:1zdi4xbk7zyiab7x8z12xqg72zaw3j61slvrbwjfx6pzh47cr005"
}, },
"5.15": { "5.15": {
"version": "5.15.148", "version": "5.15.148",
@ -28,11 +28,11 @@
"hash": "sha256:06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr" "hash": "sha256:06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr"
}, },
"6.6": { "6.6": {
"version": "6.6.14", "version": "6.6.15",
"hash": "sha256:110mz8fjlg1j9wnhhq2ik5alayhf61adajd8jqmcsqprncnnpsgv" "hash": "sha256:1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb"
}, },
"6.7": { "6.7": {
"version": "6.7.2", "version": "6.7.3",
"hash": "sha256:0wd6pxh7wy9bzjzwd0rdsdnghpr53qbs722fhg07bi19m8dy8kf3" "hash": "sha256:0i1bfkawyp917d9v3qa5nqzspzr3ixx7scbfl8x4lms74xjqrw5p"
} }
} }

View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux { stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn { , scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19482"; rev = "19489";
sha256 = "0y9w9jwlhxv88mjr67g64wgypjf3ikc6c5gr8wrvxiawi24kdhca"; sha256 = "1adnk4710iyq87bj48bfxzmzhv5hk0x3fmyz6ydk5af364fl87mk";
} }
, ... , ...
}: }:

View File

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "6.1.73-rt22"; # updated by ./update-rt.sh version = "6.1.75-rt23"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "11vyblm4nkjncdi3akcyizw7jkyxsqn2mjixc51f7kgiddq4ibbc"; sha256 = "0mis14ll6xmhw71vfpw1aahi5z207qysha7x316fq4qc6c899lbc";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1hl7y2sab21l81nl165b77jhfjhpcc1gvz64fs2yjjp4q2qih4b0"; sha256 = "0y88g4acq9vcxb169zficcih1dgq7ssl6v3f9740jr6r4l9ycv1x";
}; };
}; in [ rt-patch ] ++ kernelPatches; }; in [ rt-patch ] ++ kernelPatches;

View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script # comments with variant added for update script
# ./update-zen.py zen # ./update-zen.py zen
zenVariant = { zenVariant = {
version = "6.7.2"; #zen version = "6.7.3"; #zen
suffix = "zen1"; #zen suffix = "zen1"; #zen
sha256 = "0k2hcvq8djjmq4cb1lsaj0rklsbpjbfsg7l3ibj1yz244m05r113"; #zen sha256 = "1qm1vhd1x8gd2klcasp8f0x9hqaci4b5ih1nn9qc7vqash14hxy6"; #zen
isLqx = false; isLqx = false;
}; };
# ./update-zen.py lqx # ./update-zen.py lqx
lqxVariant = { lqxVariant = {
version = "6.7.2"; #lqx version = "6.7.2"; #lqx
suffix = "lqx1"; #lqx suffix = "lqx2"; #lqx
sha256 = "0qn401dgcx3488k8kndcyyf5qjwxn7nd7rnyzbm0rkgvvbnzmdv1"; #lqx sha256 = "0w82k39rqps8xwxnp87b16nfh4nmiys8532vrc8akjl1ffj68bqd"; #lqx
isLqx = true; isLqx = true;
}; };
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View File

@ -1,7 +1,7 @@
# This file was generated by pkgs.mastodon.updateScript. # This file was generated by pkgs.mastodon.updateScript.
{ fetchFromGitHub, applyPatches, patches ? [] }: { fetchFromGitHub, applyPatches, patches ? [] }:
let let
version = "4.2.4"; version = "4.2.5";
in in
( (
applyPatches { applyPatches {
@ -9,7 +9,7 @@ in
owner = "mastodon"; owner = "mastodon";
repo = "mastodon"; repo = "mastodon";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YPGOe9wywRls26PqEbqFeQRg7rcnRBO2NyiNW1fssts="; hash = "sha256-dgC5V/CVE9F1ORTjPWUWc/JVcWCEj/pb4eWpDV0WliY=";
}; };
patches = patches ++ []; patches = patches ++ [];
}) // { }) // {

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gobgpd"; pname = "gobgpd";
version = "3.22.0"; version = "3.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osrg"; owner = "osrg";
repo = "gobgp"; repo = "gobgp";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ItzoknejTtVjm0FD+UdpCa+cL0i2uvcffTNIWCjBdVU="; hash = "sha256-PUwYcwWgaV/DQl565fugppc+I/y7z7Ns3P4SspS88ts=";
}; };
vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8=";

View File

@ -55,8 +55,8 @@ in {
}; };
nextcloud28 = generic { nextcloud28 = generic {
version = "28.0.1"; version = "28.0.2";
hash = "sha256-L4BzW0Qwgicv5qO14yE3lX8fxEjHU0K5S1IAspcl86Q="; hash = "sha256-3jTWuvPszqz90TjoVSDNheHSzmeY2f+keKwX6x76HQg=";
packages = nextcloud28Packages; packages = nextcloud28Packages;
}; };

View File

@ -1,32 +1,30 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: { lib, stdenv, fetchFromGitHub, autoconf, automake, cmake, libtool, openssl, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aerospike-server"; pname = "aerospike-server";
version = "4.2.0.4"; version = "7.0.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aerospike"; owner = "aerospike";
repo = "aerospike-server"; repo = "aerospike-server";
rev = version; rev = version;
sha256 = "1vqi3xir4l57v62q1ns3713vajxffs6crss8fpvbcs57p7ygx3s7"; hash = "sha256-qyVfoOnWIUY1np58HtpVrKNsgiXlvdgffyMGjk+G5qI=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ autoconf automake libtool ]; nativeBuildInputs = [ autoconf automake cmake libtool ];
buildInputs = [ openssl zlib ]; buildInputs = [ openssl zlib ];
dontUseCmakeConfigure = true;
preBuild = '' preBuild = ''
patchShebangs build/gen_version patchShebangs build/gen_version
substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}' substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}'
# drop blanket -Werror
substituteInPlace make_in/Makefile.in --replace '-Werror' ""
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/udf mkdir -p $out/bin
cp target/Linux-x86_64/bin/asd $out/bin/asd cp target/Linux-x86_64/bin/asd $out/bin/asd
cp -dpR modules/lua-core/src $out/share/udf/lua
''; '';
meta = with lib; { meta = with lib; {
@ -35,6 +33,5 @@ stdenv.mkDerivation rec {
license = licenses.agpl3; license = licenses.agpl3;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
knownVulnerabilities = [ "CVE-2020-13151" ];
}; };
} }

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mariadb-galera"; pname = "mariadb-galera";
version = "26.4.16"; version = "26.4.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "codership"; owner = "codership";
repo = "galera"; repo = "galera";
rev = "release_${version}"; rev = "release_${version}";
hash = "sha256-bRkXux4vpnUGRYO4dYD6IuWsbMglsMf17tBw6qpvbDg="; hash = "sha256-XcaHg0mqCGqP7VYb4jLSxuNxmBXJv2ivA/1spMyT4Tg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zsh-forgit"; pname = "zsh-forgit";
version = "24.01.0"; version = "24.02.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wfxr"; owner = "wfxr";
repo = "forgit"; repo = "forgit";
rev = version; rev = version;
sha256 = "sha256-WHhyllOr/PgR+vlrfMQs/3/d3xpmDylT6BlLCu50a2g="; sha256 = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI=";
}; };
strictDeps = true; strictDeps = true;

View File

@ -4,13 +4,13 @@ let
INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "zsh-fzf-tab"; pname = "zsh-fzf-tab";
version = "unstable-2023-06-11"; version = "unstable-2024-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Aloxaf"; owner = "Aloxaf";
repo = "fzf-tab"; repo = "fzf-tab";
rev = "c2b4aa5ad2532cca91f23908ac7f00efb7ff09c9"; rev = "b06e7574577cd729c629419a62029d31d0565a7a";
hash = "sha256-gvZp8P3quOtcy1Xtt1LAW1cfZ/zCtnAmnWqcwrKel6w="; hash = "sha256-ilUavAIWmLiMh2PumtErMCpOcR71ZMlQkKhVOTDdHZw=";
}; };
strictDeps = true; strictDeps = true;

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "fits-cloudctl"; pname = "fits-cloudctl";
version = "0.12.12"; version = "0.12.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fi-ts"; owner = "fi-ts";
repo = "cloudctl"; repo = "cloudctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-jNs1I6aVmyHbVghO30r6+gVg0vVLqHpddX1KVX1Xh+s="; sha256 = "sha256-Vb7jBgk052WBnlUgS5lVooi/bY49rRqCWbOO4cPkPx4=";
}; };
vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8="; vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8=";

View File

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "remote-touchpad"; pname = "remote-touchpad";
version = "1.4.4"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unrud"; owner = "unrud";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-E2Pa5fhE2AiN2GE7k80nWcrXxHBDvkQtZV43DKhaCGU="; sha256 = "sha256-usJAiGjUGGO4Gb9LMGWR6mG3r8C++llteqn5WpwqqFk=";
}; };
buildInputs = [ libXi libXrandr libXt libXtst ]; buildInputs = [ libXi libXrandr libXt libXtst ];

View File

@ -24,16 +24,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "fzf"; pname = "fzf";
version = "0.46.0"; version = "0.46.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "junegunn"; owner = "junegunn";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Lcqe1eVQXOLJWsxsUK0dzZHAA3c1Wps07HFvlaflN5Q="; hash = "sha256-gMSelLwIIYv/vkbdWi4Cw3FEy4lbC8P/5+T+c/e66+c=";
}; };
vendorHash = "sha256-3InzP299GJUizNWyPNpg9+pGA88ggnky56bGV5E+7ck="; vendorHash = "sha256-8ojmIETUyZ3jDhrqkHYnxptRG8vdj0GADYvEpw0wi6w=";
CGO_ENABLED = 0; CGO_ENABLED = 0;

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "mutagen-compose"; pname = "mutagen-compose";
version = "0.17.4"; version = "0.17.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mutagen-io"; owner = "mutagen-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-arvDV1AlhrXfndoXGd7jn6O9ZAc1+7hq30QpYPLhpJw="; hash = "sha256-EkUaxk+zCm1ta1/vjClZHki/MghLvUkCeiW7hST7WEc=";
}; };
vendorHash = "sha256-wqenEPTRsZvQscXv+/eVEFVk8Fd1/Aj3QcBSZzpkmGA="; vendorHash = "sha256-siLS53YVQfCwqyuvXXvHFtlpr3RQy2GP2/ZV+Tv/Lqc=";
doCheck = false; doCheck = false;

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gobgp"; pname = "gobgp";
version = "3.22.0"; version = "3.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osrg"; owner = "osrg";
repo = "gobgp"; repo = "gobgp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ItzoknejTtVjm0FD+UdpCa+cL0i2uvcffTNIWCjBdVU="; sha256 = "sha256-PUwYcwWgaV/DQl565fugppc+I/y7z7Ns3P4SspS88ts=";
}; };
vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8=";

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grpc_cli"; pname = "grpc_cli";
version = "1.60.0"; version = "1.61.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grpc"; owner = "grpc";
repo = "grpc"; repo = "grpc";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE="; hash = "sha256-NLxcGFQ1F5RLoSFC0XYMjvGXkSWc/vLzgtk5qsOndEo=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ automake cmake autoconf ]; nativeBuildInputs = [ automake cmake autoconf ];

View File

@ -29,11 +29,11 @@ let
sslPkg = sslPkgs.${sslLibrary}; sslPkg = sslPkgs.${sslLibrary};
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "haproxy"; pname = "haproxy";
version = "2.9.3"; version = "2.9.4";
src = fetchurl { src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
hash = "sha256-7VF8ZavYaUVBH2vLGMfsZXpwaTHLeB6igwY7oKdYWMA="; hash = "sha256-nDiSzDwISsTwASXvIqFRzxgUFthKqKN69q9qoDmQlrw=";
}; };
buildInputs = [ sslPkg zlib libxcrypt ] buildInputs = [ sslPkg zlib libxcrypt ]

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "emplace"; pname = "emplace";
version = "1.4.2"; version = "1.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tversteeg"; owner = "tversteeg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5PuSIOXns0FVLgyIw1mk8hZ/tYhikMV860BHTDlji78="; sha256 = "sha256-4huLO2CGKDRjphtAYbcPFLM1bYIppoqZgtxkOoT1JOs=";
}; };
cargoSha256 = "sha256-UbbVjT5JQuVSCgbcelEVaAql4CUnCtO99zHp3Ei31Gs="; cargoHash = "sha256-/q8I1XG96t6296UAvhTOYtWVtJFYX5iIaLya5nfqM/g=";
meta = with lib; { meta = with lib; {
description = "Mirror installed software on multiple machines"; description = "Mirror installed software on multiple machines";

View File

@ -32,14 +32,14 @@ in
with python.pkgs; with python.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "pdm"; pname = "pdm";
version = "2.12.2"; version = "2.12.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-s8pKsQetZbV/4TEuQ2Dh97PXxe2BqEG27Uizd3hi7Vc="; hash = "sha256-U82rcnwUaf3Blu/Y1/+EBKPKke5DwKVxRzbyAg0KXd8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kube-bench"; pname = "kube-bench";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-yJJEWxz8EWdLi2rhw42QVdG9AcGO0OWnihg153hALNE="; hash = "sha256-EsUjGc7IIu5PK9KaODlQSfmm8jpjuBXvGZPNjSc1824=";
}; };
vendorHash = "sha256-zKw6d3UWs2kb+DCXmLZ09Lw3m8wMhm9QJYkeXJYcFA8="; vendorHash = "sha256-i4k7eworPUvLUustr5U53qizHqUVw8yqGjdPQT6UIf4=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned"; pname = "automatic-timezoned";
version = "1.0.146"; version = "1.0.147";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "maxbrunet"; owner = "maxbrunet";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9cAlpLlYnDa0LiikPLPrc///6UZH+NVah+HLDVHoyTs="; sha256 = "sha256-4+Sad0Z1JbkUJWyszo0cK3xTR8HLuR3i74ljWXxPqPw=";
}; };
cargoHash = "sha256-mZf5BBOlqXeC0nb/nTgtHN3ZxNnCuFLr/oMhwOLpbC8="; cargoHash = "sha256-humC32QujjmcSvRioGAciNFCJXwoepAgO9zDGfdUheY=";
meta = with lib; { meta = with lib; {
description = "Automatically update system timezone based on location"; description = "Automatically update system timezone based on location";

View File

@ -127,9 +127,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.152" version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]] [[package]]
name = "liboverdrop" name = "liboverdrop"

View File

@ -48,6 +48,11 @@ lib.makeScope newScope (self: {
location = "taggers"; location = "taggers";
hash = "sha256-ilTs4HWPUoHxQb4kWEy3wJ6QsE/98+EQya44gtV2inw="; hash = "sha256-ilTs4HWPUoHxQb4kWEy3wJ6QsE/98+EQya44gtV2inw=";
}); });
snowball_data = makeNltkDataPackage ({
pname = "snowball_data";
location = "stemmers";
hash = "sha256-Y6LERPtaRbCtWmJCvMAd2xH02xdrevZBFNYvP9N4+3s=";
});
stopwords = makeNltkDataPackage ({ stopwords = makeNltkDataPackage ({
pname = "stopwords"; pname = "stopwords";
location = "corpora"; location = "corpora";

View File

@ -27452,8 +27452,6 @@ with pkgs;
yaws = callPackage ../servers/http/yaws { }; yaws = callPackage ../servers/http/yaws { };
youtrack = callPackage ../servers/jetbrains/youtrack.nix { };
zabbixFor = version: rec { zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version}; agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version};
proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version}; proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version};

View File

@ -14122,8 +14122,7 @@ self: super: with self; {
tblib = callPackage ../development/python-modules/tblib { }; tblib = callPackage ../development/python-modules/tblib { };
tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix { tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix {
tblite = pkgs.tblite; inherit (pkgs) tblite meson simple-dftd3;
meson = pkgs.meson;
}; };
tbm-utils = callPackage ../development/python-modules/tbm-utils { }; tbm-utils = callPackage ../development/python-modules/tbm-utils { };